diff options
| author | nectar <nectar@FreeBSD.org> | 2000-05-20 21:35:35 +0800 |
|---|---|---|
| committer | nectar <nectar@FreeBSD.org> | 2000-05-20 21:35:35 +0800 |
| commit | 1c05bb5b01200fe3f1c7a4a0baf4224c2770b758 (patch) | |
| tree | 98c1a1bef39e5a48ea3734a9e8be1eadf9129d97 /x11-toolkits/wxgtk/files | |
| parent | f5a944bb1c8b06bb187bde173c19c03b4b0a2de4 (diff) | |
| download | freebsd-ports-graphics-1c05bb5b01200fe3f1c7a4a0baf4224c2770b758.tar.gz freebsd-ports-graphics-1c05bb5b01200fe3f1c7a4a0baf4224c2770b758.tar.zst freebsd-ports-graphics-1c05bb5b01200fe3f1c7a4a0baf4224c2770b758.zip | |
Update 2.1.11 -> 2.1.15
Diffstat (limited to 'x11-toolkits/wxgtk/files')
| -rw-r--r-- | x11-toolkits/wxgtk/files/patch-aa | 55 | ||||
| -rw-r--r-- | x11-toolkits/wxgtk/files/patch-ac | 61 |
2 files changed, 60 insertions, 56 deletions
diff --git a/x11-toolkits/wxgtk/files/patch-aa b/x11-toolkits/wxgtk/files/patch-aa index d83cf989169..fb3c109b989 100644 --- a/x11-toolkits/wxgtk/files/patch-aa +++ b/x11-toolkits/wxgtk/files/patch-aa @@ -1,51 +1,27 @@ ---- configure.in.orig Tue Nov 9 10:48:20 1999 -+++ configure.in Mon Jan 17 09:13:20 2000 -@@ -22,17 +22,17 @@ - if test x$gtk_config_exec_prefix != x ; then - gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix" - if test x${GTK_CONFIG+set} != xset ; then -- GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config -+ GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk12-config - fi - fi - if test x$gtk_config_prefix != x ; then - gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix" - if test x${GTK_CONFIG+set} != xset ; then -- GTK_CONFIG=$gtk_config_prefix/bin/gtk-config -+ GTK_CONFIG=$gtk_config_prefix/bin/gtk12-config - fi - fi - -- AC_PATH_PROG(GTK_CONFIG, gtk-config, no) -+ AC_PATH_PROG(GTK_CONFIG, gtk12-config, no) - min_gtk_version=ifelse([$1], ,0.99.7,$1) - AC_MSG_CHECKING(for GTK - version >= $min_gtk_version) - no_gtk="" -@@ -1501,7 +1501,7 @@ - if test "$wxUSE_GTK" = 1; then - dnl avoid calling AM_PATH_GTK twice, so check first for the newer version and - dnl only then, if it wasn't found, for an older one -- AM_PATH_GTK(1.2.1, WXGTK12=1, AC_MSG_ERROR(Is gtk-config in path and GTK+ is version 1.2.1 or above?)) -+ AM_PATH_GTK(1.2.1, WXGTK12=1, AC_MSG_ERROR(Is gtk12-config in path and GTK+ is version 1.2.1 or above?)) - - TOOLKIT_INCLUDE="$GTK_CFLAGS" - GUI_TK_LIBRARY="$GTK_LIBS" -@@ -1701,12 +1701,10 @@ - WX_LIBRARY_NAME_STATIC="lib${WX_LIBRARY}.a" +--- configure.in.orig Sun Apr 23 07:59:54 2000 ++++ configure.in Sun Apr 23 08:04:06 2000 +@@ -1974,16 +1974,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.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" ++WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY}_gl.so" dnl shared library settings SHARED_LD= -@@ -2964,8 +2962,6 @@ +@@ -3645,8 +3641,6 @@ AC_SUBST(WX_LIBRARY) AC_SUBST(WX_TARGET_LIBRARY) AC_SUBST(WX_LIBRARY_LINK1) @@ -53,4 +29,13 @@ -AC_SUBST(WX_LIBRARY_LINK3) AC_SUBST(PROGRAM_EXT) + dnl global gl options +@@ -3656,8 +3650,6 @@ + AC_SUBST(WX_LIBRARY_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/wxgtk/files/patch-ac b/x11-toolkits/wxgtk/files/patch-ac index 6af51255b4b..ae25a9c7982 100644 --- a/x11-toolkits/wxgtk/files/patch-ac +++ b/x11-toolkits/wxgtk/files/patch-ac @@ -1,41 +1,60 @@ ---- Makefile.in.orig Fri Jan 14 09:27:03 2000 -+++ Makefile.in Fri Jan 14 09:27:48 2000 -@@ -2050,19 +2050,11 @@ +--- Makefile.in.orig Wed Mar 22 13:12:38 2000 ++++ Makefile.in Sun Apr 23 08:08:08 2000 +@@ -311,39 +311,23 @@ CREATE_LINKS: @WX_LIBRARY_NAME_SHARED@ @$(RM) ./lib/@WX_LIBRARY_LINK1@ - @$(RM) ./lib/@WX_LIBRARY_LINK2@ - @$(RM) ./lib/@WX_LIBRARY_LINK3@ - $(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK1@ -- $(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK2@ -- $(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK3@ + cd lib \ +- && $(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_LINK1@ - CREATE_INSTALLED_LINKS: $(libdir)/@WX_LIBRARY_NAME_SHARED@ + 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 \ +- && $(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_LINK1_GL@ + + CREATE_INSTALLED_LINKS: preinstall $(RM) $(libdir)/@WX_LIBRARY_LINK1@ - $(RM) $(libdir)/@WX_LIBRARY_LINK2@ - $(RM) $(libdir)/@WX_LIBRARY_LINK3@ - $(LN_S) @WX_LIBRARY_NAME_SHARED@ $(libdir)/@WX_LIBRARY_LINK1@ -- $(LN_S) @WX_LIBRARY_NAME_SHARED@ $(libdir)/@WX_LIBRARY_LINK2@ -- $(LN_S) @WX_LIBRARY_NAME_SHARED@ $(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_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_LINK1_GL@ $(OBJECTS): $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h -@@ -2115,9 +2107,7 @@ - $(INSTALL_DATA) $(top_srcdir)/misc/gs_afm/*.afm $(datadir)/wx/gs_afm - - $(INSTALL) -d $(includedir)/wx -- $(INSTALL) -d $(includedir)/wx/msw - $(INSTALL) -d $(includedir)/wx/gtk -- $(INSTALL) -d $(includedir)/wx/motif - $(INSTALL) -d $(includedir)/wx/html - $(INSTALL) -d $(includedir)/wx/protocol - $(INSTALL) -d $(includedir)/wx/unix -@@ -2148,8 +2138,6 @@ +@@ -437,13 +421,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_DIR@/setup.h @$(RM) $(bindir)/wx-config |