- drop obsolete patches

diff --git a/wxWidgets-ogl.patch b/wxWidgets-ogl.patch
deleted file mode 100644 (file)
index da25763..0000000
--- a/wxWidgets-ogl.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -uNr wxWidgets-2.8.0-rc1.orig/contrib/build/ogl/ogl.bkl wxWidgets-2.8.0-rc1/contrib/build/ogl/ogl.bkl
---- wxWidgets-2.8.0-rc1.orig/contrib/build/ogl/ogl.bkl 2006-11-13 11:53:15.000000000 +0100
-+++ wxWidgets-2.8.0-rc1/contrib/build/ogl/ogl.bkl      2006-11-27 09:20:26.000000000 +0100
-@@ -44,6 +44,7 @@
-         <define>WXUSINGDLL</define>
-         <define>WXMAKINGDLL_OGL</define>
-         <sources>$(OGL_SRC)</sources>
-+        <wx-lib>deprecated</wx-lib>
-         <wx-lib>core</wx-lib>
-         <wx-lib>base</wx-lib>
-     </dll>
-diff -uNr wxWidgets-2.8.0-rc1.orig/contrib/src/ogl/Makefile.in wxWidgets-2.8.0-rc1/contrib/src/ogl/Makefile.in
---- wxWidgets-2.8.0-rc1.orig/contrib/src/ogl/Makefile.in       2006-11-13 11:53:18.000000000 +0100
-+++ wxWidgets-2.8.0-rc1/contrib/src/ogl/Makefile.in    2006-11-27 09:56:09.000000000 +0100
-@@ -214,6 +214,9 @@
- COND_MONOLITHIC_0___WXLIB_BASE_p = \
-       -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
- @COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
-+COND_MONOLITHIC_0___WXLIB_DEPRECATED_p = \
-+      -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(WX_RELEASE)$(HOST_SUFFIX)
-+@COND_MONOLITHIC_0@__WXLIB_DEPRECATED_p = $(COND_MONOLITHIC_0___WXLIB_DEPRECATED_p)
- COND_SHARED_0___ogllib___depname = \
-       $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
- @COND_SHARED_0@__ogllib___depname = $(COND_SHARED_0___ogllib___depname)
-@@ -262,7 +265,7 @@
-       rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
- 
- @COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3): $(OGLDLL_OBJECTS) $(__ogldll___win32rc)
--@COND_SHARED_1@       $(SHARED_LD_CXX) $@ $(OGLDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__ogldll___macinstnamecmd) $(__ogldll___importlib) $(__ogldll___soname_flags) $(WXMACVERSION_CMD)  $(LIBS) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)
-+@COND_SHARED_1@       $(SHARED_LD_CXX) $@ $(OGLDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__ogldll___macinstnamecmd) $(__ogldll___importlib) $(__ogldll___soname_flags) $(WXMACVERSION_CMD)  $(LIBS) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__EXLIB_DEPRECATED_p) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)
- @COND_SHARED_1@       
- @COND_SHARED_1@       $(__ogldll___so_symlinks_cmd)
- 

diff --git a/wxWidgets.spec b/wxWidgets.spec
index 0b062e83f3e2912854766346a62df8d0df64edd7..968eb4b82bdcde5de95aae91aea335ba8da95cbb 100644 (file)
--- a/wxWidgets.spec
+++ b/wxWidgets.spec
@@ -17,9 +17,8 @@ Group:                X11/Libraries
 Source0:       http://downloads.sourceforge.net/wxwindows/%{name}-%{version}.7z
 # Source0-md5: 294362f2a7407547b6819748896b1632
 Patch0:                %{name}-samples.patch
-Patch1:                %{name}-ogl.patch
-Patch2:                %{name}-ac.patch
-Patch3:                %{name}-link.patch
+Patch1:                %{name}-ac.patch
+Patch2:                %{name}-link.patch
 URL:           http://www.wxWidgets.org/
 BuildRequires: OpenGL-GLU-devel
 #BuildRequires:        SDL-devel
@@ -472,12 +471,6 @@ obsługą UNICODE.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
 
 %{__rm} build/aclocal/bakefile*.m4