update patches

Conflicts:

	wxGTK.spec

.cvsignore

@@ -1 +0,0 @@
-wxGTK-2.8.4.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 $$/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 @@
-22e42c1601d9759530c875ffa2c3c554  wxGTK-2.8.4.tar.bz2
+08f81ab60647308058f6ce99712b14f8  wxGTK-2.8.12.tar.bz2

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-2.8.4-bad-g_free.patch

@@ -1,22 +0,0 @@
---- wxWidgets/trunk/src/gtk/button.cpp	2007/04/23 15:16:06	45602
-+++ wxWidgets/trunk/src/gtk/button.cpp	2007/06/18 06:03:50	46513
-@@ -71,7 +71,7 @@
-             right_border += default_border->right;
-             top_border += default_border->top;
-             bottom_border += default_border->bottom;
--            g_free( default_border );
-+            gtk_border_free( default_border );
-         }
-         win->MoveWindow(
-             win->m_x - top_border,
---- wxWidgets/trunk/src/gtk/window.cpp	2007/05/30 13:55:09	46249
-+++ wxWidgets/trunk/src/gtk/window.cpp	2007/06/18 06:03:50	46513
-@@ -2738,7 +2738,7 @@
-                 right_border += default_border->right;
-                 top_border += default_border->top;
-                 bottom_border += default_border->bottom;
--                g_free( default_border );
-+                gtk_border_free( default_border );
-             }
-         }
- 

wxGTK.spec

@@ -5,18 +5,17 @@
 %define withodbc 0
 
 Name:           wxGTK
-Version:        2.8.4
-Release:        4%{?dist}
+Version:        2.8.12
+Release:        1%{?dist}
 Summary:        GTK2 port of the wxWidgets GUI library
 # The wxWindows licence is the LGPL with a specific exemption allowing
 # distribution of derived binaries under any terms. (This will eventually
 # change to be "wxWidgets License" once that is approved by OSI.)
-License:        wxWidgets Library Licence
+License:        wxWidgets
 Group:          System Environment/Libraries
 URL:            http://www.wxwidgets.org/
 Source0:        http://dl.sf.net/wxwindows/%{name}-%{version}.tar.bz2
-# http://svn.wxwidgets.org/viewvc/wx?view=rev&revision=46513
-Patch0:         wxGTK-2.8.4-bad-g_free.patch
+Patch0:         %{name}-2.8.12-test.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -24,8 +23,6 @@ BuildRequires:  gtk2-devel, zlib-devel >= 1.1.4
 BuildRequires:  libpng-devel, libjpeg-devel, libtiff-devel
 BuildRequires:  expat-devel, SDL-devel, libgnomeprintui22-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
 %if %{withodbc}
@@ -35,22 +32,28 @@ BuildRequires:  unixODBC-devel
 # all of these are for previous Fedora Extras sub-packages
 Obsoletes:      wxGTK2 < 2.6.2-1
 Provides:       wxGTK2 = %{version}-%{release}
+Obsoletes:      compat-wxGTK2 < %{version}-%{release}
+Obsoletes:      compat-wxGTK  < %{version}-%{release}
 
 Obsoletes:      wxGTK-common < 2.6.2-1
 Provides:       wxGTK-common = %{version}-%{release}
+Obsoletes:      compat-wxGTK-common < %{version}-%{release}
 
 Obsoletes:      wxGTK2-xrc < 2.6.2-1
 Obsoletes:      wxGTK-xrc < 2.6.2-1
 Provides:       wxGTK2-xrc = %{version}-%{release}
 Provides:       wxGTK-xrc = %{version}-%{release}
+Obsoletes:      compat-wxGTK2-xrc < %{version}-%{release}
+Obsoletes:      compat-wxGTK-xrc < %{version}-%{release}
 
 Obsoletes:      wxGTK2-stc < 2.6.2-1
 Obsoletes:      wxGTK-stc < 2.6.2-1
 Provides:       wxGTK2-stc = %{version}-%{release}
 Provides:       wxGTK-stc = %{version}-%{release}
+Obsoletes:      compat-wxGTK2-stc < %{version}-%{release}
+Obsoletes:      compat-wxGTK-stc < %{version}-%{release}
 
-# time to clean up the compat package.
-Obsoletes:      compat-wxGTK < 2.8.0
+Requires:       wxBase = %{version}-%{release}
 
 %description
 wxWidgets/GTK2 is the GTK2 port of the C++ cross-platform wxWidgets
@@ -64,12 +67,16 @@ Group:          Development/Libraries
 Summary:        Development files for the wxGTK2 library
 Requires:       %{name} = %{version}-%{release}
 Requires:       %{name}-gl = %{version}-%{release}
+Requires:       wxBase = %{version}-%{release}
 Requires:       gtk2-devel
 Requires:       libGL-devel, libGLU-devel
 Obsoletes:      wxGTK2-devel < %{version}-%{release}
 Provides:       wxGTK2-devel = %{version}-%{release}
 Obsoletes:      wxGTK-common-devel < %{version}-%{release}
 Provides:       wxGTK-common-devel = %{version}-%{release}
+Obsoletes:      compat-wxGTK2-devel < %{version}-%{release}
+Obsoletes:      compat-wxGTK-devel  < %{version}-%{release}
+Obsoletes:      compat-wxGTK-common-devel < %{version}-%{release}
 
 %description devel
 This package include files needed to link with the wxGTK2 library.
