Update to new upstream release 3.0.4

Conflicts:
	wxGTK3.spec

.gitignore

@@ -4,3 +4,5 @@
 /wxWidgets-3.0.1.tar.bz2
 /wxWidgets-3.0.2-docs-html.tar.bz2
 /wxWidgets-3.0.2.tar.bz2
+/wxWidgets-3.0.4-docs-html.tar.bz2
+/wxWidgets-3.0.4.tar.bz2

sources

@@ -1,2 +1,2 @@
-67844da5ed54c1a09d8d4ebe32a5e00a  wxWidgets-3.0.2-docs-html.tar.bz2
-ba4cd1f3853d0cd49134c5ae028ad080  wxWidgets-3.0.2.tar.bz2
+SHA512 (wxWidgets-3.0.4-docs-html.tar.bz2) = 2b4cefc98f5f034a8c36237c4979bd02e8b0ed60aaeb31946d8661fb8e5297172cec807e45c96fe2939b012f093950721cda8bf9f750697b50e3741711011ccd
+SHA512 (wxWidgets-3.0.4.tar.bz2) = c9e6b35d541a99921c54cfdac260843f574f146b27f924a7a0fca5007344fa99865a96ded95e6802329ad9221b4880d62b92277a1b4c1ce71420acb672ad9158

wxGTK3-3.0.2-checkradio.patch

