Update to 3.0.1, fixes RH#1111903

epel8
alexjnewt@hotmail.com 11 years ago
parent a13e2dbe01
commit b365113aad

2
.gitignore vendored

@ -1,2 +1,4 @@
/wxWidgets-3.0.0-docs-html.tar.bz2 /wxWidgets-3.0.0-docs-html.tar.bz2
/wxWidgets-3.0.0.tar.bz2 /wxWidgets-3.0.0.tar.bz2
/wxWidgets-3.0.1-docs-html.tar.bz2
/wxWidgets-3.0.1.tar.bz2

@ -1,2 +1,2 @@
d356e1a86c33d7ebe1f5c4a94e844f37 wxWidgets-3.0.0-docs-html.tar.bz2 47dbdd5adf5a7a2c9d3dd58b3d78c9c7 wxWidgets-3.0.1-docs-html.tar.bz2
241998efc12205172ed24c18788ea2cd wxWidgets-3.0.0.tar.bz2 dad1f1cd9d4c370cbc22700dc492da31 wxWidgets-3.0.1.tar.bz2

@ -1,20 +0,0 @@
Index: /wxWidgets/trunk/src/gtk/toplevel.cpp
===================================================================
--- src/gtk/toplevel.cpp (revision 74977)
+++ src/gtk/toplevel.cpp (revision 75182)
@@ -39,4 +39,7 @@
#include <X11/Xatom.h> // XA_CARDINAL
#include "wx/unix/utilsx11.h"
+#endif
+#ifdef GDK_WINDOWING_WAYLAND
+ #include <gdk/gdkwayland.h>
#endif
@@ -731,5 +734,5 @@
#if defined(GDK_WINDOWING_WAYLAND) && GTK_CHECK_VERSION(3,10,0)
else if (
- GDK_IS_WAYLAND_SCREEN(gtk_window_get_screen(GTK_WINDOW(m_widget))) &&
+ GDK_IS_WAYLAND_DISPLAY(gtk_widget_get_display(m_widget)) &&
gtk_check_version(3,10,0) == NULL)
{

@ -10,8 +10,8 @@
%endif %endif
Name: %{wxgtkname} Name: %{wxgtkname}
Version: 3.0.0 Version: 3.0.1
Release: 8%{?dist} Release: 1%{?dist}
Summary: GTK port of the wxWidgets GUI library Summary: GTK port of the wxWidgets GUI library
License: wxWidgets License: wxWidgets
Group: System Environment/Libraries Group: System Environment/Libraries
@ -20,9 +20,6 @@ Source0: http://downloads.sf.net/wxwindows/%{srcname}-%{version}.tar.bz2
Source1: http://downloads.sf.net/wxwindows/%{srcname}-%{version}-docs-html.tar.bz2 Source1: http://downloads.sf.net/wxwindows/%{srcname}-%{version}-docs-html.tar.bz2
Source10: wx-config Source10: wx-config
# http://trac.wxwidgets.org/ticket/15667
Patch0: %{name}-3.0.0-gtk3_build.patch
BuildRequires: gtk%{gtkver}-devel BuildRequires: gtk%{gtkver}-devel
#Note webkitgtk (GTK2) does not appear to be supported #Note webkitgtk (GTK2) does not appear to be supported
%if %{gtkver} == 3 %if %{gtkver} == 3
@ -62,7 +59,6 @@ Requires: %{name}-media = %{version}-%{release}
Requires: %{wxbasename} = %{version}-%{release} Requires: %{wxbasename} = %{version}-%{release}
Requires: gtk%{gtkver}-devel Requires: gtk%{gtkver}-devel
Requires: libGLU-devel Requires: libGLU-devel
Conflicts: wxGTK-devel
Provides: %{srcname}-devel = %{version}-%{release} Provides: %{srcname}-devel = %{version}-%{release}
%description devel %description devel
@ -127,7 +123,6 @@ This package provides documentation for the %{srcname} library.
# in case of gtk3 # in case of gtk3
%if %{gtkver} == 3 %if %{gtkver} == 3
%patch0 -p0 -b .GTK3
sed -i -e 's|gtk2|gtk3|' %{SOURCE10} sed -i -e 's|gtk2|gtk3|' %{SOURCE10}
%endif %endif
@ -172,7 +167,6 @@ make %{?_smp_mflags}
rm %{buildroot}%{_bindir}/wx-config rm %{buildroot}%{_bindir}/wx-config
rm %{buildroot}%{_bindir}/wxrc rm %{buildroot}%{_bindir}/wxrc
install -p -m 755 %{SOURCE10} %{buildroot}%{_bindir}/wx-config-3.0 install -p -m 755 %{SOURCE10} %{buildroot}%{_bindir}/wx-config-3.0
ln -s %{_bindir}/wx-config-3.0 %{buildroot}%{_bindir}/wx-config
# move bakefiles to avoid conflicts with 2.8.* # move bakefiles to avoid conflicts with 2.8.*
mkdir %{buildroot}%{_datadir}/bakefile/presets/wx3 mkdir %{buildroot}%{_datadir}/bakefile/presets/wx3
@ -242,12 +236,8 @@ popd
%doc html %doc html
%changelog %changelog
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.0.0-8 * Sat Jul 5 2014 Jeremy Newton <alexjnewt@hotmail.com> - 3.0.1-1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - Bump to 3.0.1 RH#1076617
* Thu Apr 3 2014 Jeremy Newton <alexjnewt@hotmail.com> - 3.0.0-7
- Removed wxGTK-devel compatiblity in favour for a wx-config symlink
see bug RH#1077718
* Tue Mar 18 2014 Jeremy Newton <alexjnewt@hotmail.com> - 3.0.0-6 * Tue Mar 18 2014 Jeremy Newton <alexjnewt@hotmail.com> - 3.0.0-6
- Removed disable-catch_segvs, see RH#1076617 - Removed disable-catch_segvs, see RH#1076617

Loading…
Cancel
Save