- proper url

[packages/wxWidgets.git] / wxWidgets-ogl.patch

diff --git a/wxWidgets-ogl.patch b/wxWidgets-ogl.patch
index eb8b43b69ffaf1f28ce9326c7aa0e694f37c8e90..da2576363d302236ef9b1f7eb4c65fdde305b6bc 100644 (file)
--- a/wxWidgets-ogl.patch
+++ b/wxWidgets-ogl.patch
@@ -1,18 +1,18 @@
---- wxWidgets-2.5.3/contrib/build/ogl/ogl.bkl.wiget    2005-01-21 15:50:32.000000000 +0100
-+++ wxWidgets-2.5.3/contrib/build/ogl/ogl.bkl  2005-01-21 15:51:15.000000000 +0100
-@@ -43,7 +43,8 @@
-     <dll id="ogldll" template="wx_contrib_dll" cond="SHARED=='1'">
+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>
-+              <sources>$(OGL_SRC)</sources>
-+              <wx-lib>deprecated</wx-lib>
+         <sources>$(OGL_SRC)</sources>
++        <wx-lib>deprecated</wx-lib>
          <wx-lib>core</wx-lib>
          <wx-lib>base</wx-lib>
      </dll>
---- wxWidgets-2.5.3-orig/contrib/src/ogl/Makefile.in   2004-09-30 10:17:56.000000000 +0200
-+++ wxWidgets-2.5.3/contrib/src/ogl/Makefile.in        2005-01-23 01:45:14.418728728 +0100
-@@ -187,6 +187,9 @@
+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)
@@ -22,11 +22,12 @@
  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)
-@@ -226,7 +229,7 @@
-       rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+@@ -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)
--@COND_SHARED_1@       $(SHARED_LD_CXX) $@ $(OGLDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__ogldll___macinstnamecmd) $(__ogldll___importlib) $(__ogldll___soname_flags) $(__ogldll___macver)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)
-+@COND_SHARED_1@       $(SHARED_LD_CXX) $@ $(OGLDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__ogldll___macinstnamecmd) $(__ogldll___importlib) $(__ogldll___soname_flags) $(__ogldll___macver)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__WXLIB_DEPRECATED_p) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)
+ @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)
+