Author: troll Date: Tue Mar 1 14:03:04 2005 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- adjusted to 2.5.4
---- Files affected:
SOURCES:
wxWidgets-ogl.patch (1.2 -> 1.3)
---- Diffs:
================================================================
Index: SOURCES/wxWidgets-ogl.patch
diff -u SOURCES/wxWidgets-ogl.patch:1.2 SOURCES/wxWidgets-ogl.patch:1.3
--- SOURCES/wxWidgets-ogl.patch:1.2 Sun Jan 23 04:04:49 2005
+++ SOURCES/wxWidgets-ogl.patch Tue Mar 1 15:02:59 2005
@@ -1,18 +1,16 @@
---- 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'">
+--- wxWidgets-2.5.4.orig/contrib/build/ogl/ogl.bkl~ 2003-08-25
23:00:52.000000000 +0200
++++ wxWidgets-2.5.4.orig/contrib/build/ogl/ogl.bkl 2005-02-28
16:00:48.226148600 +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 @@
+--- wxWidgets-2.5.4.orig/contrib/src/ogl/Makefile.in~ 2005-02-20
10:51:37.000000000 +0100
++++ wxWidgets-2.5.4.orig/contrib/src/ogl/Makefile.in 2005-02-28
16:07:54.659320904 +0100
+@@ -191,6 +191,9 @@
COND_MONOLITHIC_0___WXLIB_BASE_p = \
-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@[EMAIL PROTECTED] = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
@@ -22,11 +20,12 @@
COND_SHARED_0___ogllib___depname = \
$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
@[EMAIL PROTECTED] = $(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
+@@ -230,7 +233,7 @@
+ rm -f config.cache config.log config.status bk-deps bk-make-pch
shared-ld-sh Makefile
@[EMAIL
PROTECTED](LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3):
$(OGLDLL_OBJECTS)
[EMAIL PROTECTED]@ $(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)
[EMAIL PROTECTED]@ $(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)
[EMAIL PROTECTED]@ $(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_FOR_BASE) $(EXTRALIBS_FOR_GUI)
$(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
[EMAIL PROTECTED]@ $(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_FOR_BASE) $(EXTRALIBS_FOR_GUI)
$(__WXLIB_DEPRECATED_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
@COND_SHARED_1@
@COND_SHARED_1@ $(__ogldll___so_symlinks_cmd)
+
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/wxWidgets-ogl.patch?r1=1.2&r2=1.3&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
