PR#1: Rebuild with wxWidgets 3.0 - rpms/perl-Wx

Scott Talbert • 5 years ago

99b7600

gtk3.patch

file added

+29

		`@@ -0,0 +1,29 @@`
		`+ Description: Fixes for GTK3 compatibility`
		`+ wxWidgets 3.0 built with GTK3 doesn't have wxColour::GetPixel(), see:`
		`+ http://trac.wxwidgets.org/ticket/15141#comment:2`
		`+ Author: Olly Betts <olly@survex.com>`
		`+ Forwarded: no`
		`+ Last-Update: 2018-04-01`
		`+`
		`+ --- a/XS/Colour.xs`
		`+ +++ b/XS/Colour.xs`
		`+ @@ -114,7 +114,7 @@`
		`+`
		`+ #endif`
		`+`
		`+ -#if !defined(__WXMAC__)`
		`+ +#if !defined(__WXMAC__) && !defined (__WXGTK3__)`
		`+`
		`+ long`
		`+ wxColour::GetPixel()`
		`+ --- a/ext/propgrid/XS/PGProperty.xsp`
		`+ +++ b/ext/propgrid/XS/PGProperty.xsp`
		`+ @@ -1148,7 +1148,7 @@`
		`+ bool SetPlValue( wxColour* col, int flags = wxPG_SETVAL_REFRESH_EDITOR )`
		`+ %code{%`
		`+ if( col->IsOk() ) {`
		`+ - wxVariant value = wxVariant(*col);`
		`+ + wxVariant value = wxVariant(wxAny(*col));`
		`+ THIS->SetValue(value, NULL, flags );`
		`+ RETVAL = true;`
		`+ } else {`

perl-Wx.spec

file modified

+8 -3

		`@@ -12,7 +12,7 @@`

		`Name: perl-Wx`
		`Version: 0.9932`
		`- Release: 11%{?dist}`
		`+ Release: 12%{?dist}`
		`Summary: Interface to the wxWidgets cross-platform GUI toolkit`
		`Group: Development/Libraries`
		`License: GPL+ or Artistic`
		`@@ -21,7 +21,8 @@`
		`# Work around BOM_UTF8 clash between wxGTK and Perl. Should be fixed in newer`
		`# wxGTK, CPAN RT#121464, <http://trac.wxwidgets.org/ticket/13599>.`
		`Patch0: Wx-0.9932-Undefine-BOM_UTF8.patch`
		`- BuildRequires: wxGTK-devel`
		`+ Patch1: gtk3.patch`
		`+ BuildRequires: wxGTK3-devel`
		`BuildRequires: gcc-c++`
		`BuildRequires: perl-devel`
		`BuildRequires: perl-generators`
		`@@ -662,6 +663,7 @@`
		`%prep`
		`%setup -q -n Wx-%{version}`
		`%patch0 -p1`
		`+ %patch1 -p1`

		`chmod -c a-x README.txt docs/todo.txt samples//.pl`
		`find . -type f -name ".pm" -o -name ".h" -o -name "*.cpp" \|`
		`@@ -680,7 +682,7 @@`
		`%build`
		`perl Makefile.PL --wx-unicode \`
		--wx-version=`wx-config --version \| cut -d . -f 1-2` \
		`- --wx-toolkit=gtk2 \`
		`+ --wx-toolkit=gtk \`
		`INSTALLDIRS=vendor \`
		`OPTIMIZE="$RPM_OPT_FLAGS -Wno-unused-variable -Wno-unused-but-set-variable -Wno-unused-local-typedefs"`
		`make %{?_smp_mflags}`
		`@@ -705,6 +707,9 @@`
		`%{_mandir}/man3/.3pm`

		`%changelog`
		`+ * Wed Aug 22 2018 Scott Talbert <swt@techie.net> - 0.9932-12`
		`+ - Rebuild with wxWidgets 3.0`
		`+`
		`* Mon Jul 23 2018 Tom Callaway <spot@fedoraproject.org> - 0.9932-11`
		`- add BuildRequires: gcc-c++`