@@ -1,38 +0,0 @@
-diff -rupN wxWidgets-3.0.2-orig/src/gtk/renderer.cpp wxWidgets-3.0.2/src/gtk/renderer.cpp
---- wxWidgets-3.0.2-orig/src/gtk/renderer.cpp	2015-11-05 19:57:31.075151404 -0500
-+++ wxWidgets-3.0.2/src/gtk/renderer.cpp	2015-11-05 20:37:56.230764763 -0500
-@@ -41,6 +41,10 @@
- #include "wx/gtk/private.h"
- #include "wx/gtk/private/gtk2-compat.h"
- 
-+#if defined(__WXGTK3__) && !GTK_CHECK_VERSION(3,14,0)
-+    #define GTK_STATE_FLAG_CHECKED (1 << 11)
-+#endif
-+
- // ----------------------------------------------------------------------------
- // wxRendererGTK: our wxRendererNative implementation
- // ----------------------------------------------------------------------------
-@@ -551,7 +555,11 @@ wxRendererGTK::DrawCheckBox(wxWindow* wi
-     {
-         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)
-@@ -866,7 +874,11 @@ void wxRendererGTK::DrawRadioBitmap(wxWi
- #ifdef __WXGTK3__
-     int state = GTK_STATE_FLAG_NORMAL;
-     if (flags & wxCONTROL_CHECKED)
-+    {
-         state = GTK_STATE_FLAG_ACTIVE;
-+        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)

wxGTK3-3.0.2-spibuttfix.patch

@@ -1,14 +0,0 @@
-diff -rupN wxWidgets-3.0.2-orig/src/gtk/spinbutt.cpp wxWidgets-3.0.2/src/gtk/spinbutt.cpp
---- wxWidgets-3.0.2-orig/src/gtk/spinbutt.cpp	2014-10-06 17:33:44.000000000 -0400
-+++ wxWidgets-3.0.2/src/gtk/spinbutt.cpp	2015-08-22 10:44:00.743403904 -0400
-@@ -92,6 +92,10 @@ bool wxSpinButton::Create(wxWindow *pare
-     g_object_ref(m_widget);
- 
-     gtk_entry_set_width_chars(GTK_ENTRY(m_widget), 0);
-+#if GTK_CHECK_VERSION(3,12,0)
-+    if (gtk_check_version(3,12,0) == NULL)
-+        gtk_entry_set_max_width_chars(GTK_ENTRY(m_widget), 0);
-+#endif
-     gtk_spin_button_set_wrap( GTK_SPIN_BUTTON(m_widget),
-                               (int)(m_windowStyle & wxSP_WRAP) );
- 

wxGTK3-3.0.2-upstreamfixes.patch

@@ -1,155 +0,0 @@
-diff -rupN wxWidgets-3.0.2-orig/src/generic/grid.cpp wxWidgets-3.0.2/src/generic/grid.cpp
---- wxWidgets-3.0.2-orig/src/generic/grid.cpp	2014-10-06 17:33:44.000000000 -0400
-+++ wxWidgets-3.0.2/src/generic/grid.cpp	2015-06-22 11:50:16.359029017 -0400
-@@ -2114,7 +2114,8 @@ void wxGridWindow::OnFocus(wxFocusEvent&
-                                             m_owner->GetGridCursorCol());
-         const wxRect cursor =
-             m_owner->BlockToDeviceRect(cursorCoords, cursorCoords);
--        Refresh(true, &cursor);
-+        if (cursor != wxGridNoCellRect)
-+            Refresh(true, &cursor);
-     }
- 
-     if ( !m_owner->GetEventHandler()->ProcessEvent( event ) )
-diff -rupN wxWidgets-3.0.2-orig/src/generic/listctrl.cpp wxWidgets-3.0.2/src/generic/listctrl.cpp
---- wxWidgets-3.0.2-orig/src/generic/listctrl.cpp	2014-10-06 17:33:44.000000000 -0400
-+++ wxWidgets-3.0.2/src/generic/listctrl.cpp	2015-06-22 12:12:26.838603542 -0400
-@@ -1935,6 +1935,13 @@ void wxListMainWindow::RefreshLines( siz
-         size_t visibleFrom, visibleTo;
-         GetVisibleLinesRange(&visibleFrom, &visibleTo);
- 
-+        if ( lineFrom > visibleTo || lineTo < visibleFrom )
-+        {
-+            // None of these lines are currently visible at all, don't bother
-+            // doing anything.
-+            return;
-+        }
-+
-         if ( lineFrom < visibleFrom )
-             lineFrom = visibleFrom;
-         if ( lineTo > visibleTo )
-diff -rupN wxWidgets-3.0.2-orig/src/gtk/aboutdlg.cpp wxWidgets-3.0.2/src/gtk/aboutdlg.cpp
---- wxWidgets-3.0.2-orig/src/gtk/aboutdlg.cpp	2014-10-06 17:33:44.000000000 -0400
-+++ wxWidgets-3.0.2/src/gtk/aboutdlg.cpp	2015-06-22 12:09:00.951644896 -0400
-@@ -23,7 +23,7 @@
- #include "wx/aboutdlg.h"
- 
- #ifndef WX_PRECOMP
--    #include "wx/utils.h"       // for wxLaunchDefaultBrowser()
-+    #include "wx/window.h"
- #endif //WX_PRECOMP
- 
- #include <gtk/gtk.h>
-@@ -131,7 +131,7 @@ static void wxGtkAboutDialogOnLink(GtkAb
- }
- #endif
- 
--void wxAboutBox(const wxAboutDialogInfo& info, wxWindow* WXUNUSED(parent))
-+void wxAboutBox(const wxAboutDialogInfo& info, wxWindow* parent)
- {
-     // don't create another dialog if one is already present
-     if ( !gs_aboutDialog )
-@@ -235,6 +235,11 @@ void wxAboutBox(const wxAboutDialogInfo&
-     g_signal_connect(dlg, "response",
-                         G_CALLBACK(wxGtkAboutDialogOnClose), NULL);
- 
-+    GtkWindow* gtkParent = NULL;
-+    if (parent && parent->m_widget)
-+        gtkParent = (GtkWindow*)gtk_widget_get_ancestor(parent->m_widget, GTK_TYPE_WINDOW);
-+    gtk_window_set_transient_for(GTK_WINDOW(dlg), gtkParent);
-+
-     gtk_window_present(GTK_WINDOW(dlg));
- }
- 
-diff -rupN wxWidgets-3.0.2-orig/src/gtk/filedlg.cpp wxWidgets-3.0.2/src/gtk/filedlg.cpp
---- wxWidgets-3.0.2-orig/src/gtk/filedlg.cpp	2014-10-06 17:33:44.000000000 -0400
-+++ wxWidgets-3.0.2/src/gtk/filedlg.cpp	2015-06-22 12:16:47.386285719 -0400
-@@ -187,7 +187,8 @@ bool wxFileDialog::Create(wxWindow *pare
-                            const wxSize& sz,
-                            const wxString& name)
- {
--    parent = GetParentForModalDialog(parent, style);
-+    // wxFD_MULTIPLE has the same value as wxDIALOG_NO_PARENT
-+    parent = GetParentForModalDialog(parent, style & ~wxFD_MULTIPLE);
- 
-     if (!wxFileDialogBase::Create(parent, message, defaultDir, defaultFileName,
-                                   wildCard, style, pos, sz, name))
-diff -rupN wxWidgets-3.0.2-orig/src/gtk/fontdlg.cpp wxWidgets-3.0.2/src/gtk/fontdlg.cpp
---- wxWidgets-3.0.2-orig/src/gtk/fontdlg.cpp	2014-10-06 17:33:44.000000000 -0400
-+++ wxWidgets-3.0.2/src/gtk/fontdlg.cpp	2015-06-22 11:51:23.827727490 -0400
-@@ -78,6 +78,7 @@ bool wxFontDialog::DoCreate(wxWindow *pa
-         gtk_parent = GTK_WINDOW(parent->m_widget);
- 
- #if GTK_CHECK_VERSION(3,2,0)
-+    g_type_ensure(PANGO_TYPE_FONT_FACE);
-     if (gtk_check_version(3,2,0) == NULL)
-         m_widget = gtk_font_chooser_dialog_new(wxGTK_CONV(message), gtk_parent);
-     else
-diff -rupN wxWidgets-3.0.2-orig/src/gtk/print.cpp wxWidgets-3.0.2/src/gtk/print.cpp
---- wxWidgets-3.0.2-orig/src/gtk/print.cpp	2014-10-06 17:33:44.000000000 -0400
-+++ wxWidgets-3.0.2/src/gtk/print.cpp	2015-06-22 12:01:37.173889476 -0400
-@@ -32,7 +32,6 @@
- #include "wx/fontutil.h"
- #include "wx/dynlib.h"
- #include "wx/paper.h"
--#include "wx/scopeguard.h"
- #include "wx/modalhook.h"
- 
- #include <gtk/gtk.h>
-@@ -612,6 +611,11 @@ wxGtkPrintDialog::wxGtkPrintDialog( wxWi
- 
-     m_parent = parent;
-     SetShowDialog(true);
-+
-+    const wxPrintData& printData = m_printDialogData.GetPrintData();
-+    wxGtkPrintNativeData* native =
-+        static_cast<wxGtkPrintNativeData*>(printData.GetNativeData());
-+    native->SetPrintJob(gtk_print_operation_new());
- }
- 
- wxGtkPrintDialog::wxGtkPrintDialog( wxWindow *parent, wxPrintData *data )
-@@ -625,11 +629,22 @@ wxGtkPrintDialog::wxGtkPrintDialog( wxWi
- 
-     m_parent = parent;
-     SetShowDialog(true);
-+
-+    const wxPrintData& printData = m_printDialogData.GetPrintData();
-+    wxGtkPrintNativeData* native =
-+        static_cast<wxGtkPrintNativeData*>(printData.GetNativeData());
-+    native->SetPrintJob(gtk_print_operation_new());
- }
- 
- 
- wxGtkPrintDialog::~wxGtkPrintDialog()
- {
-+    const wxPrintData& printData = m_printDialogData.GetPrintData();
-+    wxGtkPrintNativeData* native =
-+        static_cast<wxGtkPrintNativeData*>(printData.GetNativeData());
-+    GtkPrintOperation* printOp = native->GetPrintJob();
-+    g_object_unref(printOp);
-+    native->SetPrintJob(NULL);
- }
- 
- // This is called even if we actually don't want the dialog to appear.
-@@ -921,10 +936,9 @@ bool wxGtkPrinter::Print(wxWindow *paren
-     wxPrintData printdata = GetPrintDialogData().GetPrintData();
-     wxGtkPrintNativeData *native = (wxGtkPrintNativeData*) printdata.GetNativeData();
- 
--    wxGtkObject<GtkPrintOperation> printOp(gtk_print_operation_new());
--    native->SetPrintJob(printOp);
--    wxON_BLOCK_EXIT_OBJ1(*native, wxGtkPrintNativeData::SetPrintJob,
--                         static_cast<GtkPrintOperation*>(NULL));
-+    // wxGtkPrintDialog needs to be created first as it creates the PrintOp
-+    wxGtkPrintDialog dialog(parent, &m_printDialogData);
-+    GtkPrintOperation* printOp = native->GetPrintJob();
- 
-     wxPrinterToGtkData dataToSend;
-     dataToSend.printer = this;
-@@ -937,7 +951,6 @@ bool wxGtkPrinter::Print(wxWindow *paren
- 
-     // This is used to setup the DC and
-     // show the dialog if desired
--    wxGtkPrintDialog dialog( parent, &m_printDialogData );
-     dialog.SetPrintDC(m_dc);
-     dialog.SetShowDialog(prompt);
- 

wxGTK3-3.0.2-wayland.patch

@@ -1,108 +0,0 @@
-diff -rupN wxWidgets-3.0.2/src/gtk/toplevel.cpp wxWidgets-3.0.2-wayland/src/gtk/toplevel.cpp
---- wxWidgets-3.0.2/src/gtk/toplevel.cpp	2014-10-06 17:33:44.000000000 -0400
-+++ wxWidgets-3.0.2-wayland/src/gtk/toplevel.cpp	2015-12-31 14:48:25.873812357 -0500
-@@ -456,8 +456,12 @@ gtk_frame_window_state_callback( GtkWidg
- bool wxGetFrameExtents(GdkWindow* window, int* left, int* right, int* top, int* bottom)
- {
- #ifdef GDK_WINDOWING_X11
--    static GdkAtom property = gdk_atom_intern("_NET_FRAME_EXTENTS", false);
-     GdkDisplay* display = gdk_window_get_display(window);
-+
-+    if (!GDK_IS_X11_DISPLAY(display))
-+        return false;
-+
-+    static GdkAtom property = gdk_atom_intern("_NET_FRAME_EXTENTS", false);
-     Atom xproperty = gdk_x11_atom_to_xatom_for_display(display, property);
-     Atom type;
-     int format;
-@@ -852,10 +856,19 @@ bool wxTopLevelWindowGTK::ShowFullScreen
- 
-     m_fsIsShowing = show;
- 
-+    wxX11FullScreenMethod method = wxX11_FS_WMSPEC;
-+    Display* xdpy = NULL;
-+    Window xroot = None;
-+
- #ifdef GDK_WINDOWING_X11
--    Display* xdpy = GDK_DISPLAY_XDISPLAY(gtk_widget_get_display(m_widget));
--    Window xroot = GDK_WINDOW_XID(gtk_widget_get_root_window(m_widget));
--    wxX11FullScreenMethod method = wxGetFullScreenMethodX11(xdpy, (WXWindow)xroot);
-+    GdkDisplay *display = gtk_widget_get_display(m_widget);
-+
-+    if (GDK_IS_X11_DISPLAY(display))
-+    {
-+        xdpy = GDK_DISPLAY_XDISPLAY(gtk_widget_get_display(m_widget));
-+        xroot = GDK_WINDOW_XID(gtk_widget_get_root_window(m_widget));
-+        method = wxGetFullScreenMethodX11(xdpy, (WXWindow)xroot);
-+    }
- 
-     // NB: gtk_window_fullscreen() uses freedesktop.org's WMspec extensions
-     //     to switch to fullscreen, which is not always available. We must
-@@ -870,7 +883,7 @@ bool wxTopLevelWindowGTK::ShowFullScreen
-             gtk_window_unfullscreen( GTK_WINDOW( m_widget ) );
-     }
- #ifdef GDK_WINDOWING_X11
--    else
-+    else if (xdpy != NULL)
-     {
-         GdkWindow* window = gtk_widget_get_window(m_widget);
-         Window xid = GDK_WINDOW_XID(window);
-@@ -958,6 +971,7 @@ bool wxTopLevelWindowGTK::Show( bool sho
-         deferShow = m_deferShowAllowed &&
-             gs_requestFrameExtentsStatus != RFE_STATUS_BROKEN &&
-             !gtk_widget_get_realized(m_widget) &&
-+            GDK_IS_X11_DISPLAY(gtk_widget_get_display(m_widget)) &&
-             g_signal_handler_find(m_widget,
-                 GSignalMatchType(G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_DATA),
-                 g_signal_lookup("property_notify_event", GTK_TYPE_WIDGET),
-diff -rupN wxWidgets-3.0.2/src/gtk/window.cpp wxWidgets-3.0.2-wayland/src/gtk/window.cpp
---- wxWidgets-3.0.2/src/gtk/window.cpp	2014-10-06 17:33:44.000000000 -0400
-+++ wxWidgets-3.0.2-wayland/src/gtk/window.cpp	2015-12-31 14:48:31.522812743 -0500
-@@ -780,28 +780,31 @@ wxTranslateGTKKeyEventToWx(wxKeyEvent& e
-             }
- 
- #ifdef GDK_WINDOWING_X11
--            // we want to always get the same key code when the same key is
--            // pressed regardless of the state of the modifiers, i.e. on a
--            // standard US keyboard pressing '5' or '%' ('5' key with
--            // Shift) should result in the same key code in OnKeyDown():
--            // '5' (although OnChar() will get either '5' or '%').
--            //
--            // to do it we first translate keysym to keycode (== scan code)
--            // and then back but always using the lower register
--            Display *dpy = (Display *)wxGetDisplay();
--            KeyCode keycode = XKeysymToKeycode(dpy, keysym);
-+            if (GDK_IS_X11_DISPLAY(gdk_window_get_display(gdk_event->window)))
-+            {
-+                // we want to always get the same key code when the same key is
-+                // pressed regardless of the state of the modifiers, i.e. on a
-+                // standard US keyboard pressing '5' or '%' ('5' key with
-+                // Shift) should result in the same key code in OnKeyDown():
-+                // '5' (although OnChar() will get either '5' or '%').
-+                //
-+                // to do it we first translate keysym to keycode (== scan code)
-+                // and then back but always using the lower register
-+                Display *dpy = (Display *)wxGetDisplay();
-+                KeyCode keycode = XKeysymToKeycode(dpy, keysym);
- 
--            wxLogTrace(TRACE_KEYS, wxT("\t-> keycode %d"), keycode);
-+                wxLogTrace(TRACE_KEYS, wxT("\t-> keycode %d"), keycode);
- 
- #ifdef HAVE_X11_XKBLIB_H
--            KeySym keysymNormalized = XkbKeycodeToKeysym(dpy, keycode, 0, 0);
-+                KeySym keysymNormalized = XkbKeycodeToKeysym(dpy, keycode, 0, 0);
- #else
--            KeySym keysymNormalized = XKeycodeToKeysym(dpy, keycode, 0);
-+                KeySym keysymNormalized = XKeycodeToKeysym(dpy, keycode, 0);
- #endif
- 
--            // use the normalized, i.e. lower register, keysym if we've
--            // got one
--            key_code = keysymNormalized ? keysymNormalized : keysym;
-+                // use the normalized, i.e. lower register, keysym if we've
-+                // got one
-+                key_code = keysymNormalized ? keysymNormalized : keysym;
-+            }
- #else
-             key_code = keysym;
- #endif

wxGTK3.spec

@@ -10,39 +10,23 @@
 %endif
 
 Name:           %{wxgtkname}
-Version:        3.0.2
-Release:        14%{?dist}
+Version:        3.0.4
+Release:        1%{?dist}
 Summary:        GTK port of the wxWidgets GUI library
 License:        wxWidgets
 Group:          System Environment/Libraries
-URL:            http://www.wxwidgets.org/
-Source0:        http://downloads.sf.net/wxwindows/%{srcname}-%{version}.tar.bz2
-Source1:        http://downloads.sf.net/wxwindows/%{srcname}-%{version}-docs-html.tar.bz2
+URL:            https://www.wxwidgets.org/
+Source0:        https://github.com/%{srcname}/%{srcname}/releases/download/v%{version}/%{srcname}-%{version}.tar.bz2
+Source1:        https://github.com/%{srcname}/%{srcname}/releases/download/v%{version}/%{srcname}-%{version}-docs-html.tar.bz2
 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
-# This is a collection of fixes from upstream
-# to fix warnings and crashes. See bug for details:
-# https://bugzilla.redhat.com/show_bug.cgi?id=1234211
-Patch1:         %{name}-%{version}-upstreamfixes.patch
-# This fixes the spinbutton on gtk 3.12+
-# For more details, see the upstream commit:
-# https://github.com/wxWidgets/wxWidgets/commit/312ae4c92cec95954557347c2b7a9e24d4398a59
-Patch2:         %{name}-%{version}-spibuttfix.patch
-# This fixes checkbox/radiobutton on gtk 3.14+
-# For more details, see the upstream commit:
-# https://github.com/wxWidgets/wxWidgets/commit/c1d150ed1228c155054cf1fa90932ced7371e6a4
-Patch3:         %{name}-%{version}-checkradio.patch
-# This fixes some wayland issues with GTK3
-# For more details, see the upstream bug:
-# http://trac.wxwidgets.org/ticket/16688
-Patch4:         %{name}-%{version}-wayland.patch
+Patch0:         %{name}-3.0.2-abicheck.patch
 BuildRequires:  gtk%{gtkver}-devel
 #Note webkitgtk (GTK2) does not appear to be supported
 %if %{gtkver} == 3
-BuildRequires:  webkitgtk3-devel
+BuildRequires:  webkitgtk4-devel
 %endif
 BuildRequires:  zlib-devel
 BuildRequires:  libpng-devel
@@ -52,7 +36,7 @@ BuildRequires:  expat-devel
 BuildRequires:  SDL-devel
 BuildRequires:  libGLU-devel
 BuildRequires:  libSM-devel
-BuildRequires:  gstreamer-plugins-base-devel
+BuildRequires:  gstreamer1-plugins-base-devel
 BuildRequires:  GConf2-devel
 BuildRequires:  gettext
 BuildRequires:  cppunit-devel
@@ -75,6 +59,7 @@ Summary:        Development files for the wxGTK3 library
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:       %{name}-gl = %{version}-%{release}
 Requires:       %{name}-media = %{version}-%{release}
+Requires:       %{name}-webview = %{version}-%{release}
 Requires:       %{wxbasename} = %{version}-%{release}
 Requires:       gtk%{gtkver}-devel
 Requires:       libGLU-devel
@@ -114,6 +99,18 @@ comprehensive set of helper classes for most common application tasks,
 ranging from networking to HTML display and image manipulation.
 
 
+%package        webview
+Summary:        WebView add-on for the wxWidgets library
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+
+%description webview
+WebView 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 -n     %{wxbasename}
 Summary:        Non-GUI support classes from the wxWidgets library
 Group:          System Environment/Libraries
@@ -140,10 +137,6 @@ This package provides documentation for the %{srcname} library.
 %prep
 %setup -q -n %{srcname}-%{version} -a 1
 %patch0 -p1 -b .abicheck
-%patch1 -p1 -b .upstreamfixes
-%patch2 -p1 -b .spinbutt
-%patch3 -p1 -b .checkradio
-%patch4 -p1 -b .wayland
 
 # patch some installed files to avoid conflicts with 2.8.*
 sed -i -e 's|aclocal)|aclocal/wxwin3.m4)|' Makefile.in
@@ -151,7 +144,7 @@ sed -i -e 's|wxstd.mo|wxstd3.mo|' Makefile.in
 sed -i -e 's|wxmsw.mo|wxmsw3.mo|' Makefile.in
 
 # rename docs directory
-mv %{srcname}-%{version} html
+mv %{srcname}-%{version}-docs-html html
 
 
 # fix plugin dir for 64-bit
@@ -234,9 +227,6 @@ popd
 %{_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_gtk%{gtkver}u_webview-*.so.*
-%endif
 %{_libdir}/libwx_gtk%{gtkver}u_xrc-*.so.*
 
 %files devel
@@ -258,6 +248,11 @@ popd
 %files media
 %{_libdir}/libwx_gtk%{gtkver}u_media-*.so.*
 
+%files webview
+%{_libdir}/libwx_gtk3u_webview-*.so.*
+%dir %{_libdir}/wx
+%{_libdir}/wx/3.0
+
 %files -n %{wxbasename}
 %doc docs/changes.txt docs/gpl.txt docs/lgpl.txt docs/licence.txt
 %doc docs/licendoc.txt docs/preamble.txt docs/readme.txt
@@ -269,6 +264,14 @@ popd
 %doc html
 
 %changelog
+* Wed Oct 30 2019 Scott Talbert <swt@techie.net> - 3.0.4-1
+- Update to new upstream release 3.0.4
+
+* Sun Feb 28 2016 Jeremy Newton <alexjnewt AT hotmail DOT com> - 3.0.2-15
+- Backporting patches from rawhide, credit to Scott Talbert
+- Add patch to resolve issue with wxStaticText growing, fixes RH#1282142
+- Add patches to resolve issues under Wayland with window sizing, RH#1294229
+
 * Mon Feb 22 2016 Jeremy Newton <alexjnewt AT hotmail DOT com> - 3.0.2-14
 - Should actually fix RH#1294712