diff options
author | cvs2svn <cvs2svn@FreeBSD.org> | 2003-06-01 23:49:18 +0000 |
---|---|---|
committer | cvs2svn <cvs2svn@FreeBSD.org> | 2003-06-01 23:49:18 +0000 |
commit | 6a294c20389911c409eb5f6f05033eaf6c6975ab (patch) | |
tree | b621d2670693545124e161f6048aa76ec80ae631 /x11-toolkits/wxgtk24/files | |
parent | ef70e9816ef935802e3a1e27b44f1c499b5cb27b (diff) |
Notes
Diffstat (limited to 'x11-toolkits/wxgtk24/files')
-rw-r--r-- | x11-toolkits/wxgtk24/files/patch-aa | 65 | ||||
-rw-r--r-- | x11-toolkits/wxgtk24/files/patch-ac | 89 | ||||
-rw-r--r-- | x11-toolkits/wxgtk24/files/patch-configure | 80 | ||||
-rw-r--r-- | x11-toolkits/wxgtk24/files/patch-include::wx::gtk::menu.h | 15 | ||||
-rw-r--r-- | x11-toolkits/wxgtk24/files/patch-src::common::parser.y | 10 | ||||
-rw-r--r-- | x11-toolkits/wxgtk24/files/patch-src::common::strconv.cpp | 14 | ||||
-rw-r--r-- | x11-toolkits/wxgtk24/files/patch-wx-config.in | 14 |
7 files changed, 0 insertions, 287 deletions
diff --git a/x11-toolkits/wxgtk24/files/patch-aa b/x11-toolkits/wxgtk24/files/patch-aa deleted file mode 100644 index e2a94922c390..000000000000 --- a/x11-toolkits/wxgtk24/files/patch-aa +++ /dev/null @@ -1,65 +0,0 @@ - -$FreeBSD$ - ---- 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}.${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}.${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 --- the marker for quick search, leave it here: SHARED_LIB_SETUP --- -@@ -2994,24 +3000,6 @@ - fi - fi - -- --CXXFLAGS=`echo "${CXXFLAGS}" | sed "s/\-O.//g" ` --CFLAGS=`echo "${CFLAGS}" | sed "s/\-O.//g" ` --if test "$wxUSE_OPTIMISE" = "no" ; then -- OPTIMISE= --else -- if test "$GCC" = yes ; then -- OPTIMISE="-O2" -- case "${host}" in -- i586-*-*|i686-*-* ) -- OPTIMISE="${OPTIMISE} " -- ;; -- esac -- else -- OPTIMISE="-O" -- fi --fi -- - dnl --------------------------------------------------------------------------- - dnl the library may be built without GUI classes at all - dnl --------------------------------------------------------------------------- -@@ -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(PROGRAM_EXT) - - dnl global gl options -@@ -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) - - 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 deleted file mode 100644 index 299113130bd8..000000000000 --- a/x11-toolkits/wxgtk24/files/patch-ac +++ /dev/null @@ -1,89 +0,0 @@ - -$FreeBSD$ - ---- Makefile.in.orig Fri Jan 4 17:47:57 2002 -+++ Makefile.in Mon Sep 9 15:55:57 2002 -@@ -342,17 +342,13 @@ - - $(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_LINK1@ - - $(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_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@ - 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_LINK1@ - - CREATE_INSTALLED_LINKS_GL: preinstall_gl - $(RM) $(libdir)/@WX_LIBRARY_LINK1_GL@ -- $(RM) $(libdir)/@WX_LIBRARY_LINK2_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_LINK1_GL@ - - afminstall: preinstall - $(INSTALL) -d $(datadir) -@@ -404,7 +396,7 @@ - - # 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/@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_DATA) $(top_builddir)/lib/wx/include/@TOOLCHAIN_NAME@/wx/setup.h $(prefix)/include/wx/setup.h - - $(INSTALL) -d $(includedir)/wx - @# 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@ - @echo " Removing GL library..." - @$(RM) $(libdir)/@WX_TARGET_LIBRARY_GL@ - @$(RM) $(libdir)/@WX_LIBRARY_LINK1_GL@ -- @$(RM) $(libdir)/@WX_LIBRARY_LINK2_GL@ - @echo " Removing helper files..." - @$(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 deleted file mode 100644 index 9f94e418fd5b..000000000000 --- a/x11-toolkits/wxgtk24/files/patch-configure +++ /dev/null @@ -1,80 +0,0 @@ - -$FreeBSD$ - ---- 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: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 - else - ac_save_LIBS="$LIBS" --LIBS="-lgdk $LIBS" -+LIBS="-lgdk12 $LIBS" - cat > conftest.$ac_ext <<EOF - #line 8006 "configure" - #include "confdefs.h" -@@ -9395,13 +9395,11 @@ - WX_LIBRARY_NAME_STATIC="lib${WX_LIBRARY}.a" - WX_LIBRARY_NAME_STATIC_GL="lib${WX_LIBRARY_GL}.a" - --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" - --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" - - - -@@ -12796,24 +12802,6 @@ - fi - - --CXXFLAGS=`echo "${CXXFLAGS}" | sed "s/\-O.//g" ` --CFLAGS=`echo "${CFLAGS}" | sed "s/\-O.//g" ` --if test "$wxUSE_OPTIMISE" = "no" ; then -- OPTIMISE= --else -- if test "$GCC" = yes ; then -- OPTIMISE="-O2" -- case "${host}" in -- i586-*-*|i686-*-* ) -- OPTIMISE="${OPTIMISE} " -- ;; -- esac -- else -- OPTIMISE="-O" -- fi --fi -- -- - if test "$wxUSE_GUI" = "yes"; then - cat >> confdefs.h <<\EOF - #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%@PROGRAM_EXT@%$PROGRAM_EXT%g - s%@WX_LIBRARY_NAME_STATIC_GL@%$WX_LIBRARY_NAME_STATIC_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_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 deleted file mode 100644 index 94cee68182cb..000000000000 --- a/x11-toolkits/wxgtk24/files/patch-include::wx::gtk::menu.h +++ /dev/null @@ -1,15 +0,0 @@ - -$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::parser.y b/x11-toolkits/wxgtk24/files/patch-src::common::parser.y deleted file mode 100644 index 6aa71425b018..000000000000 --- a/x11-toolkits/wxgtk24/files/patch-src::common::parser.y +++ /dev/null @@ -1,10 +0,0 @@ ---- src/common/parser.y.orig Fri Jan 4 07:47:57 2002 -+++ src/common/parser.y Sat Dec 14 14:49:19 2002 -@@ -98,6 +98,7 @@ - free($1); } - | arg1 - {$$ = $1; } -+ ; - - arg1 : WORD - {$$ = wxmake_word($1); free($1);} diff --git a/x11-toolkits/wxgtk24/files/patch-src::common::strconv.cpp b/x11-toolkits/wxgtk24/files/patch-src::common::strconv.cpp deleted file mode 100644 index 67d30a0f4980..000000000000 --- a/x11-toolkits/wxgtk24/files/patch-src::common::strconv.cpp +++ /dev/null @@ -1,14 +0,0 @@ - -$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 deleted file mode 100644 index 7a36184a90b8..000000000000 --- a/x11-toolkits/wxgtk24/files/patch-wx-config.in +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- 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="-I@libdir@/wx/include/@TOOLCHAIN_NAME@ $includes" -+ includes="-I@prefix@/include/@TOOLCHAIN_NAME@ $includes" - echo $includes @WXDEBUG_DEFINE@ @TOOLCHAIN_DEFS@ @WXCONFIG_INCLUDE@ - } - |