From a4ade77653b9e456aacbc369fc6cec6b776ac484 Mon Sep 17 00:00:00 2001 From: Scott Talbert Date: Wed, 28 Dec 2016 12:12:03 -0500 Subject: [PATCH 01/48] Fix unresizable windows on HiDPI displays (#1402630) Fix rendering of check and radio buttons on GTK+ 3.20+ (#1405841) --- ...3-3.0.2-check-radio-button-rendering.patch | 256 ++++++++++++++++++ wxGTK3-3.0.2-unresizable-windows-hidpi.patch | 29 ++ wxGTK3.spec | 14 +- 3 files changed, 298 insertions(+), 1 deletion(-) create mode 100644 wxGTK3-3.0.2-check-radio-button-rendering.patch create mode 100644 wxGTK3-3.0.2-unresizable-windows-hidpi.patch diff --git a/wxGTK3-3.0.2-check-radio-button-rendering.patch b/wxGTK3-3.0.2-check-radio-button-rendering.patch new file mode 100644 index 0000000..8367ae9 --- /dev/null +++ b/wxGTK3-3.0.2-check-radio-button-rendering.patch @@ -0,0 +1,256 @@ +From ec023e99774d90e3ac16a3a5b4e55c6cdf9fb3c1 Mon Sep 17 00:00:00 2001 +From: Paul Cornett +Date: Sat, 10 Dec 2016 21:49:06 -0800 +Subject: [PATCH] Fix rendering of check and radio buttons with GTK+ >= 3.20 + +(cherry picked from commit e627970ba6126113fdf09db69c50582b369d0d8a) +--- + src/gtk/renderer.cpp | 184 ++++++++++++++++++++++++++++++++++++++++++--------- + 1 file changed, 153 insertions(+), 31 deletions(-) + +diff --git a/src/gtk/renderer.cpp b/src/gtk/renderer.cpp +index 965d5fe..c89b0d3 100644 +--- a/src/gtk/renderer.cpp ++++ b/src/gtk/renderer.cpp +@@ -503,6 +503,49 @@ wxRendererGTK::DrawComboBoxDropButton(wxWindow *win, + wxSize + wxRendererGTK::GetCheckBoxSize(wxWindow *WXUNUSED(win)) + { ++#ifdef __WXGTK3__ ++ int min_width, min_height; ++ GtkWidgetPath* path = gtk_widget_path_new(); ++ GtkStyleContext* sc = gtk_style_context_new(); ++ GtkStyleContext* sc1 = NULL; ++ gtk_widget_path_append_type(path, GTK_TYPE_CHECK_BUTTON); ++#if GTK_CHECK_VERSION(3,20,0) ++ if (gtk_check_version(3,20,0) == NULL) ++ { ++ gtk_widget_path_iter_set_object_name(path, -1, "checkbutton"); ++ sc1 = gtk_style_context_new(); ++ gtk_style_context_set_path(sc1, path); ++ gtk_widget_path_append_type(path, G_TYPE_NONE); ++ gtk_widget_path_iter_set_object_name(path, -1, "check"); ++ gtk_style_context_set_path(sc, path); ++ gtk_style_context_set_parent(sc, sc1); ++ gtk_style_context_get(sc, GTK_STATE_FLAG_NORMAL, ++ "min-width", &min_width, "min-height", &min_height, NULL); ++ GtkBorder margin; ++ gtk_style_context_get_margin(sc, GTK_STATE_FLAG_NORMAL, &margin); ++ min_width += margin.left + margin.right; ++ min_height += margin.top + margin.bottom; ++ } ++ else ++#endif ++ { ++ gtk_style_context_set_path(sc, path); ++ GValue value = G_VALUE_INIT; ++ g_value_init(&value, G_TYPE_INT); ++ gtk_style_context_get_style_property(sc, "indicator-size", &value); ++ min_width = g_value_get_int(&value); ++ gtk_style_context_get_style_property(sc, "indicator-spacing", &value); ++ min_width += 2 * g_value_get_int(&value); ++ min_height = min_width; ++ g_value_unset(&value); ++ } ++ gtk_widget_path_unref(path); ++ g_object_unref(sc); ++ if (sc1) ++ g_object_unref(sc1); ++ ++ return wxSize(min_width, min_height); ++#else // !__WXGTK3__ + gint indicator_size, indicator_spacing; + gtk_widget_style_get(wxGTKPrivate::GetCheckButtonWidget(), + "indicator_size", &indicator_size, +@@ -511,6 +554,7 @@ wxRendererGTK::GetCheckBoxSize(wxWindow *WXUNUSED(win)) + + int size = indicator_size + indicator_spacing * 2; + return wxSize(size, size); ++#endif // !__WXGTK3__ + } + + void +@@ -519,6 +563,7 @@ wxRendererGTK::DrawCheckBox(wxWindow* win, + const wxRect& rect, + int flags ) + { ++#ifndef __WXGTK3__ + GtkWidget *button = wxGTKPrivate::GetCheckButtonWidget(); + + gint indicator_size, indicator_spacing; +@@ -527,7 +572,6 @@ wxRendererGTK::DrawCheckBox(wxWindow* win, + "indicator_spacing", &indicator_spacing, + NULL); + +-#ifndef __WXGTK3__ + GtkStateType state; + + if ( flags & wxCONTROL_PRESSED ) +@@ -551,31 +595,68 @@ wxRendererGTK::DrawCheckBox(wxWindow* win, + + #ifdef __WXGTK3__ + cairo_t* cr = wxGetGTKDrawable(win, dc); +- if (cr) ++ if (cr == NULL) ++ return; ++ ++ int state = GTK_STATE_FLAG_NORMAL; ++ if (flags & wxCONTROL_CHECKED) + { +- int stateFlags = GTK_STATE_FLAG_NORMAL; +- if (flags & wxCONTROL_CHECKED) +- { +- stateFlags = GTK_STATE_FLAG_ACTIVE; +- if (gtk_check_version(3,14,0) == NULL) +- stateFlags = GTK_STATE_FLAG_CHECKED; +- } +- if (flags & wxCONTROL_DISABLED) +- stateFlags |= GTK_STATE_FLAG_INSENSITIVE; +- if (flags & wxCONTROL_UNDETERMINED) +- stateFlags |= GTK_STATE_FLAG_INCONSISTENT; +- if (flags & wxCONTROL_CURRENT) +- stateFlags |= GTK_STATE_FLAG_PRELIGHT; +- GtkStyleContext* sc = gtk_widget_get_style_context(button); +- gtk_style_context_save(sc); +- gtk_style_context_set_state(sc, GtkStateFlags(stateFlags)); +- gtk_style_context_add_class(sc, GTK_STYLE_CLASS_CHECK); +- gtk_render_check(sc, cr, +- rect.x + (rect.width - indicator_size) / 2, +- rect.y + (rect.height - indicator_size) / 2, +- indicator_size, indicator_size); +- gtk_style_context_restore(sc); ++ state = GTK_STATE_FLAG_ACTIVE; ++ if (gtk_check_version(3,14,0) == NULL) ++ state = GTK_STATE_FLAG_CHECKED; ++ } ++ if (flags & wxCONTROL_DISABLED) ++ state |= GTK_STATE_FLAG_INSENSITIVE; ++ if (flags & wxCONTROL_UNDETERMINED) ++ state |= GTK_STATE_FLAG_INCONSISTENT; ++ if (flags & wxCONTROL_CURRENT) ++ state |= GTK_STATE_FLAG_PRELIGHT; ++ ++ int min_width, min_height; ++ GtkWidgetPath* path = gtk_widget_path_new(); ++ GtkStyleContext* sc = gtk_style_context_new(); ++ GtkStyleContext* sc1 = NULL; ++ gtk_widget_path_append_type(path, GTK_TYPE_CHECK_BUTTON); ++#if GTK_CHECK_VERSION(3,20,0) ++ if (gtk_check_version(3,20,0) == NULL) ++ { ++ gtk_widget_path_iter_set_object_name(path, -1, "checkbutton"); ++ sc1 = gtk_style_context_new(); ++ gtk_style_context_set_path(sc1, path); ++ gtk_widget_path_append_type(path, G_TYPE_NONE); ++ gtk_widget_path_iter_set_object_name(path, -1, "check"); ++ gtk_style_context_set_path(sc, path); ++ gtk_style_context_set_parent(sc, sc1); ++ gtk_style_context_get(sc, GTK_STATE_FLAG_NORMAL, ++ "min-width", &min_width, "min-height", &min_height, NULL); ++ } ++ else ++#endif ++ { ++ gtk_style_context_set_path(sc, path); ++ GValue value = G_VALUE_INIT; ++ g_value_init(&value, G_TYPE_INT); ++ gtk_style_context_get_style_property(sc, "indicator-size", &value); ++ min_width = g_value_get_int(&value); ++ min_height = min_width; ++ g_value_unset(&value); + } ++ ++ // need save/restore for GTK+ 3.6 & 3.8 ++ gtk_style_context_save(sc); ++ gtk_style_context_set_state(sc, GtkStateFlags(state)); ++ const int x = rect.x + (rect.width - min_width) / 2; ++ const int y = rect.y + (rect.height - min_height) / 2; ++ gtk_render_background(sc, cr, x, y, min_width, min_height); ++ gtk_render_frame(sc, cr, x, y, min_width, min_height); ++ gtk_style_context_add_class(sc, "check"); ++ gtk_render_check(sc, cr, x, y, min_width, min_height); ++ gtk_style_context_restore(sc); ++ ++ gtk_widget_path_unref(path); ++ g_object_unref(sc); ++ if (sc1) ++ g_object_unref(sc1); + #else + GdkWindow* gdk_window = wxGetGTKDrawable(win, dc); + if (gdk_window == NULL) +@@ -869,8 +950,6 @@ void wxRendererGTK::DrawRadioBitmap(wxWindow* win, wxDC& dc, const wxRect& rect, + if (drawable == NULL) + return; + +- GtkWidget* button = wxGTKPrivate::GetRadioButtonWidget(); +- + #ifdef __WXGTK3__ + int state = GTK_STATE_FLAG_NORMAL; + if (flags & wxCONTROL_CHECKED) +@@ -879,18 +958,61 @@ void wxRendererGTK::DrawRadioBitmap(wxWindow* win, wxDC& dc, const wxRect& rect, + if (gtk_check_version(3,14,0) == NULL) + state = GTK_STATE_FLAG_CHECKED; + } +- else if (flags & wxCONTROL_UNDETERMINED) +- state = GTK_STATE_FLAG_INCONSISTENT; + if (flags & wxCONTROL_DISABLED) + state |= GTK_STATE_FLAG_INSENSITIVE; ++ if (flags & wxCONTROL_UNDETERMINED) ++ state |= GTK_STATE_FLAG_INCONSISTENT; ++ if (flags & wxCONTROL_CURRENT) ++ state |= GTK_STATE_FLAG_PRELIGHT; ++ ++ int min_width, min_height; ++ GtkWidgetPath* path = gtk_widget_path_new(); ++ GtkStyleContext* sc = gtk_style_context_new(); ++ GtkStyleContext* sc1 = NULL; ++ gtk_widget_path_append_type(path, GTK_TYPE_RADIO_BUTTON); ++#if GTK_CHECK_VERSION(3,20,0) ++ if (gtk_check_version(3,20,0) == NULL) ++ { ++ gtk_widget_path_iter_set_object_name(path, -1, "radiobutton"); ++ sc1 = gtk_style_context_new(); ++ gtk_style_context_set_path(sc1, path); ++ gtk_widget_path_append_type(path, G_TYPE_NONE); ++ gtk_widget_path_iter_set_object_name(path, -1, "radio"); ++ gtk_style_context_set_path(sc, path); ++ gtk_style_context_set_parent(sc, sc1); ++ gtk_style_context_get(sc, GTK_STATE_FLAG_NORMAL, ++ "min-width", &min_width, "min-height", &min_height, NULL); ++ } ++ else ++#endif ++ { ++ gtk_style_context_set_path(sc, path); ++ GValue value = G_VALUE_INIT; ++ g_value_init(&value, G_TYPE_INT); ++ gtk_style_context_get_style_property(sc, "indicator-size", &value); ++ min_width = g_value_get_int(&value); ++ min_height = min_width; ++ g_value_unset(&value); ++ } + +- GtkStyleContext* sc = gtk_widget_get_style_context(button); ++ // need save/restore for GTK+ 3.6 & 3.8 + gtk_style_context_save(sc); +- gtk_style_context_add_class(sc, GTK_STYLE_CLASS_RADIO); + gtk_style_context_set_state(sc, GtkStateFlags(state)); +- gtk_render_option(sc, drawable, rect.x, rect.y, rect.width, rect.height); ++ const int x = rect.x + (rect.width - min_width) / 2; ++ const int y = rect.y + (rect.height - min_height) / 2; ++ gtk_render_background(sc, drawable, x, y, min_width, min_height); ++ gtk_render_frame(sc, drawable, x, y, min_width, min_height); ++ gtk_style_context_add_class(sc, "radio"); ++ gtk_render_option(sc, drawable, x, y, min_width, min_height); + gtk_style_context_restore(sc); ++ ++ gtk_widget_path_unref(path); ++ g_object_unref(sc); ++ if (sc1) ++ g_object_unref(sc1); + #else ++ GtkWidget* button = wxGTKPrivate::GetRadioButtonWidget(); ++ + GtkShadowType shadow_type = GTK_SHADOW_OUT; + if ( flags & wxCONTROL_CHECKED ) + shadow_type = GTK_SHADOW_IN; diff --git a/wxGTK3-3.0.2-unresizable-windows-hidpi.patch b/wxGTK3-3.0.2-unresizable-windows-hidpi.patch new file mode 100644 index 0000000..71cecac --- /dev/null +++ b/wxGTK3-3.0.2-unresizable-windows-hidpi.patch @@ -0,0 +1,29 @@ +From a97553a939b76df1564ffbfe9c919d1da5a34c5a Mon Sep 17 00:00:00 2001 +From: Paul Cornett +Date: Mon, 21 Mar 2016 09:46:46 -0700 +Subject: [PATCH] Avoid unresizable windows on HiDPI displays when using + SetSizeHints() + +see #17456 + +(cherry picked from commit 4793e5b0a4e189e492287305859b278fed780080) +--- + src/gtk/toplevel.cpp | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp +index 464fb3f..69fca2a 100644 +--- a/src/gtk/toplevel.cpp ++++ b/src/gtk/toplevel.cpp +@@ -1273,8 +1273,9 @@ void wxTopLevelWindowGTK::DoSetSizeHints( int minW, int minH, + int hints_mask = GDK_HINT_MIN_SIZE | GDK_HINT_MAX_SIZE; + hints.min_width = 1; + hints.min_height = 1; +- hints.max_width = INT_MAX; +- hints.max_height = INT_MAX; ++ // using INT_MAX for size will lead to integer overflow with HiDPI scaling ++ hints.max_width = INT_MAX / 16; ++ hints.max_height = INT_MAX / 16; + int decorSize_x; + int decorSize_y; + #ifdef HAS_CLIENT_DECOR diff --git a/wxGTK3.spec b/wxGTK3.spec index 8a1f065..b10f4ae 100644 --- a/wxGTK3.spec +++ b/wxGTK3.spec @@ -11,7 +11,7 @@ Name: %{wxgtkname} Version: 3.0.2 -Release: 30%{?dist} +Release: 31%{?dist} Summary: GTK port of the wxWidgets GUI library License: wxWidgets Group: System Environment/Libraries @@ -113,6 +113,14 @@ Patch23: %{name}-%{version}-paint-clipping-region.patch # For more details, see the upstream commit: # https://github.com/wxWidgets/wxWidgets/commit/dcc23ceba8e1dba828e8b3e4633ac77acaad7562 Patch24: %{name}-%{version}-wxpgchoicesdata-protected-destructor.patch +# Fixes unresizable windows on HiDPI displays +# For more details, see the upstream commit: +# https://github.com/wxWidgets/wxWidgets/commit/a97553a939b76df1564ffbfe9c919d1da5a34c5a +Patch25: %{name}-%{version}-unresizable-windows-hidpi.patch +# Fixes rendering of check and radio buttons with GTK+ >= 3.20 +# For more details, see the upstream commit: +# https://github.com/wxWidgets/wxWidgets/commit/ec023e99774d90e3ac16a3a5b4e55c6cdf9fb3c1 +Patch26: %{name}-%{version}-check-radio-button-rendering.patch BuildRequires: gtk%{gtkver}-devel #Note webkitgtk (GTK2) does not appear to be supported @@ -414,6 +422,10 @@ fi %doc docs/doxygen/out/xml/* %changelog +* Wed Dec 28 2016 Scott Talbert - 3.0.2-31 +- Fix unresizable windows on HiDPI displays (#1402630) +- Fix rendering of check and radio buttons on GTK+ 3.20+ (#1405841) + * Mon Nov 21 2016 Scott Talbert - 3.0.2-30 - Fix poedit regression in -29 - add paint clipping region patch (#1396747) - Add patch to change ~wxPGChoicesData from private to protected From 87a683e1658597829125b1a5f547c242c1758cfc Mon Sep 17 00:00:00 2001 From: Scott Talbert Date: Sat, 7 Jan 2017 09:14:32 -0500 Subject: [PATCH 02/48] Fix blank menubar/toolbar when using wx[MT]B_DOCKABLE (#1410729) --- wxGTK3-3.0.2-blank-menubar-toolbar.patch | 53 ++++++++++++++++++++++++ wxGTK3.spec | 9 +++- 2 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 wxGTK3-3.0.2-blank-menubar-toolbar.patch diff --git a/wxGTK3-3.0.2-blank-menubar-toolbar.patch b/wxGTK3-3.0.2-blank-menubar-toolbar.patch new file mode 100644 index 0000000..c35b2ce --- /dev/null +++ b/wxGTK3-3.0.2-blank-menubar-toolbar.patch @@ -0,0 +1,53 @@ +From 57dce78348cbe93d53c1432ee224e27fdd726982 Mon Sep 17 00:00:00 2001 +From: Paul Cornett +Date: Wed, 25 May 2016 09:39:50 -0700 +Subject: [PATCH] Avoid blank menubar/toolbar when using wx[MT]B_DOCKABLE with + GTK+ 3.20 + +A GTK+ bug involving GtkHandleBox somehow prevents drawing of its child +since 3.19.7. Avoid this by disabling the docking functionality, which +is preferable to having the bar be blank. +See #17539 + +(cherry picked from commit 7e41ac405f4105a7703e37bffd8ab951159f5af0) +--- + src/gtk/menu.cpp | 7 ++++++- + src/gtk/toolbar.cpp | 7 ++++++- + 2 files changed, 12 insertions(+), 2 deletions(-) + +diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp +index 3c5426d..5aa3caf 100644 +--- a/src/gtk/menu.cpp ++++ b/src/gtk/menu.cpp +@@ -141,7 +141,12 @@ void wxMenuBar::Init(size_t n, wxMenu *menus[], const wxString titles[], long st + + m_menubar = gtk_menu_bar_new(); + +- if (style & wxMB_DOCKABLE) ++ if ((style & wxMB_DOCKABLE) ++#ifdef __WXGTK3__ ++ // using GtkHandleBox prevents menubar from drawing with GTK+ >= 3.19.7 ++ && gtk_check_version(3,19,7) ++#endif ++ ) + { + m_widget = gtk_handle_box_new(); + gtk_container_add(GTK_CONTAINER(m_widget), m_menubar); +diff --git a/src/gtk/toolbar.cpp b/src/gtk/toolbar.cpp +index 9416f83..addf63a 100644 +--- a/src/gtk/toolbar.cpp ++++ b/src/gtk/toolbar.cpp +@@ -388,7 +388,12 @@ bool wxToolBar::Create( wxWindow *parent, + #endif + GtkSetStyle(); + +- if (style & wxTB_DOCKABLE) ++ if ((style & wxTB_DOCKABLE) ++#ifdef __WXGTK3__ ++ // using GtkHandleBox prevents toolbar from drawing with GTK+ >= 3.19.7 ++ && gtk_check_version(3,19,7) ++#endif ++ ) + { + m_widget = gtk_handle_box_new(); + diff --git a/wxGTK3.spec b/wxGTK3.spec index b10f4ae..964bbc9 100644 --- a/wxGTK3.spec +++ b/wxGTK3.spec @@ -11,7 +11,7 @@ Name: %{wxgtkname} Version: 3.0.2 -Release: 31%{?dist} +Release: 32%{?dist} Summary: GTK port of the wxWidgets GUI library License: wxWidgets Group: System Environment/Libraries @@ -121,6 +121,10 @@ Patch25: %{name}-%{version}-unresizable-windows-hidpi.patch # For more details, see the upstream commit: # https://github.com/wxWidgets/wxWidgets/commit/ec023e99774d90e3ac16a3a5b4e55c6cdf9fb3c1 Patch26: %{name}-%{version}-check-radio-button-rendering.patch +# Fixes blank menubar/toolbar when using wx[MT]B_DOCKABLE with GTK+ 3.20 +# For more details, see the upstream commit: +# https://github.com/wxWidgets/wxWidgets/commit/57dce78348cbe93d53c1432ee224e27fdd726982 +Patch27: %{name}-%{version}-blank-menubar-toolbar.patch BuildRequires: gtk%{gtkver}-devel #Note webkitgtk (GTK2) does not appear to be supported @@ -422,6 +426,9 @@ fi %doc docs/doxygen/out/xml/* %changelog +* Sat Jan 07 2017 Scott Talbert - 3.0.2-32 +- Fix blank menubar/toolbar when using wx[MT]B_DOCKABLE (#1410729) + * Wed Dec 28 2016 Scott Talbert - 3.0.2-31 - Fix unresizable windows on HiDPI displays (#1402630) - Fix rendering of check and radio buttons on GTK+ 3.20+ (#1405841) From 489bc8557ae2262f66a987dfe0ad1ca5f434c185 Mon Sep 17 00:00:00 2001 From: Scott Talbert Date: Sun, 7 May 2017 21:43:12 -0400 Subject: [PATCH 03/48] Fix merged specfile changelog ordering --- wxGTK3.spec | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/wxGTK3.spec b/wxGTK3.spec index 96e82f1..b563df2 100644 --- a/wxGTK3.spec +++ b/wxGTK3.spec @@ -396,22 +396,22 @@ fi * Sat Feb 11 2017 Fedora Release Engineering - 3.0.3-0.4.gitf90b768 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild +* Sat Jan 07 2017 Scott Talbert - 3.0.2-32 +- Fix blank menubar/toolbar when using wx[MT]B_DOCKABLE (#1410729) + * Fri Dec 30 2016 Scott Talbert - 3.0.3-0.3.gitf90b768 - Switch to use GStreamer 1.0 (#1402628) * Wed Dec 28 2016 Jeremy Newton - 3.0.3-0.2.gitf90b768 - Update to newer git snapshot -* Sat Dec 10 2016 Jeremy Newton - 3.0.3-0.1.git9518d52 -- Update to git snapshot - -* Sat Jan 07 2017 Scott Talbert - 3.0.2-32 -- Fix blank menubar/toolbar when using wx[MT]B_DOCKABLE (#1410729) - * Wed Dec 28 2016 Scott Talbert - 3.0.2-31 - Fix unresizable windows on HiDPI displays (#1402630) - Fix rendering of check and radio buttons on GTK+ 3.20+ (#1405841) +* Sat Dec 10 2016 Jeremy Newton - 3.0.3-0.1.git9518d52 +- Update to git snapshot + * Mon Nov 21 2016 Scott Talbert - 3.0.2-30 - Fix poedit regression in -29 - add paint clipping region patch (#1396747) - Add patch to change ~wxPGChoicesData from private to protected From 7df1c4ef779187c2fb471ee6d03d8cd860b3e939 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 15 May 2017 20:40:41 +0000 Subject: [PATCH 04/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild --- wxGTK3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wxGTK3.spec b/wxGTK3.spec index 4f5af62..d07363c 100644 --- a/wxGTK3.spec +++ b/wxGTK3.spec @@ -20,7 +20,7 @@ Name: %{wxgtkname} Version: 3.0.3 -Release: 1%{?snapshottag}%{?dist} +Release: 2%{?snapshottag}%{?dist} Summary: GTK port of the wxWidgets GUI library License: wxWidgets Group: System Environment/Libraries @@ -376,6 +376,9 @@ fi %doc docs/doxygen/out/xml/* %changelog +* Mon May 15 2017 Fedora Release Engineering - 3.0.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild + * Wed May 03 2017 Scott Talbert - 3.0.3-1 - New upstream release 3.0.3 - Update to latest WebKit2 patch (#1428997) From 8b651366bb88f3a1f9839336417a691c936e3310 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 21:48:42 +0000 Subject: [PATCH 05/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- wxGTK3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wxGTK3.spec b/wxGTK3.spec index d07363c..1f1c048 100644 --- a/wxGTK3.spec +++ b/wxGTK3.spec @@ -20,7 +20,7 @@ Name: %{wxgtkname} Version: 3.0.3 -Release: 2%{?snapshottag}%{?dist} +Release: 3%{?snapshottag}%{?dist} Summary: GTK port of the wxWidgets GUI library License: wxWidgets Group: System Environment/Libraries @@ -376,6 +376,9 @@ fi %doc docs/doxygen/out/xml/* %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 3.0.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Mon May 15 2017 Fedora Release Engineering - 3.0.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild From 4962199795700738b1852fb037d776242b58922f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 10:24:31 +0000 Subject: [PATCH 06/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- wxGTK3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wxGTK3.spec b/wxGTK3.spec index 1f1c048..02e3f6a 100644 --- a/wxGTK3.spec +++ b/wxGTK3.spec @@ -20,7 +20,7 @@ Name: %{wxgtkname} Version: 3.0.3 -Release: 3%{?snapshottag}%{?dist} +Release: 4%{?snapshottag}%{?dist} Summary: GTK port of the wxWidgets GUI library License: wxWidgets Group: System Environment/Libraries @@ -376,6 +376,9 @@ fi %doc docs/doxygen/out/xml/* %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 3.0.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 3.0.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 24e848fad8140880ddc5fd2d3f75c937d18a27cb Mon Sep 17 00:00:00 2001 From: Scott Talbert Date: Tue, 29 Aug 2017 23:32:05 -0400 Subject: [PATCH 07/48] Add upstream patch for avoiding destruction of TLWs that were never created Fixes assert during Filezilla startup (#1484955) --- wxGTK3-3.0.3-avoid-tlw-destroy-assert.patch | 29 +++++++++++++++++++++ wxGTK3.spec | 8 +++++- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 wxGTK3-3.0.3-avoid-tlw-destroy-assert.patch diff --git a/wxGTK3-3.0.3-avoid-tlw-destroy-assert.patch b/wxGTK3-3.0.3-avoid-tlw-destroy-assert.patch new file mode 100644 index 0000000..ea5cae3 --- /dev/null +++ b/wxGTK3-3.0.3-avoid-tlw-destroy-assert.patch @@ -0,0 +1,29 @@ +From ce1dce113c5eda42f49ba3278bb21c61872ca37d Mon Sep 17 00:00:00 2001 +From: Paul Cornett +Date: Mon, 28 Aug 2017 20:31:47 -0700 +Subject: [PATCH] Avoid delayed destruction if TLW was never created. See + #17942 + +(cherry picked from commit 4a71ba820f085a3d5a7233e9fd0e23ae4e45af58) +--- + src/common/toplvcmn.cpp | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/common/toplvcmn.cpp b/src/common/toplvcmn.cpp +index ef693690c5d..6a722f8be48 100644 +--- a/src/common/toplvcmn.cpp ++++ b/src/common/toplvcmn.cpp +@@ -105,10 +105,10 @@ bool wxTopLevelWindowBase::Destroy() + // as we will be deleted anyhow during its destruction and the pointer + // stored in wxPendingDelete would become invalid, so just delete ourselves + // immediately in this case. +- if ( wxWindow* parent = GetParent() ) ++ wxWindow* parent = GetParent(); ++ if ( (parent && parent->IsBeingDeleted()) || !GetHandle() ) + { +- if ( parent->IsBeingDeleted() ) +- return wxNonOwnedWindow::Destroy(); ++ return wxNonOwnedWindow::Destroy(); + } + + // delayed destruction: the frame will be deleted during the next idle diff --git a/wxGTK3.spec b/wxGTK3.spec index 02e3f6a..2f43253 100644 --- a/wxGTK3.spec +++ b/wxGTK3.spec @@ -20,7 +20,7 @@ Name: %{wxgtkname} Version: 3.0.3 -Release: 4%{?snapshottag}%{?dist} +Release: 5%{?snapshottag}%{?dist} Summary: GTK port of the wxWidgets GUI library License: wxWidgets Group: System Environment/Libraries @@ -43,6 +43,8 @@ Patch0: %{name}-%{version}-abicheck.patch %if 0%{?fedora} > 25 Patch1: %{name}-%{version}-webkit2.patch %endif +# https://github.com/wxWidgets/wxWidgets/commit/ce1dce113c5eda42f49ba3278bb21c61872ca37d +Patch2: %{name}-%{version}-avoid-tlw-destroy-assert.patch BuildRequires: gtk%{gtkver}-devel #Note webkitgtk (GTK2) does not appear to be supported @@ -376,6 +378,10 @@ fi %doc docs/doxygen/out/xml/* %changelog +* Wed Aug 30 2017 Scott Talbert - 3.0.3-5 +- Add upstream patch for avoiding destruction of TLWs that were never created +- Fixes assert during Filezilla startup (#1484955) + * Thu Aug 03 2017 Fedora Release Engineering - 3.0.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 19f9cdbd9447354b9a6058897401c05bb44f35f5 Mon Sep 17 00:00:00 2001 From: Scott Talbert Date: Tue, 3 Oct 2017 20:55:27 -0400 Subject: [PATCH 08/48] Merge with compat-wxGTK3-gtk2 --- wx-config | 6 ++ wxGTK3.spec | 256 ++++++++++++++++++++++++++++++++++++++++++---------- 2 files changed, 216 insertions(+), 46 deletions(-) diff --git a/wx-config b/wx-config index 84e1d2d..cd27264 100644 --- a/wx-config +++ b/wx-config @@ -32,9 +32,15 @@ case $arch in esac wxconfig=$libdir/wx/config/gtk3-unicode-$version +if [ ! -f $wxconfig ]; then + wxconfig=$libdir/wx/config/gtk2-unicode-$version +fi # special case when using 32-bit userspace and 64-bit kernel if [ ! -f $wxconfig -a \( $arch = ppc64 -o $arch = sparc64 \) ]; then wxconfig=/usr/lib/wx/config/gtk3-unicode-$version + if [ ! -f $wxconfig ]; then + wxconfig=/usr/lib/wx/config/gtk2-unicode-$version + fi fi if [ -x $wxconfig ]; then diff --git a/wxGTK3.spec b/wxGTK3.spec index 2f43253..a837363 100644 --- a/wxGTK3.spec +++ b/wxGTK3.spec @@ -1,13 +1,11 @@ %global srcname wxWidgets %global wxgtkname wxGTK3 %global wxbasename wxBase3 -#RHEL 6 does not have gtk3 -#RHEL prior to 6 is unsupported by this package -%if 0%{?el6} -%global gtkver 2 -%else -%global gtkver 3 -%endif +%global wxwidgetsgtk2 compat-wxWidgets-gtk2 +%global wxgtk2name compat-wxGTK3-gtk2 +%global wxbasegtk2name compat-wxBase3-gtk2 +%global gtk2dir bld_gtk2 +%global gtk3dir bld_gtk3 #For git snapshots, set to 0 to use release instead: %global usesnapshot 0 @@ -20,11 +18,11 @@ Name: %{wxgtkname} Version: 3.0.3 -Release: 5%{?snapshottag}%{?dist} +Release: 6%{?snapshottag}%{?dist} Summary: GTK port of the wxWidgets GUI library License: wxWidgets Group: System Environment/Libraries -URL: http://www.wxwidgets.org/ +URL: https://www.wxwidgets.org/ %if 0%{?usesnapshot} Source0: https://github.com/%{srcname}/%{srcname}/archive/%{commit0}.tar.gz#/%{srcname}-%{shortcommit0}.tar.gz @@ -46,15 +44,13 @@ Patch1: %{name}-%{version}-webkit2.patch # https://github.com/wxWidgets/wxWidgets/commit/ce1dce113c5eda42f49ba3278bb21c61872ca37d Patch2: %{name}-%{version}-avoid-tlw-destroy-assert.patch -BuildRequires: gtk%{gtkver}-devel -#Note webkitgtk (GTK2) does not appear to be supported -%if %{gtkver} == 3 +BuildRequires: gtk2-devel +BuildRequires: gtk3-devel %if 0%{?fedora} < 26 BuildRequires: webkitgtk3-devel %else BuildRequires: webkitgtk4-devel %endif -%endif BuildRequires: zlib-devel BuildRequires: libpng-devel BuildRequires: libjpeg-devel @@ -81,6 +77,7 @@ BuildRequires: doxygen Provides: %{srcname} = %{version}-%{release} Provides: bundled(scintilla) = 3.2.1 Requires: %{wxbasename}%{?_isa} = %{version}-%{release} +Requires: %{name}-i18n = %{version}-%{release} %description wxWidgets is the GTK port of the C++ cross-platform wxWidgets @@ -89,6 +86,35 @@ comprehensive set of helper classes for most common application tasks, ranging from networking to HTML display and image manipulation. +%package -n %{wxgtk2name} +Summary: GTK port of the wxWidgets GUI library +Provides: %{wxwidgetsgtk2} = %{version}-%{release} +Provides: bundled(scintilla) = 3.2.1 +Requires: %{wxbasename}%{?_isa} = %{version}-%{release} +Requires: %{name}-i18n = %{version}-%{release} + +%description -n %{wxgtk2name} +wxWidgets is the GTK port of the C++ cross-platform wxWidgets +GUI library, offering classes for all common GUI controls as well as a +comprehensive set of helper classes for most common application tasks, +ranging from networking to HTML display and image manipulation. + + +%package -n %{wxbasename}-devel +Group: Development/Libraries +Summary: Development files for the wxBase3 library +Requires: %{wxbasename}%{?_isa} = %{version}-%{release} +Requires(post): %{_sbindir}/update-alternatives +Requires(postun): %{_sbindir}/update-alternatives + +%description -n %{wxbasename}-devel +This package include files needed to link with the wxBase3 library. +wxWidgets is the GTK port of the C++ cross-platform wxWidgets +GUI library, offering classes for all common GUI controls as well as a +comprehensive set of helper classes for most common application tasks, +ranging from networking to HTML display and image manipulation. + + %package devel Group: Development/Libraries Summary: Development files for the wxGTK3 library @@ -99,10 +125,9 @@ Requires: %{name}-media = %{version}-%{release} Requires: %{name}-webview = %{version}-%{release} %endif Requires: %{wxbasename} = %{version}-%{release} -Requires: gtk%{gtkver}-devel +Requires: %{wxbasename}-devel%{?_isa} = %{version}-%{release} +Requires: gtk3-devel Requires: libGLU-devel -Requires(post): %{_sbindir}/update-alternatives -Requires(postun): %{_sbindir}/update-alternatives Provides: %{srcname}-devel = %{version}-%{release} %description devel @@ -113,6 +138,26 @@ comprehensive set of helper classes for most common application tasks, ranging from networking to HTML display and image manipulation. +%package -n %{wxgtk2name}-devel +Group: Development/Libraries +Summary: Development files for the wxGTK3 library +Requires: %{wxgtk2name}%{?_isa} = %{version}-%{release} +Requires: %{wxgtk2name}-gl = %{version}-%{release} +Requires: %{wxgtk2name}-media = %{version}-%{release} +Requires: %{wxbasename} = %{version}-%{release} +Requires: %{wxbasename}-devel%{?_isa} = %{version}-%{release} +Requires: gtk2-devel +Requires: libGLU-devel +Provides: %{wxwidgetsgtk2}-devel = %{version}-%{release} + +%description -n %{wxgtk2name}-devel +This package include files needed to link with the wxGTK3 library. +wxWidgets is the GTK port of the C++ cross-platform wxWidgets +GUI library, offering classes for all common GUI controls as well as a +comprehensive set of helper classes for most common application tasks, +ranging from networking to HTML display and image manipulation. + + %package gl Summary: OpenGL add-on for the wxWidgets library Group: System Environment/Libraries @@ -126,6 +171,32 @@ comprehensive set of helper classes for most common application tasks, ranging from networking to HTML display and image manipulation. +%package -n %{wxgtk2name}-gl +Summary: OpenGL add-on for the wxWidgets library +Group: System Environment/Libraries +Requires: %{wxgtk2name}%{?_isa} = %{version}-%{release} + +%description -n %{wxgtk2name}-gl +OpenGL (a 3D graphics API) add-on for the wxWidgets library. +wxWidgets is the GTK port of the C++ cross-platform wxWidgets +GUI library, offering classes for all common GUI controls as well as a +comprehensive set of helper classes for most common application tasks, +ranging from networking to HTML display and image manipulation. + + +%package i18n +Summary: i18n message catalogs for the wxWidgets library +Group: System Environment/Libraries +BuildArch: noarch + +%description i18n +i18n message catalogs for the wxWidgets library. +wxWidgets is the GTK port of the C++ cross-platform wxWidgets +GUI library, offering classes for all common GUI controls as well as a +comprehensive set of helper classes for most common application tasks, +ranging from networking to HTML display and image manipulation. + + %package media Summary: Multimedia add-on for the wxWidgets library Group: System Environment/Libraries @@ -139,6 +210,19 @@ comprehensive set of helper classes for most common application tasks, ranging from networking to HTML display and image manipulation. +%package -n %{wxgtk2name}-media +Summary: Multimedia add-on for the wxWidgets library +Group: System Environment/Libraries +Requires: %{wxgtk2name}%{?_isa} = %{version}-%{release} + +%description -n %{wxgtk2name}-media +Multimedia add-on for the wxWidgets library. +wxWidgets is the GTK port of the C++ cross-platform wxWidgets +GUI library, offering classes for all common GUI controls as well as a +comprehensive set of helper classes for most common application tasks, +ranging from networking to HTML display and image manipulation. + + %if 0%{?fedora} > 25 %package webview Summary: WebView add-on for the wxWidgets library @@ -157,6 +241,8 @@ ranging from networking to HTML display and image manipulation. %package -n %{wxbasename} Summary: Non-GUI support classes from the wxWidgets library Group: System Environment/Libraries +Provides: %{wxbasegtk2name} = %{version}-%{release} +Obsoletes: %{wxbasegtk2name} < %{version}-%{release} %description -n %{wxbasename} Every wxWidgets application must link against this library. It contains @@ -171,6 +257,9 @@ Group: Development/Libraries Summary: Documentation for the wxGTK3 library Requires: %{name} = %{version}-%{release} Provides: %{srcname}-docs = %{version}-%{release} +Provides: %{wxwidgetsgtk2}-docs = %{version}-%{release} +Provides: %{wxgtk2name}-docs = %{version}-%{release} +Obsoletes: %{wxgtk2name}-docs < %{version}-%{release} BuildArch: noarch %description docs @@ -182,6 +271,8 @@ Group: Development/Libraries Summary: XML Documentation for the wxGTK3 library Requires: %{name} = %{version}-%{release} Provides: %{srcname}-xmldocs = %{version}-%{release} +Provides: %{wxgtk2name}-xmldocs = %{version}-%{release} +Obsoletes: %{wxgtk2name}-xmldocs < %{version}-%{release} BuildArch: noarch %description xmldocs @@ -224,8 +315,12 @@ make allmo popd %endif +%global _configure ../configure + +mkdir %{gtk2dir} +pushd %{gtk2dir} %configure \ - --with-gtk=%{gtkver} \ + --with-gtk=2 \ --with-opengl \ --with-sdl \ --with-gnomeprint \ @@ -236,6 +331,23 @@ popd --enable-ipv6 %make_build +popd + +mkdir %{gtk3dir} +pushd %{gtk3dir} +%configure \ + --with-gtk=3 \ + --with-opengl \ + --with-sdl \ + --with-gnomeprint \ + --with-libmspack \ + --enable-intl \ + --enable-no_deps \ + --disable-rpath \ + --enable-ipv6 + +%make_build +popd #Docs %if 0%{?builddocs} @@ -250,7 +362,13 @@ WX_SKIP_DOXYGEN_VERSION_CHECK=1 ./regen.sh xml popd %install +pushd %{gtk2dir} %makeinstall +popd + +pushd %{gtk3dir} +%makeinstall +popd # install our multilib-aware wrapper ##Remove installed @@ -259,10 +377,6 @@ rm %{buildroot}%{_bindir}/wx-config install -p -D -m 755 %{SOURCE10} %{buildroot}%{_libexecdir}/%{name}/wx-config ln -s ../..%{_libexecdir}/%{name}/wx-config %{buildroot}%{_bindir}/wx-config-3.0 touch %{buildroot}%{_bindir}/wx-config -##If gtk2 -%if %{gtkver} == 2 -sed -i -e 's|gtk3|gtk2|' %{buildroot}%{_libexecdir}/%{name}/wx-config -%endif #Alternatives setup with wxrc mv %{buildroot}%{_bindir}/wxrc* %{buildroot}%{_libexecdir}/%{name} @@ -278,19 +392,37 @@ mv %{buildroot}%{_datadir}/bakefile/presets/*.* %{buildroot}%{_datadir}/bakefile cat wxmsw3.lang >> wxstd3.lang %check +# TODO: eventually actually run the tests instead of just compiling them +pushd %{gtk2dir} pushd tests make %{?_smp_mflags} test popd +popd + +pushd %{gtk3dir} +pushd tests +make %{?_smp_mflags} test +popd +popd %post -p /sbin/ldconfig %postun -p /sbin/ldconfig +%post -n %{wxgtk2name} -p /sbin/ldconfig +%postun -n %{wxgtk2name} -p /sbin/ldconfig + %post gl -p /sbin/ldconfig %postun gl -p /sbin/ldconfig +%post -n %{wxgtk2name}-gl -p /sbin/ldconfig +%postun -n %{wxgtk2name}-gl -p /sbin/ldconfig + %post media -p /sbin/ldconfig %postun media -p /sbin/ldconfig +%post -n %{wxgtk2name}-media -p /sbin/ldconfig +%postun -n %{wxgtk2name}-media -p /sbin/ldconfig + %if 0%{?fedora} > 25 %post webview -p /sbin/ldconfig %postun webview -p /sbin/ldconfig @@ -299,7 +431,7 @@ popd %post -n %{wxbasename} -p /sbin/ldconfig %postun -n %{wxbasename} -p /sbin/ldconfig -%post devel +%post -n %{wxbasename}-devel if [ -f %{_bindir}/wx-config ] && [ ! -h %{_bindir}/wx-config ] ; then rm %{_bindir}/wx-config fi @@ -308,58 +440,87 @@ fi %{_sbindir}/update-alternatives --install %{_bindir}/wxrc \ wxrc %{_libexecdir}/%{name}/wxrc 3 -%postun devel +%postun -n %{wxbasename}-devel if [ $1 -eq 0 ] ; then %{_sbindir}/update-alternatives --remove wx-config %{_libexecdir}/%{name}/wx-config %{_sbindir}/update-alternatives --remove wxrc %{_libexecdir}/%{name}/wxrc fi -%files -f wxstd3.lang +%files %doc docs/changes.txt docs/gpl.txt docs/lgpl.txt docs/licence.txt %doc docs/licendoc.txt docs/preamble.txt docs/readme.txt -%{_libdir}/libwx_gtk%{gtkver}u_adv-*.so.* -%{_libdir}/libwx_gtk%{gtkver}u_aui-*.so.* -%{_libdir}/libwx_gtk%{gtkver}u_core-*.so.* -%{_libdir}/libwx_gtk%{gtkver}u_html-*.so.* -%{_libdir}/libwx_gtk%{gtkver}u_propgrid-*.so.* -%{_libdir}/libwx_gtk%{gtkver}u_qa-*.so.* -%{_libdir}/libwx_gtk%{gtkver}u_ribbon-*.so.* -%{_libdir}/libwx_gtk%{gtkver}u_richtext-*.so.* -%{_libdir}/libwx_gtk%{gtkver}u_stc-*.so.* -%if %{gtkver} == 3 +%{_libdir}/libwx_gtk3u_adv-*.so.* +%{_libdir}/libwx_gtk3u_aui-*.so.* +%{_libdir}/libwx_gtk3u_core-*.so.* +%{_libdir}/libwx_gtk3u_html-*.so.* +%{_libdir}/libwx_gtk3u_propgrid-*.so.* +%{_libdir}/libwx_gtk3u_qa-*.so.* +%{_libdir}/libwx_gtk3u_ribbon-*.so.* +%{_libdir}/libwx_gtk3u_richtext-*.so.* +%{_libdir}/libwx_gtk3u_stc-*.so.* %if 0%{?fedora} < 26 -%{_libdir}/libwx_gtk%{gtkver}u_webview-*.so.* +%{_libdir}/libwx_gtk3u_webview-*.so.* %endif -%endif -%{_libdir}/libwx_gtk%{gtkver}u_xrc-*.so.* +%{_libdir}/libwx_gtk3u_xrc-*.so.* -%files devel +%files -n %{wxgtk2name} +%doc docs/changes.txt docs/gpl.txt docs/lgpl.txt docs/licence.txt +%doc docs/licendoc.txt docs/preamble.txt docs/readme.txt +%{_libdir}/libwx_gtk2u_adv-*.so.* +%{_libdir}/libwx_gtk2u_aui-*.so.* +%{_libdir}/libwx_gtk2u_core-*.so.* +%{_libdir}/libwx_gtk2u_html-*.so.* +%{_libdir}/libwx_gtk2u_propgrid-*.so.* +%{_libdir}/libwx_gtk2u_qa-*.so.* +%{_libdir}/libwx_gtk2u_ribbon-*.so.* +%{_libdir}/libwx_gtk2u_richtext-*.so.* +%{_libdir}/libwx_gtk2u_stc-*.so.* +%{_libdir}/libwx_gtk2u_xrc-*.so.* + +%files -n %{wxbasename}-devel %ghost %{_bindir}/wx-config %ghost %{_bindir}/wxrc %{_bindir}/wxrc-3.0 %{_bindir}/wx-config-3.0 %{_includedir}/wx-3.0 -%{_libdir}/libwx_*.so -%{_libdir}/wx +%{_libdir}/libwx_baseu*.so +%dir %{_libdir}/wx +%dir %{_libdir}/wx/config +%dir %{_libdir}/wx/include %{_datadir}/aclocal/wxwin3.m4 %{_datadir}/bakefile/presets/wx3 #Exclude some python bitecode %exclude %{_datadir}/bakefile/presets/wx3/*.pyc %exclude %{_datadir}/bakefile/presets/wx3/*.pyo %{_libexecdir}/%{name} -%if 0%{?fedora} > 25 -%exclude %{_libdir}/wx/3.0 -%endif + +%files devel +%{_libdir}/libwx_gtk3u_*.so +%{_libdir}/wx/config/gtk3-unicode-3.0 +%{_libdir}/wx/include/gtk3-unicode-3.0 + +%files -n %{wxgtk2name}-devel +%{_libdir}/libwx_gtk2u_*.so +%{_libdir}/wx/config/gtk2-unicode-3.0 +%{_libdir}/wx/include/gtk2-unicode-3.0 %files gl -%{_libdir}/libwx_gtk%{gtkver}u_gl-*.so.* +%{_libdir}/libwx_gtk3u_gl-*.so.* + +%files -n %{wxgtk2name}-gl +%{_libdir}/libwx_gtk2u_gl-*.so.* + +%files i18n -f wxstd3.lang %files media -%{_libdir}/libwx_gtk%{gtkver}u_media-*.so.* +%{_libdir}/libwx_gtk3u_media-*.so.* + +%files -n %{wxgtk2name}-media +%{_libdir}/libwx_gtk2u_media-*.so.* %if 0%{?fedora} > 25 %files webview -%{_libdir}/libwx_gtk%{gtkver}u_webview-*.so.* +%{_libdir}/libwx_gtk3u_webview-*.so.* %dir %{_libdir}/wx %{_libdir}/wx/3.0 %endif @@ -378,6 +539,9 @@ fi %doc docs/doxygen/out/xml/* %changelog +* Tue Sep 05 2017 Scott Talbert - 3.0.3-6 +- Merge with compat-wxGTK3-gtk2 + * Wed Aug 30 2017 Scott Talbert - 3.0.3-5 - Add upstream patch for avoiding destruction of TLWs that were never created - Fixes assert during Filezilla startup (#1484955) From 2dc94ae936b4a9735b217086391128b1e079f5e6 Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Fri, 12 Jan 2018 15:30:20 +0100 Subject: [PATCH 09/48] Adapt to the webkitgtk4 rename --- wxGTK3.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/wxGTK3.spec b/wxGTK3.spec index a837363..72b436f 100644 --- a/wxGTK3.spec +++ b/wxGTK3.spec @@ -18,7 +18,7 @@ Name: %{wxgtkname} Version: 3.0.3 -Release: 6%{?snapshottag}%{?dist} +Release: 7%{?snapshottag}%{?dist} Summary: GTK port of the wxWidgets GUI library License: wxWidgets Group: System Environment/Libraries @@ -49,7 +49,7 @@ BuildRequires: gtk3-devel %if 0%{?fedora} < 26 BuildRequires: webkitgtk3-devel %else -BuildRequires: webkitgtk4-devel +BuildRequires: webkit2gtk3-devel %endif BuildRequires: zlib-devel BuildRequires: libpng-devel @@ -539,6 +539,9 @@ fi %doc docs/doxygen/out/xml/* %changelog +* Fri Jan 12 2018 Tomas Popela - 3.0.3-7 +- Adapt to the webkitgtk4 rename + * Tue Sep 05 2017 Scott Talbert - 3.0.3-6 - Merge with compat-wxGTK3-gtk2 From 976afdc45739db4e4580fdc0bbcf997e087f6ef3 Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Wed, 17 Jan 2018 14:07:15 +0100 Subject: [PATCH 10/48] fix some conditionals --- wxGTK3.spec | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/wxGTK3.spec b/wxGTK3.spec index 72b436f..142a75a 100644 --- a/wxGTK3.spec +++ b/wxGTK3.spec @@ -38,7 +38,7 @@ Source10: wx-config # Backport from wxGTK Patch0: %{name}-%{version}-abicheck.patch # Patch to port to webkit2gtk -%if 0%{?fedora} > 25 +%if 0%{?fedora} > 25 || 0%{?rhel} > 7 Patch1: %{name}-%{version}-webkit2.patch %endif # https://github.com/wxWidgets/wxWidgets/commit/ce1dce113c5eda42f49ba3278bb21c61872ca37d @@ -46,7 +46,7 @@ Patch2: %{name}-%{version}-avoid-tlw-destroy-assert.patch BuildRequires: gtk2-devel BuildRequires: gtk3-devel -%if 0%{?fedora} < 26 +%if 0%{?fedora} < 26 && 0%{?rhel} <= 7 BuildRequires: webkitgtk3-devel %else BuildRequires: webkit2gtk3-devel @@ -56,14 +56,14 @@ BuildRequires: libpng-devel BuildRequires: libjpeg-devel BuildRequires: libtiff-devel BuildRequires: expat-devel -%if 0%{?fedora} < 26 +%if 0%{?fedora} < 26 && 0%{?rhel} <= 7 BuildRequires: SDL-devel %else BuildRequires: SDL2-devel %endif BuildRequires: libGLU-devel BuildRequires: libSM-devel -%if 0%{?fedora} < 26 +%if 0%{?fedora} < 26 && 0%{?rhel} <= 7 BuildRequires: gstreamer-plugins-base-devel %else BuildRequires: gstreamer1-plugins-base-devel @@ -121,7 +121,7 @@ Summary: Development files for the wxGTK3 library Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}-gl = %{version}-%{release} Requires: %{name}-media = %{version}-%{release} -%if 0%{?fedora} > 25 +%if 0%{?fedora} > 25 || 0%{?rhel} > 7 Requires: %{name}-webview = %{version}-%{release} %endif Requires: %{wxbasename} = %{version}-%{release} @@ -223,7 +223,7 @@ comprehensive set of helper classes for most common application tasks, ranging from networking to HTML display and image manipulation. -%if 0%{?fedora} > 25 +%if 0%{?fedora} > 25 || 0%{?rhel} > 7 %package webview Summary: WebView add-on for the wxWidgets library Group: System Environment/Libraries @@ -423,7 +423,7 @@ popd %post -n %{wxgtk2name}-media -p /sbin/ldconfig %postun -n %{wxgtk2name}-media -p /sbin/ldconfig -%if 0%{?fedora} > 25 +%if 0%{?fedora} > 25 || 0%{?rhel} > 7 %post webview -p /sbin/ldconfig %postun webview -p /sbin/ldconfig %endif @@ -458,7 +458,7 @@ fi %{_libdir}/libwx_gtk3u_ribbon-*.so.* %{_libdir}/libwx_gtk3u_richtext-*.so.* %{_libdir}/libwx_gtk3u_stc-*.so.* -%if 0%{?fedora} < 26 +%if 0%{?fedora} < 26 && 0%{?rhel} <= 7 %{_libdir}/libwx_gtk3u_webview-*.so.* %endif %{_libdir}/libwx_gtk3u_xrc-*.so.* @@ -518,7 +518,7 @@ fi %files -n %{wxgtk2name}-media %{_libdir}/libwx_gtk2u_media-*.so.* -%if 0%{?fedora} > 25 +%if 0%{?fedora} > 25 || 0%{?rhel} > 7 %files webview %{_libdir}/libwx_gtk3u_webview-*.so.* %dir %{_libdir}/wx @@ -539,6 +539,9 @@ fi %doc docs/doxygen/out/xml/* %changelog +* Wed Jan 17 2018 Karsten Hopp - 3.0.3-8 +- fix some conditionals + * Fri Jan 12 2018 Tomas Popela - 3.0.3-7 - Adapt to the webkitgtk4 rename From 5e859890700967a10117d838f00bf0d38d2d9c24 Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Wed, 17 Jan 2018 14:52:21 +0100 Subject: [PATCH 11/48] fix some conditionals --- wxGTK3.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wxGTK3.spec b/wxGTK3.spec index 142a75a..8952e3f 100644 --- a/wxGTK3.spec +++ b/wxGTK3.spec @@ -18,7 +18,7 @@ Name: %{wxgtkname} Version: 3.0.3 -Release: 7%{?snapshottag}%{?dist} +Release: 8%{?snapshottag}%{?dist} Summary: GTK port of the wxWidgets GUI library License: wxWidgets Group: System Environment/Libraries From 6984897584d5f7d212426ce8fe17229f868e7bf1 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 17 Jan 2018 17:29:00 +0100 Subject: [PATCH 12/48] unconditionally include patch Signed-off-by: Igor Gnatenko --- wxGTK3.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/wxGTK3.spec b/wxGTK3.spec index 8952e3f..ae7897a 100644 --- a/wxGTK3.spec +++ b/wxGTK3.spec @@ -38,9 +38,7 @@ Source10: wx-config # Backport from wxGTK Patch0: %{name}-%{version}-abicheck.patch # Patch to port to webkit2gtk -%if 0%{?fedora} > 25 || 0%{?rhel} > 7 Patch1: %{name}-%{version}-webkit2.patch -%endif # https://github.com/wxWidgets/wxWidgets/commit/ce1dce113c5eda42f49ba3278bb21c61872ca37d Patch2: %{name}-%{version}-avoid-tlw-destroy-assert.patch From 35d1c2fde37ae623f04818f7d1a8f1e6ffd7e2ee Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 17 Jan 2018 17:31:08 +0100 Subject: [PATCH 13/48] F25 is EOL Also half of conditions were totally wrong. Signed-off-by: Igor Gnatenko --- wxGTK3.spec | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/wxGTK3.spec b/wxGTK3.spec index ae7897a..c51acba 100644 --- a/wxGTK3.spec +++ b/wxGTK3.spec @@ -44,28 +44,16 @@ Patch2: %{name}-%{version}-avoid-tlw-destroy-assert.patch BuildRequires: gtk2-devel BuildRequires: gtk3-devel -%if 0%{?fedora} < 26 && 0%{?rhel} <= 7 -BuildRequires: webkitgtk3-devel -%else BuildRequires: webkit2gtk3-devel -%endif BuildRequires: zlib-devel BuildRequires: libpng-devel BuildRequires: libjpeg-devel BuildRequires: libtiff-devel BuildRequires: expat-devel -%if 0%{?fedora} < 26 && 0%{?rhel} <= 7 -BuildRequires: SDL-devel -%else BuildRequires: SDL2-devel -%endif BuildRequires: libGLU-devel BuildRequires: libSM-devel -%if 0%{?fedora} < 26 && 0%{?rhel} <= 7 -BuildRequires: gstreamer-plugins-base-devel -%else BuildRequires: gstreamer1-plugins-base-devel -%endif BuildRequires: GConf2-devel BuildRequires: gettext BuildRequires: cppunit-devel @@ -119,9 +107,7 @@ Summary: Development files for the wxGTK3 library Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}-gl = %{version}-%{release} Requires: %{name}-media = %{version}-%{release} -%if 0%{?fedora} > 25 || 0%{?rhel} > 7 Requires: %{name}-webview = %{version}-%{release} -%endif Requires: %{wxbasename} = %{version}-%{release} Requires: %{wxbasename}-devel%{?_isa} = %{version}-%{release} Requires: gtk3-devel @@ -221,7 +207,6 @@ comprehensive set of helper classes for most common application tasks, ranging from networking to HTML display and image manipulation. -%if 0%{?fedora} > 25 || 0%{?rhel} > 7 %package webview Summary: WebView add-on for the wxWidgets library Group: System Environment/Libraries @@ -233,7 +218,6 @@ wxWidgets is the GTK port of the C++ cross-platform wxWidgets GUI library, offering classes for all common GUI controls as well as a comprehensive set of helper classes for most common application tasks, ranging from networking to HTML display and image manipulation. -%endif %package -n %{wxbasename} @@ -421,10 +405,8 @@ popd %post -n %{wxgtk2name}-media -p /sbin/ldconfig %postun -n %{wxgtk2name}-media -p /sbin/ldconfig -%if 0%{?fedora} > 25 || 0%{?rhel} > 7 %post webview -p /sbin/ldconfig %postun webview -p /sbin/ldconfig -%endif %post -n %{wxbasename} -p /sbin/ldconfig %postun -n %{wxbasename} -p /sbin/ldconfig @@ -456,9 +438,6 @@ fi %{_libdir}/libwx_gtk3u_ribbon-*.so.* %{_libdir}/libwx_gtk3u_richtext-*.so.* %{_libdir}/libwx_gtk3u_stc-*.so.* -%if 0%{?fedora} < 26 && 0%{?rhel} <= 7 -%{_libdir}/libwx_gtk3u_webview-*.so.* -%endif %{_libdir}/libwx_gtk3u_xrc-*.so.* %files -n %{wxgtk2name} @@ -516,12 +495,10 @@ fi %files -n %{wxgtk2name}-media %{_libdir}/libwx_gtk2u_media-*.so.* -%if 0%{?fedora} > 25 || 0%{?rhel} > 7 %files webview %{_libdir}/libwx_gtk3u_webview-*.so.* %dir %{_libdir}/wx %{_libdir}/wx/3.0 -%endif %files -n %{wxbasename} %doc docs/changes.txt docs/gpl.txt docs/lgpl.txt docs/licence.txt From 2b38f2180e4322ff148dbf326480f646bbf0251c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 21:13:48 +0000 Subject: [PATCH 14/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wxGTK3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wxGTK3.spec b/wxGTK3.spec index c51acba..2b199a0 100644 --- a/wxGTK3.spec +++ b/wxGTK3.spec @@ -18,7 +18,7 @@ Name: %{wxgtkname} Version: 3.0.3 -Release: 8%{?snapshottag}%{?dist} +Release: 9%{?snapshottag}%{?dist} Summary: GTK port of the wxWidgets GUI library License: wxWidgets Group: System Environment/Libraries @@ -514,6 +514,9 @@ fi %doc docs/doxygen/out/xml/* %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 3.0.3-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Wed Jan 17 2018 Karsten Hopp - 3.0.3-8 - fix some conditionals From 48f2dc65e7a73bead1a696b039aa6fda144d2909 Mon Sep 17 00:00:00 2001 From: Scott Talbert Date: Sun, 18 Feb 2018 22:07:11 -0500 Subject: [PATCH 15/48] Add missing BR for gcc-c++ --- wxGTK3.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/wxGTK3.spec b/wxGTK3.spec index 2b199a0..9648237 100644 --- a/wxGTK3.spec +++ b/wxGTK3.spec @@ -18,7 +18,7 @@ Name: %{wxgtkname} Version: 3.0.3 -Release: 9%{?snapshottag}%{?dist} +Release: 10%{?snapshottag}%{?dist} Summary: GTK port of the wxWidgets GUI library License: wxWidgets Group: System Environment/Libraries @@ -42,6 +42,7 @@ Patch1: %{name}-%{version}-webkit2.patch # https://github.com/wxWidgets/wxWidgets/commit/ce1dce113c5eda42f49ba3278bb21c61872ca37d Patch2: %{name}-%{version}-avoid-tlw-destroy-assert.patch +BuildRequires: gcc-c++ BuildRequires: gtk2-devel BuildRequires: gtk3-devel BuildRequires: webkit2gtk3-devel @@ -514,6 +515,9 @@ fi %doc docs/doxygen/out/xml/* %changelog +* Mon Feb 19 2018 Scott Talbert - 3.0.3-10 +- Add missing BR for gcc-c++ + * Fri Feb 09 2018 Fedora Release Engineering - 3.0.3-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From de064a8931b3933a357d359d1cf58003767ff855 Mon Sep 17 00:00:00 2001 From: Scott Talbert Date: Mon, 12 Mar 2018 22:56:45 -0400 Subject: [PATCH 16/48] New upstream release 3.0.4 --- .gitignore | 1 + sources | 2 +- wxGTK3.spec | 13 ++++++------- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 5f25f93..cd13b39 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /wxWidgets-f90b768.tar.gz /wxWidgets-e4293e9.tar.gz /wxWidgets-3.0.3.tar.bz2 +/wxWidgets-3.0.4.tar.bz2 diff --git a/sources b/sources index 795cf28..2d9ca6a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wxWidgets-3.0.3.tar.bz2) = dfe53682d7cda1d460f336a890603c4e823078be4b05e7cf43ab36cb49247f702808aa939d9311705bdf5f96eaa076e7a8f77f4415bc07c5bfdc19e5deff1dd1 +SHA512 (wxWidgets-3.0.4.tar.bz2) = c9e6b35d541a99921c54cfdac260843f574f146b27f924a7a0fca5007344fa99865a96ded95e6802329ad9221b4880d62b92277a1b4c1ce71420acb672ad9158 diff --git a/wxGTK3.spec b/wxGTK3.spec index 9648237..e535cc1 100644 --- a/wxGTK3.spec +++ b/wxGTK3.spec @@ -17,8 +17,8 @@ %global builddocs 1 Name: %{wxgtkname} -Version: 3.0.3 -Release: 10%{?snapshottag}%{?dist} +Version: 3.0.4 +Release: 1%{?snapshottag}%{?dist} Summary: GTK port of the wxWidgets GUI library License: wxWidgets Group: System Environment/Libraries @@ -36,11 +36,7 @@ Source10: wx-config # https://bugzilla.redhat.com/show_bug.cgi?id=1225148 # remove abort when ABI check fails # Backport from wxGTK -Patch0: %{name}-%{version}-abicheck.patch -# Patch to port to webkit2gtk -Patch1: %{name}-%{version}-webkit2.patch -# https://github.com/wxWidgets/wxWidgets/commit/ce1dce113c5eda42f49ba3278bb21c61872ca37d -Patch2: %{name}-%{version}-avoid-tlw-destroy-assert.patch +Patch0: %{name}-3.0.3-abicheck.patch BuildRequires: gcc-c++ BuildRequires: gtk2-devel @@ -515,6 +511,9 @@ fi %doc docs/doxygen/out/xml/* %changelog +* Fri Mar 09 2018 Scott Talbert - 3.0.4-1 +- New upstream release 3.0.4 + * Mon Feb 19 2018 Scott Talbert - 3.0.3-10 - Add missing BR for gcc-c++ From ce9624b2a388641bd9588dd3f6df530ea9c3a908 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sun, 18 Mar 2018 10:21:12 +0000 Subject: [PATCH 17/48] Port wx-config script to RISC-V architecture. --- wx-config | 4 ++-- wxGTK3.spec | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/wx-config b/wx-config index cd27264..175fdbd 100644 --- a/wx-config +++ b/wx-config @@ -19,10 +19,10 @@ if [ -z $arch ]; then fi case $arch in - i?86|ppc|s390|sparc|arm*|ia64|mips|mipsel) + i?86|ppc|s390|sparc|arm*|ia64|mips|mipsel|riscv32) libdir=/usr/lib ;; - x86_64|ppc64|s390x|sparc64|aarch64|ppc64le|mips64*) + x86_64|ppc64|s390x|sparc64|aarch64|ppc64le|mips64*|riscv64) libdir=/usr/lib64 ;; *) diff --git a/wxGTK3.spec b/wxGTK3.spec index e535cc1..44e817f 100644 --- a/wxGTK3.spec +++ b/wxGTK3.spec @@ -18,7 +18,7 @@ Name: %{wxgtkname} Version: 3.0.4 -Release: 1%{?snapshottag}%{?dist} +Release: 2%{?snapshottag}%{?dist} Summary: GTK port of the wxWidgets GUI library License: wxWidgets Group: System Environment/Libraries @@ -511,6 +511,9 @@ fi %doc docs/doxygen/out/xml/* %changelog +* Sun Mar 18 2018 Richard W.M. Jones - 3.0.4-2 +- Port wx-config script to RISC-V architecture. + * Fri Mar 09 2018 Scott Talbert - 3.0.4-1 - New upstream release 3.0.4 From 7e5a11a94fdc4638fd3a4bff4990d21b2daefb2f Mon Sep 17 00:00:00 2001 From: Scott Talbert Date: Fri, 29 Jun 2018 09:46:37 -0400 Subject: [PATCH 18/48] Remove ldconfig scriptlets (no longer needed on F28+) --- wxGTK3.spec | 29 ++++------------------------- 1 file changed, 4 insertions(+), 25 deletions(-) diff --git a/wxGTK3.spec b/wxGTK3.spec index 44e817f..ea4976c 100644 --- a/wxGTK3.spec +++ b/wxGTK3.spec @@ -18,7 +18,7 @@ Name: %{wxgtkname} Version: 3.0.4 -Release: 2%{?snapshottag}%{?dist} +Release: 3%{?snapshottag}%{?dist} Summary: GTK port of the wxWidgets GUI library License: wxWidgets Group: System Environment/Libraries @@ -384,30 +384,6 @@ make %{?_smp_mflags} test popd popd -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig - -%post -n %{wxgtk2name} -p /sbin/ldconfig -%postun -n %{wxgtk2name} -p /sbin/ldconfig - -%post gl -p /sbin/ldconfig -%postun gl -p /sbin/ldconfig - -%post -n %{wxgtk2name}-gl -p /sbin/ldconfig -%postun -n %{wxgtk2name}-gl -p /sbin/ldconfig - -%post media -p /sbin/ldconfig -%postun media -p /sbin/ldconfig - -%post -n %{wxgtk2name}-media -p /sbin/ldconfig -%postun -n %{wxgtk2name}-media -p /sbin/ldconfig - -%post webview -p /sbin/ldconfig -%postun webview -p /sbin/ldconfig - -%post -n %{wxbasename} -p /sbin/ldconfig -%postun -n %{wxbasename} -p /sbin/ldconfig - %post -n %{wxbasename}-devel if [ -f %{_bindir}/wx-config ] && [ ! -h %{_bindir}/wx-config ] ; then rm %{_bindir}/wx-config @@ -511,6 +487,9 @@ fi %doc docs/doxygen/out/xml/* %changelog +* Fri Jun 29 2018 Scott Talbert - 3.0.4-3 +- Remove ldconfig scriptlets (no longer needed on F28+) + * Sun Mar 18 2018 Richard W.M. Jones - 3.0.4-2 - Port wx-config script to RISC-V architecture. From d77224ec01196f30865115254821de7dfa0c83b4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 09:02:15 +0000 Subject: [PATCH 19/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wxGTK3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wxGTK3.spec b/wxGTK3.spec index ea4976c..e5570de 100644 --- a/wxGTK3.spec +++ b/wxGTK3.spec @@ -18,7 +18,7 @@ Name: %{wxgtkname} Version: 3.0.4 -Release: 3%{?snapshottag}%{?dist} +Release: 4%{?snapshottag}%{?dist} Summary: GTK port of the wxWidgets GUI library License: wxWidgets Group: System Environment/Libraries @@ -487,6 +487,9 @@ fi %doc docs/doxygen/out/xml/* %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 3.0.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Jun 29 2018 Scott Talbert - 3.0.4-3 - Remove ldconfig scriptlets (no longer needed on F28+) From dc9ff32ab12ed0484644b57e37d3ad21938b77e0 Mon Sep 17 00:00:00 2001 From: Scott Talbert Date: Tue, 20 Nov 2018 19:53:08 -0500 Subject: [PATCH 20/48] Remove old, unused patches --- wxGTK3-3.0.3-avoid-tlw-destroy-assert.patch | 29 - wxGTK3-3.0.3-webkit2.patch | 2495 ------------------- 2 files changed, 2524 deletions(-) delete mode 100644 wxGTK3-3.0.3-avoid-tlw-destroy-assert.patch delete mode 100644 wxGTK3-3.0.3-webkit2.patch diff --git a/wxGTK3-3.0.3-avoid-tlw-destroy-assert.patch b/wxGTK3-3.0.3-avoid-tlw-destroy-assert.patch deleted file mode 100644 index ea5cae3..0000000 --- a/wxGTK3-3.0.3-avoid-tlw-destroy-assert.patch +++ /dev/null @@ -1,29 +0,0 @@ -From ce1dce113c5eda42f49ba3278bb21c61872ca37d Mon Sep 17 00:00:00 2001 -From: Paul Cornett -Date: Mon, 28 Aug 2017 20:31:47 -0700 -Subject: [PATCH] Avoid delayed destruction if TLW was never created. See - #17942 - -(cherry picked from commit 4a71ba820f085a3d5a7233e9fd0e23ae4e45af58) ---- - src/common/toplvcmn.cpp | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/common/toplvcmn.cpp b/src/common/toplvcmn.cpp -index ef693690c5d..6a722f8be48 100644 ---- a/src/common/toplvcmn.cpp -+++ b/src/common/toplvcmn.cpp -@@ -105,10 +105,10 @@ bool wxTopLevelWindowBase::Destroy() - // as we will be deleted anyhow during its destruction and the pointer - // stored in wxPendingDelete would become invalid, so just delete ourselves - // immediately in this case. -- if ( wxWindow* parent = GetParent() ) -+ wxWindow* parent = GetParent(); -+ if ( (parent && parent->IsBeingDeleted()) || !GetHandle() ) - { -- if ( parent->IsBeingDeleted() ) -- return wxNonOwnedWindow::Destroy(); -+ return wxNonOwnedWindow::Destroy(); - } - - // delayed destruction: the frame will be deleted during the next idle diff --git a/wxGTK3-3.0.3-webkit2.patch b/wxGTK3-3.0.3-webkit2.patch deleted file mode 100644 index 53883f1..0000000 --- a/wxGTK3-3.0.3-webkit2.patch +++ /dev/null @@ -1,2495 +0,0 @@ -From ec6e54bc893fb7516731ca9c71e0d0bbc5ae9ff7 Mon Sep 17 00:00:00 2001 -From: Scott Talbert -Date: Thu, 30 Mar 2017 21:34:24 -0400 -Subject: [PATCH] Add support for WebKit2GTK+ in wxWebView - -Closes https://github.com/wxWidgets/wxWidgets/pull/469 ---- - Makefile.in | 58 +- - autoconf_inc.m4 | 6 + - build/bakefiles/config.bkl | 1 + - build/bakefiles/files.bkl | 5 + - build/bakefiles/multilib.bkl | 1 + - build/bakefiles/plugins.bkl | 5 + - configure | 108 ++- - configure.in | 42 +- - docs/changes.txt | 8 + - include/wx/android/setup.h | 13 +- - include/wx/chkconf.h | 2 +- - include/wx/gtk/setup0.h | 13 +- - include/wx/gtk/webview_webkit.h | 18 +- - include/wx/gtk/webview_webkit2_extension.h | 15 + - include/wx/gtk/webviewhistoryitem_webkit.h | 2 +- - include/wx/motif/setup0.h | 13 +- - include/wx/msw/setup0.h | 13 +- - include/wx/msw/wince/setup.h | 13 +- - include/wx/os2/setup0.h | 13 +- - include/wx/osx/setup0.h | 13 +- - include/wx/setup_inc.h | 13 +- - include/wx/univ/setup0.h | 13 +- - interface/wx/webview.h | 4 + - samples/webview/webview.cpp | 2 +- - setup.h.in | 8 +- - src/gtk/webview_webkit2.cpp | 1261 ++++++++++++++++++++++++++++ - src/gtk/webview_webkit2_extension.cpp | 421 ++++++++++ - 27 files changed, 2046 insertions(+), 38 deletions(-) - create mode 100644 include/wx/gtk/webview_webkit2_extension.h - create mode 100644 src/gtk/webview_webkit2.cpp - create mode 100644 src/gtk/webview_webkit2_extension.cpp - -diff --git a/Makefile.in b/Makefile.in -index 7a10765..f032587 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -1655,12 +1655,14 @@ WEBVIEWDLL_CXXFLAGS = $(__webviewdll_PCH_INC) -D__WX$(TOOLKIT)__ \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) \ - $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ - $(__INC_REGEX_p) $(__INC_EXPAT_p) -DWXUSINGDLL -DWXMAKINGDLL_WEBVIEW \ -+ -DWX_WEB_EXTENSIONS_DIRECTORY=\"$(PLUGINS_INST_DIR)/web-extensions\" \ - $(PIC_FLAG) $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS) - WEBVIEWDLL_OBJCXXFLAGS = $(__webviewdll_PCH_INC) -D__WX$(TOOLKIT)__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) \ - $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ - $(__INC_REGEX_p) $(__INC_EXPAT_p) -DWXUSINGDLL -DWXMAKINGDLL_WEBVIEW \ -+ -DWX_WEB_EXTENSIONS_DIRECTORY=\"$(PLUGINS_INST_DIR)/web-extensions\" \ - $(PIC_FLAG) $(CPPFLAGS) $(OBJCXXFLAGS) - WEBVIEWDLL_OBJECTS = \ - $(__webviewdll___win32rc) \ -@@ -2078,6 +2080,10 @@ SOUND_SDL_CXXFLAGS = -DWXUSINGDLL -DwxUSE_GUI=0 $(PIC_FLAG) $(CPPFLAGS) \ - $(CXXFLAGS) - SOUND_SDL_OBJECTS = \ - sound_sdl_sound_sdl.o -+WEBKIT2_EXT_CXXFLAGS = -DWXUSINGDLL -DwxUSE_GUI=0 $(PIC_FLAG) $(CPPFLAGS) \ -+ $(CXXFLAGS) -+WEBKIT2_EXT_OBJECTS = \ -+ webkit2_ext_webview_webkit2_extension.o - LOCALE_LINGUAS = ca cs da de el es fi fr hu id it ja nl pl ru sl sv tr uk zh zh_CN zh_TW - LOCALE_MSW_LINGUAS = it - -@@ -6754,6 +6760,8 @@ COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_1 = \ - @COND_PLATFORM_MACOSX_1@ = monodll_osx_webview_webkit.o - @COND_TOOLKIT_GTK@__WEBVIEW_SRC_PLATFORM_OBJECTS = \ - @COND_TOOLKIT_GTK@ monodll_gtk_webview_webkit.o -+@COND_TOOLKIT_GTK@__WEBVIEW_SRC_PLATFORM_OBJECTS = \ -+@COND_TOOLKIT_GTK@ monodll_webview_webkit2.o - @COND_TOOLKIT_MSW@__WEBVIEW_SRC_PLATFORM_OBJECTS = monodll_webview_ie.o - @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__AUI_GTK_SRC_OBJECTS \ - @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ = monodll_tabartgtk.o -@@ -9009,6 +9017,8 @@ COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_3 = \ - @COND_PLATFORM_MACOSX_1@ = monolib_osx_webview_webkit.o - @COND_TOOLKIT_GTK@__WEBVIEW_SRC_PLATFORM_OBJECTS_1 = \ - @COND_TOOLKIT_GTK@ monolib_gtk_webview_webkit.o -+@COND_TOOLKIT_GTK@__WEBVIEW_SRC_PLATFORM_OBJECTS_1 = \ -+@COND_TOOLKIT_GTK@ monolib_webview_webkit2.o - @COND_TOOLKIT_MSW@__WEBVIEW_SRC_PLATFORM_OBJECTS_1 = monolib_webview_ie.o - @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__AUI_GTK_SRC_OBJECTS_1 \ - @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ = monolib_tabartgtk.o -@@ -13765,6 +13775,8 @@ COND_USE_SOVERSOLARIS_1___webviewdll___so_symlinks_uninst_cmd = rm -f \ - @COND_PLATFORM_MACOSX_1@ = webviewdll_osx_webview_webkit.o - @COND_TOOLKIT_GTK@__WEBVIEW_SRC_PLATFORM_OBJECTS_2 = \ - @COND_TOOLKIT_GTK@ webviewdll_gtk_webview_webkit.o -+@COND_TOOLKIT_GTK@__WEBVIEW_SRC_PLATFORM_OBJECTS_2 = \ -+@COND_TOOLKIT_GTK@ webviewdll_webview_webkit2.o - @COND_TOOLKIT_MSW@__WEBVIEW_SRC_PLATFORM_OBJECTS_2 = \ - @COND_TOOLKIT_MSW@ webviewdll_webview_ie.o - COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_1___webviewlib___depname = \ -@@ -13784,6 +13796,8 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_1___webviewlib___depname = \ - @COND_PLATFORM_MACOSX_1@ = webviewlib_osx_webview_webkit.o - @COND_TOOLKIT_GTK@__WEBVIEW_SRC_PLATFORM_OBJECTS_3 = \ - @COND_TOOLKIT_GTK@ webviewlib_gtk_webview_webkit.o -+@COND_TOOLKIT_GTK@__WEBVIEW_SRC_PLATFORM_OBJECTS_3 = \ -+@COND_TOOLKIT_GTK@ webviewlib_webview_webkit2.o - @COND_TOOLKIT_MSW@__WEBVIEW_SRC_PLATFORM_OBJECTS_3 = \ - @COND_TOOLKIT_MSW@ webviewlib_webview_ie.o - @COND_SHARED_1@____wxwebview_namedll_DEP = $(__webviewdll___depname) -@@ -14586,6 +14600,13 @@ COND_WITH_PLUGIN_SDL_1___sound_sdl___depname = \ - @COND_WITH_PLUGIN_SDL_1@__install_sound_sdl___depname = install_sound_sdl - @COND_WITH_PLUGIN_SDL_1@__uninstall_sound_sdl___depname \ - @COND_WITH_PLUGIN_SDL_1@ = uninstall_sound_sdl -+COND_USE_WEBVIEW_WEBKIT2_1___webkit2_ext___depname = \ -+ $(DLLPREFIX_MODULE)webkit2_ext$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE) -+@COND_USE_WEBVIEW_WEBKIT2_1@__webkit2_ext___depname = $(COND_USE_WEBVIEW_WEBKIT2_1___webkit2_ext___depname) -+@COND_USE_WEBVIEW_WEBKIT2_1@__install_webkit2_ext___depname \ -+@COND_USE_WEBVIEW_WEBKIT2_1@ = install_webkit2_ext -+@COND_USE_WEBVIEW_WEBKIT2_1@__uninstall_webkit2_ext___depname \ -+@COND_USE_WEBVIEW_WEBKIT2_1@ = uninstall_webkit2_ext - @COND_USE_XRC_1@__wxrc___depname = wxrc - @COND_USE_XRC_1@__clean_wxrc___depname = clean-wxrc - @COND_USE_XRC_1@__install_wxrc___depname = install-wxrc -@@ -15255,9 +15276,9 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \ - - ### Targets: ### - --all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxexpat___depname) $(__wxscintilla___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__webviewdll___depname) $(__webviewlib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__ribbondll___depname) $(__ribbonlib___depname) $(__propgriddll___depname) $(__propgridlib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___depname) $(__cocoa_res___depname) -+all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxexpat___depname) $(__wxscintilla___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__webviewdll___depname) $(__webviewlib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__ribbondll___depname) $(__ribbonlib___depname) $(__propgriddll___depname) $(__propgridlib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__webkit2_ext___depname) $(__wxrc___depname) $(__cocoa_res___depname) - --install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxexpat___depname) $(__install_wxscintilla___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_webviewdll___depname) $(__install_webviewlib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_ribbondll___depname) $(__install_ribbonlib___depname) $(__install_propgriddll___depname) $(__install_propgridlib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_stcdll___depname) $(__install_stclib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install $(__cocoa_res_install___depname) -+install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxexpat___depname) $(__install_wxscintilla___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_webviewdll___depname) $(__install_webviewlib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_ribbondll___depname) $(__install_ribbonlib___depname) $(__install_propgriddll___depname) $(__install_propgridlib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_stcdll___depname) $(__install_stclib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_webkit2_ext___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install $(__cocoa_res_install___depname) - $(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal - (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal) - $(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets -@@ -15293,7 +15314,7 @@ install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__instal - @echo " ------------------------------------------------------" - @echo " " - --uninstall: $(__uninstall_wxregex___depname) $(__uninstall_wxzlib___depname) $(__uninstall_wxpng___depname) $(__uninstall_wxjpeg___depname) $(__uninstall_wxtiff___depname) $(__uninstall_wxexpat___depname) $(__uninstall_wxscintilla___depname) $(__uninstall_monodll___depname) $(__uninstall_monolib___depname) $(__uninstall_basedll___depname) $(__uninstall_baselib___depname) $(__uninstall_netdll___depname) $(__uninstall_netlib___depname) $(__uninstall_coredll___depname) $(__uninstall_corelib___depname) $(__uninstall_advdll___depname) $(__uninstall_advlib___depname) $(__uninstall_mediadll___depname) $(__uninstall_medialib___depname) $(__uninstall_htmldll___depname) $(__uninstall_htmllib___depname) $(__uninstall_webviewdll___depname) $(__uninstall_webviewlib___depname) $(__uninstall_qadll___depname) $(__uninstall_qalib___depname) $(__uninstall_xmldll___depname) $(__uninstall_xmllib___depname) $(__uninstall_xrcdll___depname) $(__uninstall_xrclib___depname) $(__uninstall_auidll___depname) $(__uninstall_auilib___depname) $(__uninstall_ribbondll___depname) $(__uninstall_ribbonlib___depname) $(__uninstall_propgriddll___depname) $(__uninstall_propgridlib___depname) $(__uninstall_richtextdll___depname) $(__uninstall_richtextlib___depname) $(__uninstall_stcdll___depname) $(__uninstall_stclib___depname) $(__uninstall_gldll___depname) $(__uninstall_gllib___depname) $(__uninstall_sound_sdl___depname) locale_uninstall locale_msw_uninstall -+uninstall: $(__uninstall_wxregex___depname) $(__uninstall_wxzlib___depname) $(__uninstall_wxpng___depname) $(__uninstall_wxjpeg___depname) $(__uninstall_wxtiff___depname) $(__uninstall_wxexpat___depname) $(__uninstall_wxscintilla___depname) $(__uninstall_monodll___depname) $(__uninstall_monolib___depname) $(__uninstall_basedll___depname) $(__uninstall_baselib___depname) $(__uninstall_netdll___depname) $(__uninstall_netlib___depname) $(__uninstall_coredll___depname) $(__uninstall_corelib___depname) $(__uninstall_advdll___depname) $(__uninstall_advlib___depname) $(__uninstall_mediadll___depname) $(__uninstall_medialib___depname) $(__uninstall_htmldll___depname) $(__uninstall_htmllib___depname) $(__uninstall_webviewdll___depname) $(__uninstall_webviewlib___depname) $(__uninstall_qadll___depname) $(__uninstall_qalib___depname) $(__uninstall_xmldll___depname) $(__uninstall_xmllib___depname) $(__uninstall_xrcdll___depname) $(__uninstall_xrclib___depname) $(__uninstall_auidll___depname) $(__uninstall_auilib___depname) $(__uninstall_ribbondll___depname) $(__uninstall_ribbonlib___depname) $(__uninstall_propgriddll___depname) $(__uninstall_propgridlib___depname) $(__uninstall_richtextdll___depname) $(__uninstall_richtextlib___depname) $(__uninstall_stcdll___depname) $(__uninstall_stclib___depname) $(__uninstall_gldll___depname) $(__uninstall_gllib___depname) $(__uninstall_sound_sdl___depname) $(__uninstall_webkit2_ext___depname) locale_uninstall locale_msw_uninstall - (cd $(DESTDIR)$(datadir)/aclocal ; rm -f wxwin.m4) - (cd $(DESTDIR)$(datadir)/bakefile/presets ; rm -f wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py) - for f in setup.h $(RCDEFS_H); do \ -@@ -15322,6 +15343,7 @@ install-strip: install - $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) - $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) - $(STRIP) $(DESTDIR)$(PLUGINS_INST_DIR)/$(DLLPREFIX_MODULE)sound_sdl$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE) -+ $(STRIP) $(DESTDIR)$(PLUGINS_INST_DIR)/web-extensions/$(DLLPREFIX_MODULE)webkit2_ext$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE) - - clean: $(__clean_wxrc___depname) - rm -rf ./.deps ./.pch -@@ -15402,6 +15424,7 @@ clean: $(__clean_wxrc___depname) - rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) - rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) - rm -f $(DLLPREFIX_MODULE)sound_sdl$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE) -+ rm -f $(DLLPREFIX_MODULE)webkit2_ext$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE) - -(cd samples && $(MAKE) clean) - rm -f lib/libwx_$(TOOLCHAIN_NAME).0.rsrc lib/libwx_$(TOOLCHAIN_NAME).0.r - -@@ -16130,6 +16153,16 @@ distclean: clean - @COND_WITH_PLUGIN_SDL_1@uninstall_sound_sdl: - @COND_WITH_PLUGIN_SDL_1@ rm -f $(DESTDIR)$(PLUGINS_INST_DIR)/$(DLLPREFIX_MODULE)sound_sdl$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE) - -+@COND_USE_WEBVIEW_WEBKIT2_1@$(DLLPREFIX_MODULE)webkit2_ext$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE): $(WEBKIT2_EXT_OBJECTS) -+@COND_USE_WEBVIEW_WEBKIT2_1@ $(SHARED_LD_MODULE_CXX) $@ $(WEBKIT2_EXT_OBJECTS) $(LDFLAGS) $(EXTRALIBS_WEBVIEW) $(LIBS) -+ -+@COND_USE_WEBVIEW_WEBKIT2_1@install_webkit2_ext: $(__webkit2_ext___depname) -+@COND_USE_WEBVIEW_WEBKIT2_1@ $(INSTALL_DIR) $(DESTDIR)$(PLUGINS_INST_DIR)/web-extensions -+@COND_USE_WEBVIEW_WEBKIT2_1@ $(INSTALL_PROGRAM) $(DLLPREFIX_MODULE)webkit2_ext$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE) $(DESTDIR)$(PLUGINS_INST_DIR)/web-extensions -+ -+@COND_USE_WEBVIEW_WEBKIT2_1@uninstall_webkit2_ext: -+@COND_USE_WEBVIEW_WEBKIT2_1@ rm -f $(DESTDIR)$(PLUGINS_INST_DIR)/web-extensions/$(DLLPREFIX_MODULE)webkit2_ext$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE) -+ - samples: - (cd samples && $(MAKE) all) - -@@ -18563,6 +18596,9 @@ monodll_webview_ie.o: $(srcdir)/src/msw/webview_ie.cpp $(MONODLL_ODEP) - monodll_gtk_webview_webkit.o: $(srcdir)/src/gtk/webview_webkit.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/webview_webkit.cpp - -+monodll_webview_webkit2.o: $(srcdir)/src/gtk/webview_webkit2.cpp $(MONODLL_ODEP) -+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/webview_webkit2.cpp -+ - monodll_osx_webview_webkit.o: $(srcdir)/src/osx/webview_webkit.mm $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/webview_webkit.mm - -@@ -24440,6 +24476,9 @@ monolib_webview_ie.o: $(srcdir)/src/msw/webview_ie.cpp $(MONOLIB_ODEP) - monolib_gtk_webview_webkit.o: $(srcdir)/src/gtk/webview_webkit.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/webview_webkit.cpp - -+monolib_webview_webkit2.o: $(srcdir)/src/gtk/webview_webkit2.cpp $(MONOLIB_ODEP) -+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/webview_webkit2.cpp -+ - monolib_osx_webview_webkit.o: $(srcdir)/src/osx/webview_webkit.mm $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/webview_webkit.mm - -@@ -39792,7 +39831,7 @@ htmllib_htmllbox.o: $(srcdir)/src/generic/htmllbox.cpp $(HTMLLIB_ODEP) - @COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(HTMLLIB_CXXFLAGS) $(srcdir)/src/html/chm.cpp - - webviewdll_version_rc.o: $(srcdir)/src/msw/version.rc $(WEBVIEWDLL_ODEP) -- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_66) $(__INC_TIFF_p_66) $(__INC_JPEG_p_66) $(__INC_PNG_p_65) $(__INC_ZLIB_p_67) $(__INC_REGEX_p_65) $(__INC_EXPAT_p_65) --define WXUSINGDLL --define WXMAKINGDLL_WEBVIEW -+ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_66) $(__INC_TIFF_p_66) $(__INC_JPEG_p_66) $(__INC_PNG_p_65) $(__INC_ZLIB_p_67) $(__INC_REGEX_p_65) $(__INC_EXPAT_p_65) --define WXUSINGDLL --define WXMAKINGDLL_WEBVIEW --define WX_WEB_EXTENSIONS_DIRECTORY="$(PLUGINS_INST_DIR)/web-extensions" - - webviewdll_webview_ie.o: $(srcdir)/src/msw/webview_ie.cpp $(WEBVIEWDLL_ODEP) - $(CXXC) -c -o $@ $(WEBVIEWDLL_CXXFLAGS) $(srcdir)/src/msw/webview_ie.cpp -@@ -39800,6 +39839,9 @@ webviewdll_webview_ie.o: $(srcdir)/src/msw/webview_ie.cpp $(WEBVIEWDLL_ODEP) - webviewdll_gtk_webview_webkit.o: $(srcdir)/src/gtk/webview_webkit.cpp $(WEBVIEWDLL_ODEP) - $(CXXC) -c -o $@ $(WEBVIEWDLL_CXXFLAGS) $(srcdir)/src/gtk/webview_webkit.cpp - -+webviewdll_webview_webkit2.o: $(srcdir)/src/gtk/webview_webkit2.cpp $(WEBVIEWDLL_ODEP) -+ $(CXXC) -c -o $@ $(WEBVIEWDLL_CXXFLAGS) $(srcdir)/src/gtk/webview_webkit2.cpp -+ - webviewdll_osx_webview_webkit.o: $(srcdir)/src/osx/webview_webkit.mm $(WEBVIEWDLL_ODEP) - $(CXXC) -c -o $@ $(WEBVIEWDLL_OBJCXXFLAGS) $(srcdir)/src/osx/webview_webkit.mm - -@@ -39818,6 +39860,9 @@ webviewlib_webview_ie.o: $(srcdir)/src/msw/webview_ie.cpp $(WEBVIEWLIB_ODEP) - webviewlib_gtk_webview_webkit.o: $(srcdir)/src/gtk/webview_webkit.cpp $(WEBVIEWLIB_ODEP) - $(CXXC) -c -o $@ $(WEBVIEWLIB_CXXFLAGS) $(srcdir)/src/gtk/webview_webkit.cpp - -+webviewlib_webview_webkit2.o: $(srcdir)/src/gtk/webview_webkit2.cpp $(WEBVIEWLIB_ODEP) -+ $(CXXC) -c -o $@ $(WEBVIEWLIB_CXXFLAGS) $(srcdir)/src/gtk/webview_webkit2.cpp -+ - webviewlib_osx_webview_webkit.o: $(srcdir)/src/osx/webview_webkit.mm $(WEBVIEWLIB_ODEP) - $(CXXC) -c -o $@ $(WEBVIEWLIB_OBJCXXFLAGS) $(srcdir)/src/osx/webview_webkit.mm - -@@ -40658,6 +40703,9 @@ gllib_os2_glcanvas.o: $(srcdir)/src/os2/glcanvas.cpp $(GLLIB_ODEP) - sound_sdl_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp - $(CXXC) -c -o $@ $(SOUND_SDL_CXXFLAGS) $(srcdir)/src/unix/sound_sdl.cpp - -+webkit2_ext_webview_webkit2_extension.o: $(srcdir)/src/gtk/webview_webkit2_extension.cpp -+ $(CXXC) -c -o $@ $(WEBKIT2_EXT_CXXFLAGS) $(srcdir)/src/gtk/webview_webkit2_extension.cpp -+ - - @COND_PYTHON@@COND_USE_STC_1@$(srcdir)/include/wx/stc/stc.h: \ - @COND_PYTHON@@COND_USE_STC_1@$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ -@@ -41569,4 +41617,4 @@ win-dist: MSW_ZIP_TEXT_DIST SAMPLES_DIST DEMOS_DIST UTILS_DIST MISC_DIST INTL_DI - uninstall_richtextlib wxrichtext install_stcdll uninstall_stcdll \ - install_stclib uninstall_stclib wxstc install_gldll uninstall_gldll \ - install_gllib uninstall_gllib wxgl install_sound_sdl uninstall_sound_sdl \ -- samples -+ install_webkit2_ext uninstall_webkit2_ext samples -diff --git a/autoconf_inc.m4 b/autoconf_inc.m4 -index 76cea6a..6bc6a0c 100644 ---- a/autoconf_inc.m4 -+++ b/autoconf_inc.m4 -@@ -1088,6 +1088,12 @@ dnl ### begin block 20_COND_USE_THREADS_1[../../demos/bombs/bombs.bkl,../../demo - COND_USE_THREADS_1="" - fi - AC_SUBST(COND_USE_THREADS_1) -+dnl ### begin block 20_COND_USE_WEBVIEW_WEBKIT2_1[wx.bkl] ### -+ COND_USE_WEBVIEW_WEBKIT2_1="#" -+ if test "x$USE_WEBVIEW_WEBKIT2" = "x1" ; then -+ COND_USE_WEBVIEW_WEBKIT2_1="" -+ fi -+ AC_SUBST(COND_USE_WEBVIEW_WEBKIT2_1) - dnl ### begin block 20_COND_USE_XRC_1[../../utils/execmon/execmon.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ### - COND_USE_XRC_1="#" - if test "x$USE_XRC" = "x1" ; then -diff --git a/build/bakefiles/config.bkl b/build/bakefiles/config.bkl -index a43afb49..a95b405 100644 ---- a/build/bakefiles/config.bkl -+++ b/build/bakefiles/config.bkl -@@ -429,6 +429,7 @@ to run the tests, include CppUnit library here. -