@@ -81,10 +88,13 @@ Group:          System Environment/Libraries
 Requires:       %{name} = %{version}-%{release}
 Obsoletes:      wxGTK2-gl < %{version}-%{release}
 Provides:       wxGTK2-gl = %{version}-%{release}
+Obsoletes:      compat-wxGTK2-gl < %{version}-%{release}
+Obsoletes:      compat-wxGTK-gl  < %{version}-%{release}
 
 %description gl
 OpenGL (a 3D graphics API) add-on for the wxWidgets library.
 
+
 %if %{withodbc}
 %package        odbc
 Summary:        ODBC add-on for the wxWidgets library
@@ -95,10 +105,22 @@ Requires:       %{name} = %{version}-%{release}
 ODBC (a SQL database connectivity API) add-on for the wxWidgets library.
 %endif
 
+
+%package -n     wxBase
+Summary:        Non-GUI support classes from the wxWidgets library
+Group:          System Environment/Libraries
+
+%description -n wxBase
+Every wxWidgets application must link against this library. It contains
+mandatory classes that any wxWidgets code depends on (like wxString) and
+portability classes that abstract differences between platforms. wxBase can
+be used to develop console mode applications -- it does not require any GUI
+libraries or the X Window System.
+
+
 %prep
 %setup -q
-
-%patch0 -p2 -b .badfree
+%patch0 -p1 -b .test
 
 sed -i -e 's|/usr/lib\b|%{_libdir}|' wx-config.in configure
 
@@ -180,21 +202,25 @@ rm -rf $RPM_BUILD_ROOT
 %post gl -p /sbin/ldconfig
 %postun gl -p /sbin/ldconfig
 
+%if %{withodbc}
+%post odbc -p /sbin/ldconfig
+%postun odbc -p /sbin/ldconfig
+%endif
+
+%post -n wxBase -p /sbin/ldconfig
+%postun -n wxBase -p /sbin/ldconfig
+
 
 %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_baseu-*.so.*
-%{_libdir}/libwx_baseu_net-*.so.*
-%{_libdir}/libwx_baseu_xml-*.so.*
 %{_libdir}/libwx_gtk2u_adv-*.so.*
 %{_libdir}/libwx_gtk2u_aui-*.so.*
 %{_libdir}/libwx_gtk2u_core-*.so.*
 %{_libdir}/libwx_gtk2u_gizmos-*.so.*
 %{_libdir}/libwx_gtk2u_gizmos_xrc*.so.*
 %{_libdir}/libwx_gtk2u_html-*.so.*
-%{_libdir}/libwx_gtk2u_media-*.so.*
 %{_libdir}/libwx_gtk2u_ogl-*.so.*
 %{_libdir}/libwx_gtk2u_qa-*.so.*
 %{_libdir}/libwx_gtk2u_richtext-*.so.*
@@ -226,7 +252,53 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libwx_gtk2u_odbc-*.so.*
 %endif
 
+%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.*
+%{_libdir}/libwx_baseu_net-*.so.*
+%{_libdir}/libwx_baseu_xml-*.so.*
+
+
 %changelog
+* Thu Apr 14 2011 Dan Horák <dan[at]danny.cz> - 2.8.12-1
+- updated to 2.8.12
+
+* Mon Nov 29 2010 Dan Horák <dan[at]danny.cz> - 2.8.11-2
+- added fix for crashes during DnD (#626012)
+
+* Mon Apr 26 2010 Dan Horák <dan[at]danny.cz> - 2.8.11-1
+- update to 2.8.11
+
+* Wed Jul 15 2009 Dan Horák <dan[at]danny.cz> - 2.8.9-2
+- add fix for CVE-2009-2369 (#511279)
+
+* Mon Nov 10 2008 Dan Horak <dan[at]danny.cz> - 2.8.9-1
+- update to 2.8.9
+- drop upstreamed patch
+- fix license tag
+
+* Tue Apr  1 2008 Dan Horak <dan[at]danny.cz> - 2.8.7-2
+- added fix for a race condition (rh bug #440011)
+
+* Wed Feb 20 2008 Matthew Miller <mattdm@mattdm.org> - 2.8.7-1
+- update to 2.8.7 (rh bug #369621, etc.)
+- split base libs into separate wxBase package (rh bug #357961)
+- okay, so, wxPython 2.8.7.1 seems to work fine against this version of the
+  library, so I'm dropping the kludgy-patch-to-2.8.7.1 thing. Please report
+  any compatibility problems with wxPython 2.8.7.1 and I'll fix them as they
+  come up.
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 2.8.4-7
+- Autorebuild for GCC 4.3
+
+* Tue Aug 28 2007 Hans de Goede <j.w.r.degoede@hhs.nl> - 2.8.4-6
+- Rebuild for new expat 2.0
+
+* Fri Aug  3 2007 Matthew Miller <mattdm@mattdm.org> - 2.8.4-5
+- obsolete all compat-wxGTK subpackages properly (bug #250687)
+
 * Mon Jul 16 2007 Matthew Miller <mattdm@mattdm.org> - 2.8.4-4
 - patch from svn to fix rh bug #247414