Add 0001-Fixed-a-compilation-error-in-YTableCell-with-GCC-6-b.patch
(Fix F24FTBFS)
This commit is contained in:
parent
4794ab269c
commit
e34a7e76b2
|
@ -0,0 +1,28 @@
|
|||
From d95556cf14bc6dfc9601da8c099ba12899b34dbc Mon Sep 17 00:00:00 2001
|
||||
From: Martin Vidner <mvidner@suse.cz>
|
||||
Date: Fri, 29 Jan 2016 14:00:17 +0100
|
||||
Subject: [PATCH] Fixed a compilation error in YTableCell with GCC 6
|
||||
(bsc#964144).
|
||||
|
||||
It enables a previously inactive consistency check.
|
||||
I have checked the known callers and they all seem to pass this check.
|
||||
---
|
||||
src/YTableItem.cc | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/YTableItem.cc b/src/YTableItem.cc
|
||||
index 75923f1..40e7d4f 100644
|
||||
--- a/src/YTableItem.cc
|
||||
+++ b/src/YTableItem.cc
|
||||
@@ -172,7 +172,7 @@ void YTableCell::reparent( YTableItem * parent, int column )
|
||||
{
|
||||
YUI_CHECK_PTR( parent );
|
||||
|
||||
- if ( _parent && _parent != parent && column != column )
|
||||
+ if ( _parent && _parent != parent && _column != column )
|
||||
YUI_THROW( YUIException( std::string( "Cannot reparent YTableCell \"" )
|
||||
+ _label
|
||||
+ "to different parent." ) );
|
||||
--
|
||||
2.5.0
|
||||
|
10
libyui.spec
10
libyui.spec
|
@ -16,13 +16,16 @@
|
|||
|
||||
Name: lib%{libsuffix}
|
||||
Version: 3.2.1
|
||||
Release: 4%{?dist}
|
||||
Release: 5%{?dist}
|
||||
Summary: GUI-abstraction library
|
||||
|
||||
License: (LGPLv2 or LGPLv3) and MIT
|
||||
URL: https://github.com/%{name}/%{name}
|
||||
Source0: %{url}/archive/%{name}/master/%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
||||
|
||||
# Cherry picked from upstream github.
|
||||
Patch0: 0001-Fixed-a-compilation-error-in-YTableCell-with-GCC-6-b.patch
|
||||
|
||||
BuildRequires: boost-devel
|
||||
BuildRequires: cmake >= 2.8
|
||||
|
||||
|
@ -69,6 +72,7 @@ brief examples how to build a UI using %{name}.
|
|||
|
||||
%prep
|
||||
%setup -qn %{name}-%{name}-master-%{version}
|
||||
%patch0 -p1
|
||||
./bootstrap.sh
|
||||
|
||||
|
||||
|
@ -135,6 +139,10 @@ popd
|
|||
|
||||
|
||||
%changelog
|
||||
* Wed Feb 10 2016 Ralf Corsépius <corsepiu@fedoraproject.org> - 3.2.1-5
|
||||
- Add 0001-Fixed-a-compilation-error-in-YTableCell-with-GCC-6-b.patch
|
||||
(Fix F24FTBFS)
|
||||
|
||||
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.1-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
|
|
Loading…
Reference in New Issue