From cb22fbe1a5f79db0910863ca887c5dc38d0fdbbe Mon Sep 17 00:00:00 2001 From: Scott Talbert Date: Sep 19 2016 01:49:00 +0000 Subject: Add patch to fix runtime link error due to previous patches --- diff --git a/wxGTK3-3.0.2-gtk-show-uri1.patch b/wxGTK3-3.0.2-gtk-show-uri1.patch new file mode 100644 index 0000000..bd5fcc5 --- /dev/null +++ b/wxGTK3-3.0.2-gtk-show-uri1.patch @@ -0,0 +1,27 @@ +From 79676e1e9d307c479c5aefa70c0fd052341d697e Mon Sep 17 00:00:00 2001 +From: Vadim Zeitlin +Date: Mon, 24 Aug 2015 17:18:15 +0200 +Subject: [PATCH] Fix wxGTK build after wxLaunchDefaultBrowser() fix backport. + +2dd407609b8987634180c045e9a6d131db6f947e uses wxGetTopLevelGDK() only +available in master and not in 3.0 branch, avoid it by just using the default +screen (which also avoids having to add another GTK+ version check for +gdk_window_get_screen() which is only available since 2.24). +--- + src/unix/utilsx11.cpp | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/src/unix/utilsx11.cpp b/src/unix/utilsx11.cpp +index 7d5811a..6b35551 100644 +--- a/src/unix/utilsx11.cpp ++++ b/src/unix/utilsx11.cpp +@@ -894,8 +894,7 @@ bool wxDoLaunchDefaultBrowser(const wxString& url, int flags) + if (gtk_check_version(2,14,0) == NULL) + #endif + { +- GdkScreen* screen = gdk_window_get_screen(wxGetTopLevelGDK()); +- if (gtk_show_uri(screen, url.utf8_str(), GDK_CURRENT_TIME, NULL)) ++ if (gtk_show_uri(NULL, url.utf8_str(), GDK_CURRENT_TIME, NULL)) + return true; + } + #endif // GTK_CHECK_VERSION(2,14,0) diff --git a/wxGTK3.spec b/wxGTK3.spec index a7bd134..fc0ccf9 100644 --- a/wxGTK3.spec +++ b/wxGTK3.spec @@ -11,7 +11,7 @@ Name: %{wxgtkname} Version: 3.0.2 -Release: 21%{?dist} +Release: 22%{?dist} Summary: GTK port of the wxWidgets GUI library License: wxWidgets Group: System Environment/Libraries @@ -76,9 +76,11 @@ Patch13: %{name}-%{version}-init-from-font.patch # Fixes wxGetKeyState() from crashing on Wayland # For more details, see the upstream commits (first is just a dependency patch): # https://github.com/wxWidgets/wxWidgets/commit/2dd407609b8987634180c045e9a6d131db6f947e +# https://github.com/wxWidgets/wxWidgets/commit/79676e1e9d307c479c5aefa70c0fd052341d697e # https://github.com/wxWidgets/wxWidgets/commit/98065821bbf0178981b50515094f565b703fcaa8 Patch14: %{name}-%{version}-gtk-show-uri.patch -Patch15: %{name}-%{version}-wxgetkeystate.patch +Patch15: %{name}-%{version}-gtk-show-uri1.patch +Patch16: %{name}-%{version}-wxgetkeystate.patch BuildRequires: gtk%{gtkver}-devel #Note webkitgtk (GTK2) does not appear to be supported @@ -207,7 +209,8 @@ This package provides XML documentation for the %{srcname} library. %patch12 -p1 -b .font-enumerator-stop %patch13 -p1 -b .init-from-font %patch14 -p1 -b .gtk-show-uri -%patch15 -p1 -b .wxgetkeystate +%patch15 -p1 -b .gtk-show-uri1 +%patch16 -p1 -b .wxgetkeystate # patch some installed files to avoid conflicts with 2.8.* sed -i -e 's|aclocal)|aclocal/wxwin3.m4)|' Makefile.in @@ -361,6 +364,9 @@ fi %doc docs/doxygen/out/xml/* %changelog +* Mon Sep 19 2016 Scott Talbert - 3.0.2-22 +- Add patch to fix runtime link error due to previous patches + * Tue Sep 13 2016 Scott Talbert - 3.0.2-21 - Add patch to resolve wxGetKeyState() crash on Wayland (#1266743) - Add patch to fix wxFontEnumerator stop function