add BR: gcc-c++

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.cvsignore

@@ -1 +0,0 @@
-wxGTK-2.8.10.tar.bz2

.gitignore

@@ -0,0 +1,2 @@
+wxGTK-2.8.11.tar.bz2
+/wxGTK-2.8.12.tar.bz2

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: wxGTK
-# $Id$
-NAME := wxGTK
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON	:= $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

sources

@@ -1 +1 @@
-88b867bc118a183af56efc67014bdf27  wxGTK-2.8.10.tar.bz2
+08f81ab60647308058f6ce99712b14f8  wxGTK-2.8.12.tar.bz2

wx-config

@@ -17,10 +17,10 @@ if [ -z $arch ]; then
 fi
 
 case $arch in
-    i?86|ppc|s390|sparc|arm*|ia64)
+    i?86|ppc|s390|sparc|arm*|ia64|mips|mipsel)
         libdir=/usr/lib
         ;;
-    x86_64|ppc64|s390x|sparc64)
+    x86_64|ppc64|ppc64le|s390x|sparc64|aarch64|mips64*)
         libdir=/usr/lib64
         ;;
     *)

wxGTK-2.8.10-CVE-2009-2369.patch

@@ -1,75 +0,0 @@
-Index: src/common/imagpng.cpp
-===================================================================
---- src/common/imagpng.cpp	(revision 60874)
-+++ src/common/imagpng.cpp	(revision 60875)
-@@ -568,18 +568,16 @@
-     if (!image->Ok())
-         goto error;
- 
--    lines = (unsigned char **)malloc( (size_t)(height * sizeof(unsigned char *)) );
-+    // initialize all line pointers to NULL to ensure that they can be safely
-+    // free()d if an error occurs before all of them could be allocated
-+    lines = (unsigned char **)calloc(height, sizeof(unsigned char *));
-     if ( !lines )
-         goto error;
- 
-     for (i = 0; i < height; i++)
-     {
-         if ((lines[i] = (unsigned char *)malloc( (size_t)(width * (sizeof(unsigned char) * 4)))) == NULL)
--        {
--            for ( unsigned int n = 0; n < i; n++ )
--                free( lines[n] );
-             goto error;
--        }
-     }
- 
-     png_read_image( png_ptr, lines );
-Index: src/common/imagtiff.cpp
-===================================================================
---- src/common/imagtiff.cpp	(revision 60875)
-+++ src/common/imagtiff.cpp	(revision 60876)
-@@ -261,7 +261,6 @@
-     }
- 
-     uint32 w, h;
--    uint32 npixels;
-     uint32 *raster;
- 
-     TIFFGetField( tif, TIFFTAG_IMAGEWIDTH, &w );
-@@ -275,10 +274,21 @@
-                            (samplesInfo[0] == EXTRASAMPLE_ASSOCALPHA ||
-                             samplesInfo[0] == EXTRASAMPLE_UNASSALPHA));
- 
--    npixels = w * h;
-+    // guard against integer overflow during multiplication which could result
-+    // in allocating a too small buffer and then overflowing it
-+    const double bytesNeeded = w * h * sizeof(uint32);
-+    if ( bytesNeeded >= 4294967295U /* UINT32_MAX */ )
-+    {
-+        if ( verbose )
-+            wxLogError( _("TIFF: Image size is abnormally big.") );
- 
--    raster = (uint32*) _TIFFmalloc( npixels * sizeof(uint32) );
-+        TIFFClose(tif);
- 
-+        return false;
-+    }
-+
-+    raster = (uint32*) _TIFFmalloc( bytesNeeded );
-+
-     if (!raster)
-     {
-         if (verbose)
-Index: src/common/imagtiff.cpp
-===================================================================
---- src/common/imagtiff.cpp	(revision 60896)
-+++ src/common/imagtiff.cpp	(revision 60897)
-@@ -276,7 +276,7 @@
- 
-     // guard against integer overflow during multiplication which could result
-     // in allocating a too small buffer and then overflowing it
--    const double bytesNeeded = w * h * sizeof(uint32);
-+    const double bytesNeeded = (double)w * (double)h * sizeof(uint32);
-     if ( bytesNeeded >= 4294967295U /* UINT32_MAX */ )
-     {
-         if ( verbose )

wxGTK-2.8.10-gsocket.patch

@@ -1,19 +0,0 @@
-Index: 2.8/src/gtk/gsockgtk.cpp
-===================================================================
---- 2.8/src/gtk/gsockgtk.cpp (revision 60599)
-+++ 2.8/src/gtk/gsockgtk.cpp (working copy)
-@@ -15,8 +15,13 @@
- #include <stdlib.h>
- #include <stdio.h>
-
-+// newer versions of glib define its own GSocket but we unfortunately use this
-+// name in our own (semi-)public header and so can't change it -- rename glib
-+// one instead
-+#define GSocket GlibGSocket
- #include <gdk/gdk.h>
- #include <glib.h>
-+#undef GSocket
-
- #include "wx/gsocket.h"
- #include "wx/unix/gsockunx.h"
-

wxGTK-2.8.10-htmltable.patch

@@ -1,20 +0,0 @@
-Index: src/html/m_tables.cpp
-===================================================================
---- src/html/m_tables.cpp	(revision 59686)
-+++ src/html/m_tables.cpp	(revision 59687)
-@@ -684,6 +684,7 @@
-         {
-             wxHtmlTableCell *oldt = m_Table;
- 
-+            wxHtmlContainerCell *oldEnclosing = m_enclosingContainer;
-             m_enclosingContainer = c = m_WParser->OpenContainer();
- 
-             m_Table = new wxHtmlTableCell(c, tag, m_WParser->GetPixelScale());
-@@ -722,6 +723,7 @@
-             m_WParser->CloseContainer();
- 
-             m_Table = oldt;
-+            m_enclosingContainer = oldEnclosing;
- 
-             return true; // ParseInner() called
-         }

wxGTK-2.8.10-menubar-height.patch

@@ -1,55 +0,0 @@
-Index: src/gtk/frame.cpp
-===================================================================
---- src/gtk/frame.cpp	(revision 62486)
-+++ src/gtk/frame.cpp	(revision 62487)
-@@ -78,6 +78,30 @@
- }
- }
- 
-+//-----------------------------------------------------------------------------
-+// "size-request" from menubar
-+//-----------------------------------------------------------------------------
-+
-+extern "C" {
-+static void menubar_size_request(GtkWidget* widget, GtkRequisition*, wxFrame* win)
-+{
-+    g_signal_handlers_disconnect_by_func(
-+        widget, (void*)menubar_size_request, win);
-+    win->UpdateMenuBarSize();
-+}
-+}
-+
-+//-----------------------------------------------------------------------------
-+// "style-set" from menubar
-+//-----------------------------------------------------------------------------
-+
-+extern "C" {
-+static void menubar_style_set(GtkWidget* widget, GtkStyle*, wxFrame* win)
-+{
-+    g_signal_connect(widget, "size-request",
-+        G_CALLBACK(menubar_size_request), win);
-+}
-+}
- #endif // wxUSE_MENUS_NATIVE
- 
- #if wxUSE_TOOLBAR
-@@ -571,6 +595,9 @@
- 
-     if ( m_frameMenuBar )
-     {
-+        g_signal_handlers_disconnect_by_func(
-+            m_frameMenuBar->m_widget, (void*)menubar_style_set, this);
-+
-         m_frameMenuBar->UnsetInvokingWindow( this );
- 
-         if (m_frameMenuBar->GetWindowStyle() & wxMB_DOCKABLE)
-@@ -621,6 +648,9 @@
-         gtk_widget_show( m_frameMenuBar->m_widget );
- 
-         UpdateMenuBarSize();
-+
-+        g_signal_connect(menuBar->m_widget, "style-set",
-+            G_CALLBACK(menubar_style_set), this);
-     }
-     else
-     {

wxGTK-2.8.10-wxTimer-fix.patch

@@ -1,39 +0,0 @@
-Index: src/gtk/app.cpp
-===================================================================
---- src/gtk/app.cpp	(revision 62396)
-+++ src/gtk/app.cpp	(revision 62397)
-@@ -149,9 +149,11 @@
- // One-shot emission hook for "event" signal, to install idle handler.
- // This will be called when the "event" signal is issued on any GtkWidget object.
- static gboolean
--event_emission_hook(GSignalInvocationHint*, guint, const GValue*, gpointer)
-+event_emission_hook(GSignalInvocationHint*, guint, const GValue*, gpointer data)
- {
-     wxapp_install_idle_handler();
-+    bool* hook_installed = (bool*)data;
-+    *hook_installed = false;
-     // remove hook
-     return false;
- }
-@@ -159,12 +161,17 @@
- // add emission hook for "event" signal, to re-install idle handler when needed
- static inline void wxAddEmissionHook()
- {
-+    static bool hook_installed;
-     GType widgetType = GTK_TYPE_WIDGET;
--    // if GtkWidget type is loaded
--    if (g_type_class_peek(widgetType) != NULL)
-+    // if hook not installed and GtkWidget type is loaded
-+    if (!hook_installed && g_type_class_peek(widgetType))
-     {
--        guint sig_id = g_signal_lookup("event", widgetType);
--        g_signal_add_emission_hook(sig_id, 0, event_emission_hook, NULL, NULL);
-+        static guint sig_id;
-+        if (sig_id == 0)
-+            sig_id = g_signal_lookup("event", widgetType);
-+        hook_installed = true;
-+        g_signal_add_emission_hook(
-+            sig_id, 0, event_emission_hook, &hook_installed, NULL);
-     }
- }
- 

wxGTK-2.8.12-abicheck.patch

@@ -0,0 +1,15 @@
+diff -up wxGTK-2.8.12/src/common/appbase.cpp.abicheck wxGTK-2.8.12/src/common/appbase.cpp
+--- wxGTK-2.8.12/src/common/appbase.cpp.abicheck	2015-03-12 17:15:18.000000000 +0100
++++ wxGTK-2.8.12/src/common/appbase.cpp	2015-03-12 17:15:57.000000000 +0100
+@@ -424,10 +424,7 @@ bool wxAppConsole::CheckBuildOptions(con
+         msg.Printf(_T("Mismatch between the program and library build versions detected.\nThe library used %s,\nand %s used %s."),
+                    lib.c_str(), progName.c_str(), prog.c_str());
+ 
+-        wxLogFatalError(msg.c_str());
+-
+-        // normally wxLogFatalError doesn't return
+-        return false;
++        wxLogWarning(msg.c_str());
+     }
+ #undef wxCMP
+ 

wxGTK-2.8.12-char.patch

@@ -0,0 +1,100 @@
+diff -up wxGTK-2.8.12/src/gtk/bdiag.xbm.char wxGTK-2.8.12/src/gtk/bdiag.xbm
+--- wxGTK-2.8.12/src/gtk/bdiag.xbm.char	2011-03-22 13:19:01.000000000 +0100
++++ wxGTK-2.8.12/src/gtk/bdiag.xbm	2016-02-20 10:38:50.000000000 +0100
+@@ -1,6 +1,6 @@
+ #define bdiag_width 16
+ #define bdiag_height 16
+-static char bdiag_bits[] = {
++static unsigned char bdiag_bits[] = {
+    0x80, 0x80, 0x40, 0x40, 0x20, 0x20, 0x10, 0x10, 0x08, 0x08, 0x04, 0x04,
+    0x02, 0x02, 0x01, 0x01, 0x80, 0x80, 0x40, 0x40, 0x20, 0x20, 0x10, 0x10,
+    0x08, 0x08, 0x04, 0x04, 0x02, 0x02, 0x01, 0x01};
+diff -up wxGTK-2.8.12/src/gtk/cdiag.xbm.char wxGTK-2.8.12/src/gtk/cdiag.xbm
+--- wxGTK-2.8.12/src/gtk/cdiag.xbm.char	2011-03-22 13:19:01.000000000 +0100
++++ wxGTK-2.8.12/src/gtk/cdiag.xbm	2016-02-20 10:38:50.000000000 +0100
+@@ -1,6 +1,6 @@
+ #define cdiag_width 16
+ #define cdiag_height 16
+-static char cdiag_bits[] = {
++static unsigned char cdiag_bits[] = {
+    0x81, 0x81, 0x42, 0x42, 0x24, 0x24, 0x18, 0x18, 0x18, 0x18, 0x24, 0x24,
+    0x42, 0x42, 0x81, 0x81, 0x81, 0x81, 0x42, 0x42, 0x24, 0x24, 0x18, 0x18,
+    0x18, 0x18, 0x24, 0x24, 0x42, 0x42, 0x81, 0x81};
+diff -up wxGTK-2.8.12/src/gtk/cross.xbm.char wxGTK-2.8.12/src/gtk/cross.xbm
+--- wxGTK-2.8.12/src/gtk/cross.xbm.char	2011-03-22 13:19:01.000000000 +0100
++++ wxGTK-2.8.12/src/gtk/cross.xbm	2016-02-20 10:38:50.000000000 +0100
+@@ -1,6 +1,6 @@
+ #define cross_width 15
+ #define cross_height 15
+-static char cross_bits[] = {
++static unsigned char cross_bits[] = {
+    0x84, 0x10, 0x84, 0x10, 0xff, 0x7f, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10,
+    0x84, 0x10, 0xff, 0x7f, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10,
+    0xff, 0x7f, 0x84, 0x10, 0x84, 0x10};
+diff -up wxGTK-2.8.12/src/gtk/dcclient.cpp.char wxGTK-2.8.12/src/gtk/dcclient.cpp
+--- wxGTK-2.8.12/src/gtk/dcclient.cpp.char	2016-02-20 10:38:50.000000000 +0100
++++ wxGTK-2.8.12/src/gtk/dcclient.cpp	2016-02-20 10:49:11.000000000 +0100
+@@ -427,13 +427,24 @@ void wxWindowDC::SetUpDC()
+ 
+     if (!hatch_bitmap)
+     {
++#define CREATE_FROM_XBM_DATA(name) \
++        gdk_bitmap_create_from_data \
++        ( \
++            NULL, \
++            reinterpret_cast<gchar *>(name ## _bits), \
++            name ## _width, \
++            name ## _height \
++        )
++
+         hatch_bitmap    = hatches;
+-        hatch_bitmap[0] = gdk_bitmap_create_from_data( (GdkWindow *) NULL, bdiag_bits, bdiag_width, bdiag_height );
+-        hatch_bitmap[1] = gdk_bitmap_create_from_data( (GdkWindow *) NULL, cdiag_bits, cdiag_width, cdiag_height );
+-        hatch_bitmap[2] = gdk_bitmap_create_from_data( (GdkWindow *) NULL, fdiag_bits, fdiag_width, fdiag_height );
+-        hatch_bitmap[3] = gdk_bitmap_create_from_data( (GdkWindow *) NULL, cross_bits, cross_width, cross_height );
+-        hatch_bitmap[4] = gdk_bitmap_create_from_data( (GdkWindow *) NULL, horiz_bits, horiz_width, horiz_height );
+-        hatch_bitmap[5] = gdk_bitmap_create_from_data( (GdkWindow *) NULL, verti_bits, verti_width, verti_height );
++        hatch_bitmap[0] = CREATE_FROM_XBM_DATA(bdiag);
++        hatch_bitmap[1] = CREATE_FROM_XBM_DATA(cdiag);
++        hatch_bitmap[2] = CREATE_FROM_XBM_DATA(fdiag);
++        hatch_bitmap[3] = CREATE_FROM_XBM_DATA(cross);
++        hatch_bitmap[4] = CREATE_FROM_XBM_DATA(horiz);
++        hatch_bitmap[5] = CREATE_FROM_XBM_DATA(verti);
++
++#undef CREATE_FROM_XBM_DATA
+     }
+ }
+ 
+diff -up wxGTK-2.8.12/src/gtk/fdiag.xbm.char wxGTK-2.8.12/src/gtk/fdiag.xbm
+--- wxGTK-2.8.12/src/gtk/fdiag.xbm.char	2011-03-22 13:19:01.000000000 +0100
++++ wxGTK-2.8.12/src/gtk/fdiag.xbm	2016-02-20 10:38:50.000000000 +0100
+@@ -1,6 +1,6 @@
+ #define fdiag_width 16
+ #define fdiag_height 16
+-static char fdiag_bits[] = {
++static unsigned char fdiag_bits[] = {
+    0x01, 0x01, 0x02, 0x02, 0x04, 0x04, 0x08, 0x08, 0x10, 0x10, 0x20, 0x20,
+    0x40, 0x40, 0x80, 0x80, 0x01, 0x01, 0x02, 0x02, 0x04, 0x04, 0x08, 0x08,
+    0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x80, 0x80};
+diff -up wxGTK-2.8.12/src/gtk/horiz.xbm.char wxGTK-2.8.12/src/gtk/horiz.xbm
+--- wxGTK-2.8.12/src/gtk/horiz.xbm.char	2011-03-22 13:19:01.000000000 +0100
++++ wxGTK-2.8.12/src/gtk/horiz.xbm	2016-02-20 10:38:50.000000000 +0100
+@@ -1,6 +1,6 @@
+ #define horiz_width 15
+ #define horiz_height 15
+-static char horiz_bits[] = {
++static unsigned char horiz_bits[] = {
+    0x00, 0x00, 0x00, 0x00, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xff, 0x7f, 0x00, 0x00, 0x00, 0x00};
+diff -up wxGTK-2.8.12/src/gtk/verti.xbm.char wxGTK-2.8.12/src/gtk/verti.xbm
+--- wxGTK-2.8.12/src/gtk/verti.xbm.char	2011-03-22 13:19:02.000000000 +0100
++++ wxGTK-2.8.12/src/gtk/verti.xbm	2016-02-20 10:38:50.000000000 +0100
+@@ -1,6 +1,6 @@
+ #define verti_width 15
+ #define verti_height 15
+-static char verti_bits[] = {
++static unsigned char verti_bits[] = {
+    0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10,
+    0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10,
+    0x84, 0x10, 0x84, 0x10, 0x84, 0x10};

wxGTK-2.8.12-test.patch

@@ -0,0 +1,18 @@
+--- wxGTK-2.8.12.orig/tests/test.cpp	2011-03-22 13:18:05.000000000 +0100
++++ wxGTK-2.8.12/tests/test.cpp	2011-04-14 10:35:44.000000000 +0200
+@@ -86,11 +86,11 @@ void TestApp::OnInitCmdLine(wxCmdLinePar
+         { wxCMD_LINE_SWITCH, _T("L"), _T("longlist"),
+             _T("list the test cases, do not run them"),
+             wxCMD_LINE_VAL_NONE, 0 },
+-        { wxCMD_LINE_SWITCH, "d", "detail",
+-            "print the test case names, run them (not implemented)",
++        { wxCMD_LINE_SWITCH, _T("d"), _T("detail"),
++            _T("print the test case names, run them (not implemented)"),
+             wxCMD_LINE_VAL_NONE, 0 },
+-        { wxCMD_LINE_SWITCH, "t", "timing",
+-            "print names and mesure running time of individual test, run them (not implemented)",
++        { wxCMD_LINE_SWITCH, _T("t"), _T("timing"),
++            _T("print names and mesure running time of individual test, run them (not implemented)"),
+             wxCMD_LINE_VAL_NONE, 0 },
+         { wxCMD_LINE_PARAM, 0, 0, _T("REGISTRY"), wxCMD_LINE_VAL_STRING,
+             wxCMD_LINE_PARAM_OPTIONAL | wxCMD_LINE_PARAM_MULTIPLE },

wxGTK.spec

@@ -1,36 +1,33 @@
 Name:           wxGTK
-Version:        2.8.10
-Release:        9%{?dist}
+Version:        2.8.12
+Release:        31%{?dist}
 Summary:        GTK2 port of the wxWidgets GUI library
 License:        wxWidgets
 Group:          System Environment/Libraries
 URL:            http://www.wxwidgets.org/
-Source0:        http://downloads.sourceforge.net/wxwindows/%{name}-%{version}.tar.bz2
+Source0:        http://downloads.sf.net/wxwindows/%{name}-%{version}.tar.bz2
 Source1:        wx-config
+Patch0:         %{name}-%{version}-test.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=1200611
+# remove abort when ABI check fails
+Patch1:         %{name}-%{version}-abicheck.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=1308243
+# backported from https://github.com/wxWidgets/wxWidgets/commit/1780a38b7bc9a9c04d33775a3176fe8516465f50
+Patch2:         %{name}-%{version}-char.patch
 
-# http://trac.wxwidgets.org/ticket/10883
-Patch0:         %{name}-2.8.10-gsocket.patch
-# http://trac.wxwidgets.org/ticket/10993 (#511279)
-Patch1:         %{name}-2.8.10-CVE-2009-2369.patch
-# http://trac.wxwidgets.org/ticket/11315 (#494425)
-Patch2:         %{name}-2.8.10-wxTimer-fix.patch
-# http://trac.wxwidgets.org/ticket/11310 (#528376)
-Patch3:         %{name}-2.8.10-menubar-height.patch
-# http://trac.wxwidgets.org/ticket/10370 (#534030)
-Patch4:         %{name}-2.8.10-htmltable.patch
-
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
+BuildRequires:  gcc-c++
 BuildRequires:  gtk2-devel, zlib-devel >= 1.1.4
 BuildRequires:  libpng-devel, libjpeg-devel, libtiff-devel
-BuildRequires:  expat-devel, SDL-devel, libgnomeprintui22-devel
+BuildRequires:  expat-devel, SDL-devel
 BuildRequires:  libGL-devel, libGLU-devel
 BuildRequires:  libSM-devel
 BuildRequires:  gstreamer-devel >= 0.10, gstreamer-plugins-base-devel >= 0.10
 BuildRequires:  GConf2-devel
 BuildRequires:  autoconf, gettext
+#BuildRequires:  cppunit-devel
 
 Requires:       wxBase = %{version}-%{release}
+Provides:       bundled(scintilla) = 1.70
 
 %description
 wxWidgets/GTK2 is the GTK2 port of the C++ cross-platform wxWidgets
@@ -48,6 +45,9 @@ Requires:       %{name}-media = %{version}-%{release}
 Requires:       wxBase = %{version}-%{release}
 Requires:       gtk2-devel
 Requires:       libGL-devel, libGLU-devel
+Requires:       bakefile
+Requires(post): %{_sbindir}/update-alternatives
+Requires(postun): %{_sbindir}/update-alternatives
 
 %description devel
 This package include files needed to link with the wxGTK2 library.
@@ -85,11 +85,9 @@ libraries or the X Window System.
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1 -b .gsocket
-%patch1 -p0 -b .CVE-2009-2369
-%patch2 -p0 -b .wxTimer-fix
-%patch3 -p0 -b .menubar-height
-%patch4 -p0 -b .htmltable
+%patch0 -p1 -b .test
+%patch1 -p1 -b .abicheck
+%patch2 -p1 -b .char
 
 sed -i -e 's|/usr/lib\b|%{_libdir}|' wx-config.in configure
 
@@ -103,10 +101,6 @@ chmod a-x src/common/msgout.cpp
 
 %build
 
-# must do this to regenerate ./configure if patching to a cvs
-# version.
-#autoconf
-
 export GDK_USE_XFT=1
 
 # this code dereferences type-punned pointers like there's no tomorrow.
@@ -118,7 +112,7 @@ CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
 %configure \
   --with-opengl \
   --with-sdl \
-  --with-gnomeprint \
+  --without-gnomeprint \
   --enable-shared \
   --enable-soname \
   --disable-optimise \
@@ -133,7 +127,8 @@ CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
   --enable-mediactrl \
   --enable-display \
   --enable-timer \
-  --enable-compat24
+  --enable-compat24 \
+  --disable-catch_segvs
 
 make %{?_smp_mflags}
 make %{?_smp_mflags} -C contrib/src/stc
@@ -145,8 +140,6 @@ make %{?_smp_mflags} -C contrib/src/svg
 make %{?_smp_mflags} -C locale allmo
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 %makeinstall
 
 %makeinstall -C contrib/src/stc
@@ -156,18 +149,22 @@ rm -rf $RPM_BUILD_ROOT
 
 
 # install our multilib-aware wrapper
-rm $RPM_BUILD_ROOT%{_bindir}/wx-config
-install -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/wx-config
+rm %{buildroot}%{_bindir}/wx-config
+install -p -m 755 %{SOURCE1} %{buildroot}%{_bindir}/wx-config-2.0
+touch %{buildroot}%{_bindir}/wx-config
 
-# we don't support bakefiles
-rm -rf $RPM_BUILD_ROOT%{_datadir}/bakefile 
+#Alternatives setup with wxrc
+mv %{buildroot}%{_bindir}/wxrc %{buildroot}%{_bindir}/wxrc-2
+touch %{buildroot}%{_bindir}/wxrc
 
 %find_lang wxstd
 %find_lang wxmsw
 cat wxmsw.lang >> wxstd.lang
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+%check
+pushd tests
+#make test
+popd
 
 
 %post -p /sbin/ldconfig
@@ -182,9 +179,22 @@ rm -rf $RPM_BUILD_ROOT
 %post -n wxBase -p /sbin/ldconfig
 %postun -n wxBase -p /sbin/ldconfig
 
+%post devel
+if [ -f %{_bindir}/wx-config ] && [ ! -h %{_bindir}/wx-config ] ; then
+  rm %{_bindir}/wx-config
+fi
+%{_sbindir}/update-alternatives --install %{_bindir}/wx-config \
+  wx-config %{_bindir}/wx-config-2.0 2
+%{_sbindir}/update-alternatives --install %{_bindir}/wxrc \
+  wxrc %{_bindir}/wxrc-2 2
+
+%postun devel
+if [ $1 -eq 0 ] ; then
+  %{_sbindir}/update-alternatives --remove wx-config %{_bindir}/wx-config-2.0
+  %{_sbindir}/update-alternatives --remove wxrc %{_bindir}/wxrc-2
+fi
 
 %files -f wxstd.lang
-%defattr(-,root,root,-)
 %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.*
@@ -201,9 +211,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libwx_gtk2u_xrc-*.so.*
 
 %files devel
-%defattr(-,root,root,-)
-%{_bindir}/wx-config
-%{_bindir}/wxrc*
+%ghost %{_bindir}/wx-config
+%ghost %{_bindir}/wxrc
+%{_bindir}/wx-config-2.0
+%{_bindir}/wxrc-*
 %{_includedir}/wx-2.8
 %{_libdir}/libwx_*.so
 %dir %{_libdir}/wx
@@ -212,17 +223,15 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/wx/config
 %{_libdir}/wx/config/gtk2*
 %{_datadir}/aclocal/*
+%{_datadir}/bakefile/presets/*
 
 %files gl
-%defattr(-,root,root,-)
 %{_libdir}/libwx_gtk2u_gl-*.so.*
 
 %files media
-%defattr(-,root,root,-)
 %{_libdir}/libwx_gtk2u_media-*.so.*
 
 %files -n wxBase
-%defattr(-,root,root,-)
 %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_baseu-*.so.*
@@ -231,6 +240,116 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.12-31
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.12-30
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.12-29
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.12-28
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.12-27
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Thu Sep 29 2016 Jeremy Newton <alexjnewt at hotmail dot com>
+- Spec cleanup, fixed broken download link
+
+* Mon Sep 19 2016 Jeremy Newton <alexjnewt at hotmail dot com> - 2.8.12-26
+- Workaround for alternatives: remove wx-config if it's not a symlink
+
+* Sun Sep 18 2016 Jeremy Newton <alexjnewt at hotmail dot com> - 2.8.12-25
+- Missing update-alternatives requirement for devel package
+
+* Sun Aug 28 2016 Jeremy Newton <alexjnewt at hotmail dot com> - 2.8.12-24
+- Fix alternatives with wxGTK3 (#1128365)
+
+* Sat Feb 20 2016 Dan Horák <dan[at]danny.cz> - 2.8.12-23
+- fix FTBFS (#1308243)
+- skip tests as they depend on cppunit-config which was removed from cppunit-devel
+
+* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.12-22
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Wed Dec 30 2015 Michal Toman <mtoman@fedoraproject.org> - 2.8.12-21
+- Add support for MIPS to wx-config
+
+* Wed Nov 25 2015 Yaakov Selkowitz <yselkowi@redhat.com> - 2.8.12-20
+- Disable gnomeprint support (retired prior to F23)
+
+* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.8.12-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Mon May 04 2015 Jason L Tibbitts III <tibbs@math.uh.edu> - 2.8.12-18
+- Indicate that this package bundles scintilla 1.70.
+
+* Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 2.8.12-17
+- Rebuilt for GCC 5 C++11 ABI change
+
+* Thu Mar 12 2015 Dan Horák <dan[at]danny.cz> - 2.8.12-16
+- only warn on ABI mismatch (#1200611)
+
+* Wed Feb 25 2015 Petr Pisar <ppisar@redhat.com> - 2.8.12-15
+- Rebuild for reverted GCC 5.0 C++ ABI signature
+
+* Tue Feb 10 2015 Petr Pisar <ppisar@redhat.com> - 2.8.12-14
+- Rebuild for new GCC 5.0 C++ ABI signature (bug #1190971)
+
+* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.8.12-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.8.12-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Fri Jan 17 2014 Dan Horák <dan[at]danny.cz> - 2.8.12-11
+- Add ppc64le (#1054411)
+
+* Tue Jan 14 2014 Peter Robinson <pbrobinson@fedoraproject.org> 2.8.12-10
+- Add aarch64, clean up spec
+
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.8.12-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.8.12-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Mon Jan 21 2013 Adam Tkac <atkac redhat com> - 2.8.12-7
+- rebuild due to "jpeg8-ABI" feature drop
+
+* Fri Dec 21 2012 Adam Tkac <atkac redhat com> - 2.8.12-6
+- rebuild against new libjpeg
+
+* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.8.12-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Tue Feb 28 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.8.12-4
+- Rebuilt for c++ ABI breakage
+
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.8.12-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Tue Dec 06 2011 Adam Jackson <ajax@redhat.com> - 2.8.12-2
+- Rebuild for new libpng
+
+* Thu Apr 14 2011 Dan Horák <dan[at]danny.cz> - 2.8.12-1
+- updated to 2.8.12
+
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.8.11-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Mon Nov 29 2010 Dan Horák <dan[at]danny.cz> - 2.8.11-3
+- added fix for crashes during DnD (#626012)
+- bakefiles are included in devel subpackage (#626314)
+
+* Thu Jul  1 2010 Dan Horák <dan[at]danny.cz> - 2.8.11-2
+- rebuilt without the internal crash handler
+
+* Thu Apr 15 2010 Dan Horák <dan[at]danny.cz> - 2.8.11-1
+- updated to 2.8.11
+
 * Wed Nov 25 2009 Dan Horák <dan[at]danny.cz> - 2.8.10-9
 - updated the wrapper script (#541087)
 
@@ -364,7 +483,7 @@ rm -rf $RPM_BUILD_ROOT
 * Thu Apr 13 2006 Matthew Miller <mattdm@mattdm.org> - 2.6.3-2.6.3.2.0
 - patch to cvs subrelease 2.6.3.2 (matches wxPython)
 
-* Sat Mar 25 2006 Matthew Miller <mattdm@mattdm.org> - 2.6.3-1    
+* Sat Mar 25 2006 Matthew Miller <mattdm@mattdm.org> - 2.6.3-1
 - 2.6.3 final
 - remove the locale_install thing -- that was just an issue with using the
   release candidate.
@@ -388,9 +507,9 @@ rm -rf $RPM_BUILD_ROOT
 * Mon Feb 06 2006 Matthew Miller <mattdm@mattdm.org> - 2.6.2-4
 - add wxGTK-2.6.2-socketclosefix.patch to fix aMule crashes. see
   bugzilla bug #178184
-- add wxGTK-2.6.2-gcc41stringh.patch (pulled from CVS) to make build on 
+- add wxGTK-2.6.2-gcc41stringh.patch (pulled from CVS) to make build on
   FC5 devel w/ gcc-4.1.
-  
+
 * Wed Nov 30 2005 Matthew Miller <mattdm@mattdm.org> - 2.6.2-3
 - add wxGTK-2.6.2-intl_cpp.patch to deal with amule and probably other
   issues (see bug #154618 comment #47)
@@ -398,7 +517,7 @@ rm -rf $RPM_BUILD_ROOT
 
 * Mon Nov 28 2005 Matthew Miller <mattdm@mattdm.org> - 2.6.2-2
 - implemented some suggestions from Matthias Saou:
--   removed extraneous / from last line of ./configure 
+-   removed extraneous / from last line of ./configure
 -   removed -n from setup macro, since we're now actually using the
     standard name
 -   don't use summary macro in opengl subpackage, as it's not clear which
@@ -438,7 +557,7 @@ rm -rf $RPM_BUILD_ROOT
 
 * Wed Apr 13 2005 Matthew Miller <mattdm@mattdm.org> - 2.5.5-0.2
 - removed provides: wxWidgets/wxWidgets devel -- handy for compatibility
-  with unmodified generic source packages, but not so good for 
+  with unmodified generic source packages, but not so good for
   repeatable builds.
 
 * Wed Apr 13 2005 Matthew Miller <mattdm@mattdm.org> - 2.5.5-0.1