From b8b91d8e09514608fa2f88d9f6455982f5fb2d9a Mon Sep 17 00:00:00 2001 From: sobomax Date: Mon, 9 Sep 2002 14:17:30 +0000 Subject: Update to 2.2.9. Poked by: joe --- x11-toolkits/wxgtk24/files/patch-aa | 56 +++++--------- x11-toolkits/wxgtk24/files/patch-ac | 87 ++++++++++++---------- x11-toolkits/wxgtk24/files/patch-configure | 78 +++++++------------ .../wxgtk24/files/patch-include::wx::gtk::menu.h | 15 ++++ .../wxgtk24/files/patch-src::common::strconv.cpp | 14 ++++ x11-toolkits/wxgtk24/files/patch-wx-config.in | 16 ++-- 6 files changed, 130 insertions(+), 136 deletions(-) create mode 100644 x11-toolkits/wxgtk24/files/patch-include::wx::gtk::menu.h create mode 100644 x11-toolkits/wxgtk24/files/patch-src::common::strconv.cpp (limited to 'x11-toolkits/wxgtk24/files') diff --git a/x11-toolkits/wxgtk24/files/patch-aa b/x11-toolkits/wxgtk24/files/patch-aa index e4156f619bad..e2a94922c390 100644 --- a/x11-toolkits/wxgtk24/files/patch-aa +++ b/x11-toolkits/wxgtk24/files/patch-aa @@ -1,46 +1,28 @@ $FreeBSD$ ---- configure.in.orig Tue May 22 17:27:55 2001 -+++ configure.in Mon May 28 17:26:14 2001 -@@ -1968,16 +1968,12 @@ - WX_LIBRARY_NAME_STATIC_GL="lib${WX_LIBRARY}_gl.a" +--- configure.in.orig Fri Jan 4 17:47:57 2002 ++++ configure.in Mon Sep 9 13:59:17 2002 +@@ -2206,14 +2206,12 @@ + WX_LIBRARY_NAME_STATIC_GL="lib${WX_LIBRARY_GL}.a" dnl the name of the shared library --WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}-${WX_RELEASE}.so.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}" --WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.so.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}" +-WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${SO_SUFFIX}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}" +-WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}" +WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.so.2" +WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY}_gl.so.2" dnl the name of the links to the shared library --WX_LIBRARY_LINK1="lib${WX_LIBRARY}-${WX_RELEASE}.so.${WX_CURRENT}" --WX_LIBRARY_LINK2="lib${WX_LIBRARY}-${WX_RELEASE}.so" --WX_LIBRARY_LINK3="lib${WX_LIBRARY}.so" --WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.so.${WX_CURRENT}" --WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.so" --WX_LIBRARY_LINK3_GL="lib${WX_LIBRARY}_gl.so" +-WX_LIBRARY_LINK1="lib${WX_LIBRARY}.${SO_SUFFIX}.${WX_CURRENT}" +-WX_LIBRARY_LINK2="lib${WX_LIBRARY}.${SO_SUFFIX}" +-WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}.${WX_CURRENT}" +-WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}" +WX_LIBRARY_LINK1="lib${WX_LIBRARY}.so" +WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY}_gl.so" - dnl shared library settings - SHARED_LD= -@@ -2074,8 +2070,13 @@ - *-*-freebsd* | *-*-openbsd* | *-*-netbsd*) - SHARED_LD="${CC} -shared -o" - PIC_FLAG="-fPIC" -- WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS" -- WX_ALL="CREATE_LINKS" -+ if test "$wxUSE_OPENGL" = "yes"; then -+ WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS CREATE_INSTALLED_LINKS_GL" -+ WX_ALL="CREATE_LINKS CREATE_LINKS_GL" -+ else -+ WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS" -+ WX_ALL="CREATE_LINKS" -+ fi - ;; - *-*-osf* ) - SHARED_LD="${CXX} -shared -o" -@@ -2749,24 +2750,6 @@ + + dnl --- the marker for quick search, leave it here: SHARED_LIB_SETUP --- +@@ -2994,24 +3000,6 @@ fi fi @@ -63,23 +45,21 @@ $FreeBSD$ -fi - dnl --------------------------------------------------------------------------- - dnl Optional libraries + dnl the library may be built without GUI classes at all dnl --------------------------------------------------------------------------- -@@ -3808,8 +3791,6 @@ - AC_SUBST(WX_LIBRARY) +@@ -3960,7 +3948,6 @@ + AC_SUBST(WX_LIBRARY_NAME_SHARED) AC_SUBST(WX_TARGET_LIBRARY) AC_SUBST(WX_LIBRARY_LINK1) -AC_SUBST(WX_LIBRARY_LINK2) --AC_SUBST(WX_LIBRARY_LINK3) AC_SUBST(PROGRAM_EXT) dnl global gl options -@@ -3819,8 +3800,6 @@ - AC_SUBST(WX_LIBRARY_GL) +@@ -3968,7 +3955,6 @@ + AC_SUBST(WX_LIBRARY_NAME_SHARED_GL) AC_SUBST(WX_TARGET_LIBRARY_GL) AC_SUBST(WX_LIBRARY_LINK1_GL) -AC_SUBST(WX_LIBRARY_LINK2_GL) --AC_SUBST(WX_LIBRARY_LINK3_GL) dnl are we supposed to create the links? AC_SUBST(WX_ALL) diff --git a/x11-toolkits/wxgtk24/files/patch-ac b/x11-toolkits/wxgtk24/files/patch-ac index e9cf29bb3964..299113130bd8 100644 --- a/x11-toolkits/wxgtk24/files/patch-ac +++ b/x11-toolkits/wxgtk24/files/patch-ac @@ -1,80 +1,89 @@ $FreeBSD$ ---- Makefile.in.orig Fri May 25 05:55:33 2001 -+++ Makefile.in Mon May 28 19:47:06 2001 -@@ -379,39 +379,23 @@ +--- Makefile.in.orig Fri Jan 4 17:47:57 2002 ++++ Makefile.in Mon Sep 9 15:55:57 2002 +@@ -342,17 +342,13 @@ - CREATE_LINKS: @WX_LIBRARY_NAME_SHARED@ - @$(RM) ./lib/@WX_LIBRARY_LINK1@ -- @$(RM) ./lib/@WX_LIBRARY_LINK2@ -- @$(RM) ./lib/@WX_LIBRARY_LINK3@ - cd lib \ + $(build_libdir)/@WX_LIBRARY_LINK1@: $(build_libdir)/@WX_LIBRARY_NAME_SHARED@ + @$(RM) $(build_libdir)/@WX_LIBRARY_LINK1@ +- @$(RM) $(build_libdir)/@WX_LIBRARY_LINK2@ + cd $(build_libdir) \ - && $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK1@ \ -- && $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK2@ \ -- && $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK3@ +- && $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK2@ + && $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK1@ - CREATE_LINKS_GL: @WX_LIBRARY_NAME_SHARED_GL@ - @$(RM) ./lib/@WX_LIBRARY_LINK1_GL@ -- @$(RM) ./lib/@WX_LIBRARY_LINK2_GL@ -- @$(RM) ./lib/@WX_LIBRARY_LINK3_GL@ - cd lib \ + $(build_libdir)/@WX_LIBRARY_LINK1_GL@: $(build_libdir)/@WX_LIBRARY_NAME_SHARED_GL@ + @$(RM) $(build_libdir)/@WX_LIBRARY_LINK1_GL@ +- @$(RM) $(build_libdir)/@WX_LIBRARY_LINK2_GL@ + cd $(build_libdir) \ - && $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK1_GL@ \ -- && $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK2_GL@ \ -- && $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK3_GL@ +- && $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK2_GL@ + && $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK1_GL@ + $(OBJECTS): $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h + +@@ -382,17 +378,13 @@ + CREATE_INSTALLED_LINKS: preinstall $(RM) $(libdir)/@WX_LIBRARY_LINK1@ - $(RM) $(libdir)/@WX_LIBRARY_LINK2@ -- $(RM) $(libdir)/@WX_LIBRARY_LINK3@ cd $(libdir) \ - && $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK1@ \ -- && $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK2@ \ -- && $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK3@ +- && $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK2@ + && $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK1@ CREATE_INSTALLED_LINKS_GL: preinstall_gl $(RM) $(libdir)/@WX_LIBRARY_LINK1_GL@ - $(RM) $(libdir)/@WX_LIBRARY_LINK2_GL@ -- $(RM) $(libdir)/@WX_LIBRARY_LINK3_GL@ cd $(libdir) \ - && $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK1_GL@ \ -- && $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK2_GL@ \ -- && $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK3_GL@ +- && $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK2_GL@ + && $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK1_GL@ - $(OBJECTS): $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h + afminstall: preinstall + $(INSTALL) -d $(datadir) +@@ -404,7 +396,7 @@ -@@ -461,11 +445,11 @@ - cd $(bindir) && rm -f wx-config && $(LN_S) wx@TOOLKIT_NAME@-config wx-config - $(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(libdir)/@WX_TARGET_LIBRARY@ + # this is the real install target: copies the library, wx-config and the + # headers to the installation directory +-preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLCHAIN_NAME@-config ++preinstall: + @echo " " + @echo " Installing wxWindows..." + @echo " " +@@ -421,11 +413,8 @@ + @# import livraru name + @if test "@TOOLKIT_DIR@" = "msw" -a "@WX_LIBRARY_NAME_STATIC@" != "@WX_TARGET_LIBRARY@"; then $(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_LIBRARY_NAME_STATIC@ $(libdir)/@WX_LIBRARY_NAME_STATIC@; fi - $(INSTALL) -d $(libdir)/wx - $(INSTALL) -d $(libdir)/wx/include -- $(INSTALL) -d $(libdir)/wx/include/wx -- $(INSTALL) -d $(libdir)/wx/include/wx/@TOOLKIT_NAME@ -- $(INSTALL_DATA) $(top_builddir)/include/wx/@TOOLKIT_DIR@/setup.h $(libdir)/wx/include/wx/@TOOLKIT_NAME@/setup.h -+# $(INSTALL) -d $(libdir)/wx -+# $(INSTALL) -d $(libdir)/wx/include +- $(INSTALL) -d $(libdir)/wx/include/@TOOLCHAIN_NAME@ +- $(INSTALL) -d $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx +- $(INSTALL_DATA) $(top_builddir)/lib/wx/include/@TOOLCHAIN_NAME@/wx/setup.h $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h + $(INSTALL) -d $(prefix)/include/wx -+ $(INSTALL) -d $(prefix)/include/wx/@TOOLKIT_NAME@ -+ $(INSTALL_DATA) $(top_builddir)/include/wx/@TOOLKIT_DIR@/setup.h $(prefix)/include/wx/@TOOLKIT_NAME@/setup.h ++ $(INSTALL_DATA) $(top_builddir)/lib/wx/include/@TOOLCHAIN_NAME@/wx/setup.h $(prefix)/include/wx/setup.h $(INSTALL) -d $(includedir)/wx - @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/@TOOLKIT_DIR@; fi -@@ -513,13 +497,9 @@ + @# FIXME: This will erroneously install a wx/base dir for wxBase.. +@@ -449,7 +438,7 @@ + echo "$(INSTALL_DATA) $(top_srcdir)/locale/$$p.mo $(localedir)/$$p/LC_MESSAGES/wxstd.mo"; \ + done + +-preinstall_gl: $(top_builddir)/lib/@WX_TARGET_LIBRARY_GL@ ++preinstall_gl: + @echo " " + @echo " Installing wxWindows OpenGl add-on..." + @echo " " +@@ -476,11 +465,9 @@ @echo " Removing library..." @$(RM) $(libdir)/@WX_TARGET_LIBRARY@ @$(RM) $(libdir)/@WX_LIBRARY_LINK1@ - @$(RM) $(libdir)/@WX_LIBRARY_LINK2@ -- @$(RM) $(libdir)/@WX_LIBRARY_LINK3@ @echo " Removing GL library..." @$(RM) $(libdir)/@WX_TARGET_LIBRARY_GL@ @$(RM) $(libdir)/@WX_LIBRARY_LINK1_GL@ - @$(RM) $(libdir)/@WX_LIBRARY_LINK2_GL@ -- @$(RM) $(libdir)/@WX_LIBRARY_LINK3_GL@ @echo " Removing helper files..." - @$(RM) $(libdir)/wx/include/wx/@TOOLKIT_NAME@/setup.h + @$(RM) $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h @$(RM) $(bindir)/wx-config diff --git a/x11-toolkits/wxgtk24/files/patch-configure b/x11-toolkits/wxgtk24/files/patch-configure index 1b8b18df93b2..9f94e418fd5b 100644 --- a/x11-toolkits/wxgtk24/files/patch-configure +++ b/x11-toolkits/wxgtk24/files/patch-configure @@ -1,16 +1,16 @@ $FreeBSD$ ---- configure.orig Mon Jul 23 14:48:10 2001 -+++ configure Mon Jul 23 15:12:50 2001 -@@ -7452,14 +7452,14 @@ - TOOLKIT=GTK - GUIDIST=GTK_DIST +--- configure.orig Mon Sep 9 14:00:36 2002 ++++ configure Mon Sep 9 14:20:43 2002 +@@ -7993,14 +7993,14 @@ + TOOLKIT=GTK + GUIDIST=GTK_DIST -- echo $ac_n "checking for gdk_im_open in -lgdk""... $ac_c" 1>&6 --echo "configure:7457: checking for gdk_im_open in -lgdk" >&5 -+ echo $ac_n "checking for gdk_im_open in -lgdk12""... $ac_c" 1>&6 -+echo "configure:7457: checking for gdk_im_open in -lgdk12" >&5 +- echo $ac_n "checking for gdk_im_open in -lgdk""... $ac_c" 1>&6 +-echo "configure:7998: checking for gdk_im_open in -lgdk" >&5 ++ echo $ac_n "checking for gdk_im_open in -lgdk12""... $ac_c" 1>&6 ++echo "configure:7998: checking for gdk_im_open in -lgdk12" >&5 ac_lib_var=`echo gdk'_'gdk_im_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -19,47 +19,27 @@ $FreeBSD$ -LIBS="-lgdk $LIBS" +LIBS="-lgdk12 $LIBS" cat > conftest.$ac_ext <> confdefs.h <<\EOF -@@ -14754,8 +14737,6 @@ - s%@WX_LIBRARY@%$WX_LIBRARY%g + #define wxUSE_GUI 1 +@@ -14995,13 +14983,11 @@ + s%@WX_LIBRARY_NAME_SHARED@%$WX_LIBRARY_NAME_SHARED%g s%@WX_TARGET_LIBRARY@%$WX_TARGET_LIBRARY%g s%@WX_LIBRARY_LINK1@%$WX_LIBRARY_LINK1%g -s%@WX_LIBRARY_LINK2@%$WX_LIBRARY_LINK2%g --s%@WX_LIBRARY_LINK3@%$WX_LIBRARY_LINK3%g s%@PROGRAM_EXT@%$PROGRAM_EXT%g - s%@WX_LIBRARY_NAME_GL@%$WX_LIBRARY_NAME_GL%g s%@WX_LIBRARY_NAME_STATIC_GL@%$WX_LIBRARY_NAME_STATIC_GL%g -@@ -14763,8 +14744,6 @@ - s%@WX_LIBRARY_GL@%$WX_LIBRARY_GL%g + s%@WX_LIBRARY_NAME_SHARED_GL@%$WX_LIBRARY_NAME_SHARED_GL%g s%@WX_TARGET_LIBRARY_GL@%$WX_TARGET_LIBRARY_GL%g s%@WX_LIBRARY_LINK1_GL@%$WX_LIBRARY_LINK1_GL%g -s%@WX_LIBRARY_LINK2_GL@%$WX_LIBRARY_LINK2_GL%g --s%@WX_LIBRARY_LINK3_GL@%$WX_LIBRARY_LINK3_GL%g s%@WX_ALL@%$WX_ALL%g s%@WX_ALL_INSTALLED@%$WX_ALL_INSTALLED%g s%@SHARED_LD@%$SHARED_LD%g diff --git a/x11-toolkits/wxgtk24/files/patch-include::wx::gtk::menu.h b/x11-toolkits/wxgtk24/files/patch-include::wx::gtk::menu.h new file mode 100644 index 000000000000..94cee68182cb --- /dev/null +++ b/x11-toolkits/wxgtk24/files/patch-include::wx::gtk::menu.h @@ -0,0 +1,15 @@ + +$FreeBSD$ + +--- include/wx/gtk/menu.h 2002/09/09 11:38:53 1.1 ++++ include/wx/gtk/menu.h 2002/09/09 11:39:09 +@@ -85,7 +85,9 @@ + { + Init(); + ++#if wxUSE_MENU_CALLBACK + Callback(func); ++#endif // wxUSE_MENU_CALLBACK + } + + // implementation diff --git a/x11-toolkits/wxgtk24/files/patch-src::common::strconv.cpp b/x11-toolkits/wxgtk24/files/patch-src::common::strconv.cpp new file mode 100644 index 000000000000..67d30a0f4980 --- /dev/null +++ b/x11-toolkits/wxgtk24/files/patch-src::common::strconv.cpp @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- src/common/strconv.cpp 2002/09/09 13:18:00 1.1 ++++ src/common/strconv.cpp 2002/09/09 13:18:10 +@@ -358,7 +358,7 @@ + #if defined(__BORLANDC__) && (__BORLANDC__ > 0x530) + return std::wcslen(psz); + #else +- return ::wcslen(psz); ++ return wcslen(psz); + #endif + } + diff --git a/x11-toolkits/wxgtk24/files/patch-wx-config.in b/x11-toolkits/wxgtk24/files/patch-wx-config.in index 89574988948a..7a36184a90b8 100644 --- a/x11-toolkits/wxgtk24/files/patch-wx-config.in +++ b/x11-toolkits/wxgtk24/files/patch-wx-config.in @@ -1,14 +1,14 @@ $FreeBSD$ ---- wx-config.in 2001/05/28 16:47:21 1.1 -+++ wx-config.in 2001/05/28 16:50:00 -@@ -31,7 +31,7 @@ - includes=-I@includedir@ - fi +--- wx-config.in.orig Fri Jan 4 17:47:57 2002 ++++ wx-config.in Mon Sep 9 14:22:16 2002 +@@ -35,7 +35,7 @@ + then + includes=-I@includedir@ fi -- includes="$includes -I@libdir@/wx/include -D__USE_WXCONFIG__" -+ includes="$includes -I@prefix@/include -D__USE_WXCONFIG__" - echo $includes @WXDEBUG_DEFINE@ @TOOLKIT_DEF@ @WXCONFIG_INCLUDE@ +- includes="-I@libdir@/wx/include/@TOOLCHAIN_NAME@ $includes" ++ includes="-I@prefix@/include/@TOOLCHAIN_NAME@ $includes" + echo $includes @WXDEBUG_DEFINE@ @TOOLCHAIN_DEFS@ @WXCONFIG_INCLUDE@ } -- cgit