diff options
Diffstat (limited to 'x11-toolkits/wxgtk26/files')
19 files changed, 342 insertions, 0 deletions
diff --git a/x11-toolkits/wxgtk26/files/patch-Makefile.in b/x11-toolkits/wxgtk26/files/patch-Makefile.in new file mode 100644 index 000000000..0ba321f48 --- /dev/null +++ b/x11-toolkits/wxgtk26/files/patch-Makefile.in @@ -0,0 +1,56 @@ +--- Makefile.in.orig Wed Mar 22 05:42:05 2006 ++++ Makefile.in Tue Jan 9 00:08:38 2007 +@@ -24,6 +24,7 @@ + SONAME_FLAG = @SONAME_FLAG@ + STRIP = @STRIP@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ ++INSTALL_SCRIPT = @INSTALL_SCRIPT@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_DIR = @INSTALL_DIR@ + srcdir = @srcdir@ +@@ -9387,18 +9388,15 @@ + + all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxodbc___depname) $(__wxexpat___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___depname) $(__cocoa_res___depname) + +-install: all $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxodbc___depname) $(__install_wxexpat___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_odbcdll___depname) $(__install_odbclib___depname) $(__install_dbgriddll___depname) $(__install_dbgridlib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install $(__cocoa_res_install___depname) ++install: all $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxodbc___depname) $(__install_wxexpat___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_odbcdll___depname) $(__install_odbclib___depname) $(__install_dbgriddll___depname) $(__install_dbgridlib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) install-wxconfig $(__cocoa_res_install___depname) ++ $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)/$(TOOLCHAIN_FULLNAME)/wx ++ (cd ./ ; $(INSTALL_DATA) lib/wx/include/$(TOOLCHAIN_FULLNAME)/wx/setup.h $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)/$(TOOLCHAIN_FULLNAME)/wx) ++ ++install-common: locale_install + $(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal +- (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal) ++ (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal/wxwin$(WX_RELEASE_NODOT).m4) + $(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets +- (cd $(srcdir)/build/bakefiles/wxpresets/presets/ ; $(INSTALL_DATA) wx.bkl wx_unix.bkl wx_win32.bkl $(DESTDIR)$(datadir)/bakefile/presets) +- $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx +- for f in setup.h $(RCDEFS_H); do \ +- if test ! -d $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx/`dirname $$f` ; then \ +- $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx/`dirname $$f`; \ +- fi; \ +- $(INSTALL_DATA) ./lib/wx/include/$(TOOLCHAIN_FULLNAME)/wx//$$f $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx/$$f; \ +- done ++ (cd $(srcdir)/build/bakefiles/wxpresets/presets/ ; for i in wx.bkl wx_unix.bkl wx_win32.bkl; do $(INSTALL_DATA) $$i $(DESTDIR)$(datadir)/bakefile/presets/wx$(WX_RELEASE_NODOT)$${i##wx}; done) + $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR) + for f in $(ALL_HEADERS); do \ + if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \ +@@ -9931,9 +9929,7 @@ + + install-wxconfig: + $(INSTALL_DIR) $(DESTDIR)$(bindir) +- $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config +- $(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config +- (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config) ++ $(INSTALL_SCRIPT) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(bindir)/wx$(TOOLCHAIN_NAME)-config + + locale_install: + $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale +@@ -9941,7 +9937,7 @@ + $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \ + $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \ + if test -f $(srcdir)/locale/$$l.mo ; then \ +- $(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd.mo ; \ ++ $(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd$(WX_RELEASE_NODOT).mo ; \ + fi ; \ + done + diff --git a/x11-toolkits/wxgtk26/files/patch-configure b/x11-toolkits/wxgtk26/files/patch-configure new file mode 100644 index 000000000..b3cf594f3 --- /dev/null +++ b/x11-toolkits/wxgtk26/files/patch-configure @@ -0,0 +1,58 @@ +--- configure.orig Thu Jun 2 23:03:05 2005 ++++ configure Wed Aug 31 23:48:02 2005 +@@ -23409,6 +23409,7 @@ + + + SEARCH_INCLUDE="\ ++ $X11BASE/include \ + /usr/local/include \ + \ + /usr/Motif-2.1/include \ +@@ -34396,7 +34396,7 @@ + fi + ;; + *-*-freebsd*) +- THREAD_OPTS="-kthread lthread $THREAD_OPTS c_r" ++ THREAD_OPTS="$PTHREAD_LIBS" + ;; + *-*-darwin* | *-*-cygwin* ) + THREAD_OPTS="" +@@ -34433,6 +34433,12 @@ + echo $ECHO_N "checking whether pthreads work without any flags... $ECHO_C" >&6 + ;; + ++ -pthread|-l*) ++ echo "$as_me:$LINENO: checking for the pthreads library $flag" >&5 ++echo $ECHO_N "checking for the pthreads library $flag... $ECHO_C" >&6 ++ THREADS_LINK="$flag" ++ ;; ++ + -*) + echo "$as_me:$LINENO: checking whether pthreads work with $flag" >&5 + echo $ECHO_N "checking whether pthreads work with $flag... $ECHO_C" >&6 +@@ -34515,7 +34521,7 @@ + { echo "$as_me:$LINENO: WARNING: No thread support on this system... disabled" >&5 + echo "$as_me: WARNING: No thread support on this system... disabled" >&2;} + else +- LDFLAGS="$THREADS_CFLAGS $LDFLAGS" ++ LDFLAGS="$THREADS_CFLAGS $THREADS_LINK $LDFLAGS" + LIBS="$THREADS_LINK $LIBS" + + echo "$as_me:$LINENO: checking if more special flags are required for pthreads" >&5 +@@ -35701,6 +35707,7 @@ + fi + fi + fi ++TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} ${PTHREAD_CFLAGS}" + + if test "$WXGTK20" = 1 ; then + cat >>confdefs.h <<_ACEOF +@@ -35823,7 +35830,7 @@ + OPTIMISE="-O" + fi + fi +- ++OPTIMISE= + + if test "x$WXWIN_COMPATIBILITY_2_2" = "xyes"; then + cat >>confdefs.h <<\_ACEOF diff --git a/x11-toolkits/wxgtk26/files/patch-contrib-Makefile.in b/x11-toolkits/wxgtk26/files/patch-contrib-Makefile.in new file mode 100644 index 000000000..20b4b5800 --- /dev/null +++ b/x11-toolkits/wxgtk26/files/patch-contrib-Makefile.in @@ -0,0 +1,9 @@ +--- contrib/Makefile.in.orig Sun Jun 27 21:46:24 2004 ++++ contrib/Makefile.in Sun Jun 27 21:46:44 2004 +@@ -16,3 +16,6 @@ + + install: + cd src; $(MAKE) install ++ ++install-common: ++ cd src; $(MAKE) install-common diff --git a/x11-toolkits/wxgtk26/files/patch-contrib-src-Makefile.in b/x11-toolkits/wxgtk26/files/patch-contrib-src-Makefile.in new file mode 100644 index 000000000..5c4a4bba7 --- /dev/null +++ b/x11-toolkits/wxgtk26/files/patch-contrib-src-Makefile.in @@ -0,0 +1,29 @@ +--- contrib/src/Makefile.in.orig Sun Oct 10 22:18:48 2004 ++++ contrib/src/Makefile.in Fri Nov 26 00:20:35 2004 +@@ -1,15 +1,24 @@ + # $Id: patch-contrib-src-Makefile.in,v 1.5 2009-09-18 13:28:24 kwm Exp $ + +-CONTRIB_SUBDIRS=fl gizmos mmedia ogl plot stc svg deprecated animate #applet ++CONTRIB_SUBDIRS=fl gizmos ogl plot stc svg deprecated animate #applet mmedia + +-all: ++WX_RELEASE= @WX_RELEASE@ ++@COND_UNICODE_1@wxregexu_depname= wxregexu ++ ++all: $(wxregexu_depname) + @for d in $(CONTRIB_SUBDIRS); do (cd $$d && $(MAKE)); done + ++wxregexu: ++ @cd ../.. && $(MAKE) lib/libwxregexu-$(WX_RELEASE).a ++ + clean: + @for d in $(CONTRIB_SUBDIRS); do (cd $$d && $(MAKE) clean); done + + install: + @for d in $(CONTRIB_SUBDIRS); do (cd $$d && $(MAKE) install); done ++ ++install-common: ++ @for d in $(CONTRIB_SUBDIRS); do (cd $$d && $(MAKE) install-common); done + + uninstall: + @for d in $(CONTRIB_SUBDIRS); do (cd $$d && $(MAKE) uninstall); done diff --git a/x11-toolkits/wxgtk26/files/patch-contrib-src-animate-Makefile.in b/x11-toolkits/wxgtk26/files/patch-contrib-src-animate-Makefile.in new file mode 100644 index 000000000..abfc81a61 --- /dev/null +++ b/x11-toolkits/wxgtk26/files/patch-contrib-src-animate-Makefile.in @@ -0,0 +1,11 @@ +--- contrib/src/animate/Makefile.in.orig Sun Oct 10 22:18:48 2004 ++++ contrib/src/animate/Makefile.in Wed Nov 24 21:37:14 2004 +@@ -180,6 +180,8 @@ + all: $(__animatedll___depname) $(__animatelib___depname) + + install: all $(__install_animatedll___depname) $(__install_animatelib___depname) ++ ++install-common: + $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR) + for f in wx/animate/animate.h; do \ + if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \ diff --git a/x11-toolkits/wxgtk26/files/patch-contrib-src-deprecated-Makefile.in b/x11-toolkits/wxgtk26/files/patch-contrib-src-deprecated-Makefile.in new file mode 100644 index 000000000..0c492341c --- /dev/null +++ b/x11-toolkits/wxgtk26/files/patch-contrib-src-deprecated-Makefile.in @@ -0,0 +1,11 @@ +--- contrib/src/deprecated/Makefile.in.orig Sun Oct 10 22:18:54 2004 ++++ contrib/src/deprecated/Makefile.in Wed Nov 24 21:39:56 2004 +@@ -207,6 +207,8 @@ + all: $(__deprecateddll___depname) $(__deprecatedlib___depname) + + install: all $(__install_deprecateddll___depname) $(__install_deprecatedlib___depname) ++ ++install-common: + $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR) + for f in wx/deprecated/expr.h wx/deprecated/prop.h wx/deprecated/propform.h wx/deprecated/proplist.h wx/deprecated/resource.h wx/deprecated/setup.h wx/deprecated/tbarsmpl.h wx/deprecated/treelay.h wx/deprecated/wxexpr.h; do \ + if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \ diff --git a/x11-toolkits/wxgtk26/files/patch-contrib-src-fl-Makefile.in b/x11-toolkits/wxgtk26/files/patch-contrib-src-fl-Makefile.in new file mode 100644 index 000000000..2de711cc3 --- /dev/null +++ b/x11-toolkits/wxgtk26/files/patch-contrib-src-fl-Makefile.in @@ -0,0 +1,11 @@ +--- contrib/src/fl/Makefile.in.orig Sun Oct 10 22:18:49 2004 ++++ contrib/src/fl/Makefile.in Wed Nov 24 21:40:16 2004 +@@ -211,6 +211,8 @@ + all: $(__fldll___depname) $(__fllib___depname) + + install: all $(__install_fldll___depname) $(__install_fllib___depname) ++ ++install-common: + $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR) + for f in wx/fl/antiflickpl.h wx/fl/bardragpl.h wx/fl/barhintspl.h wx/fl/cbcustom.h wx/fl/controlbar.h wx/fl/dynbarhnd.h wx/fl/dyntbar.h wx/fl/dyntbarhnd.h wx/fl/fldefs.h wx/fl/frmview.h wx/fl/garbagec.h wx/fl/gcupdatesmgr.h wx/fl/hintanimpl.h wx/fl/newbmpbtn.h wx/fl/panedrawpl.h wx/fl/rowdragpl.h wx/fl/rowlayoutpl.h wx/fl/toolwnd.h wx/fl/updatesmgr.h; do \ + if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \ diff --git a/x11-toolkits/wxgtk26/files/patch-contrib-src-gizmos-Makefile.in b/x11-toolkits/wxgtk26/files/patch-contrib-src-gizmos-Makefile.in new file mode 100644 index 000000000..51b5ab5ee --- /dev/null +++ b/x11-toolkits/wxgtk26/files/patch-contrib-src-gizmos-Makefile.in @@ -0,0 +1,11 @@ +--- contrib/src/gizmos/Makefile.in.orig Thu Apr 21 00:33:08 2005 ++++ contrib/src/gizmos/Makefile.in Thu May 5 16:22:48 2005 +@@ -277,6 +277,8 @@ + all: $(__gizmosdll___depname) $(__gizmos_xrcdll___depname) $(__gizmoslib___depname) $(__gizmos_xrclib___depname) + + install: all $(__install_gizmosdll___depname) $(__install_gizmos_xrcdll___depname) $(__install_gizmoslib___depname) $(__install_gizmos_xrclib___depname) ++ ++install-common: + $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR) + for f in wx/gizmos/dynamicsash.h wx/gizmos/editlbox.h wx/gizmos/ledctrl.h wx/gizmos/multicell.h wx/gizmos/splittree.h wx/gizmos/statpict.h wx/gizmos/gizmos.h wx/gizmos/xh_statpict.h; do \ + if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \ diff --git a/x11-toolkits/wxgtk26/files/patch-contrib-src-ogl-Makefile.in b/x11-toolkits/wxgtk26/files/patch-contrib-src-ogl-Makefile.in new file mode 100644 index 000000000..2be3bdbe7 --- /dev/null +++ b/x11-toolkits/wxgtk26/files/patch-contrib-src-ogl-Makefile.in @@ -0,0 +1,11 @@ +--- contrib/src/ogl/Makefile.in.orig Sun Oct 10 22:18:52 2004 ++++ contrib/src/ogl/Makefile.in Wed Nov 24 21:41:00 2004 +@@ -201,6 +201,8 @@ + all: $(__ogldll___depname) $(__ogllib___depname) + + install: all $(__install_ogldll___depname) $(__install_ogllib___depname) ++ ++install-common: + $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR) + for f in wx/ogl/basic.h wx/ogl/basicp.h wx/ogl/bmpshape.h wx/ogl/canvas.h wx/ogl/composit.h wx/ogl/constrnt.h wx/ogl/divided.h wx/ogl/drawn.h wx/ogl/drawnp.h wx/ogl/lines.h wx/ogl/linesp.h wx/ogl/mfutils.h wx/ogl/misc.h wx/ogl/ogldiag.h wx/ogl/ogl.h; do \ + if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \ diff --git a/x11-toolkits/wxgtk26/files/patch-contrib-src-plot-Makefile.in b/x11-toolkits/wxgtk26/files/patch-contrib-src-plot-Makefile.in new file mode 100644 index 000000000..802b4f093 --- /dev/null +++ b/x11-toolkits/wxgtk26/files/patch-contrib-src-plot-Makefile.in @@ -0,0 +1,11 @@ +--- contrib/src/plot/Makefile.in.orig Sun Oct 10 22:18:52 2004 ++++ contrib/src/plot/Makefile.in Wed Nov 24 21:41:16 2004 +@@ -179,6 +179,8 @@ + all: $(__plotdll___depname) $(__plotlib___depname) + + install: all $(__install_plotdll___depname) $(__install_plotlib___depname) ++ ++install-common: + $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR) + for f in wx/plot/plot.h wx/plot/plot_dwn.bmp wx/plot/plot_enl.bmp wx/plot/plot_shr.bmp wx/plot/plot_up.bmp wx/plot/plot_zin.bmp wx/plot/plot_zot.bmp wx/plot/wxplot.rc; do \ + if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \ diff --git a/x11-toolkits/wxgtk26/files/patch-contrib-src-stc-Makefile.in b/x11-toolkits/wxgtk26/files/patch-contrib-src-stc-Makefile.in new file mode 100644 index 000000000..c41d5cbfe --- /dev/null +++ b/x11-toolkits/wxgtk26/files/patch-contrib-src-stc-Makefile.in @@ -0,0 +1,11 @@ +--- contrib/src/stc/Makefile.in.orig Sun Oct 10 22:18:53 2004 ++++ contrib/src/stc/Makefile.in Wed Nov 24 21:41:31 2004 +@@ -310,6 +310,8 @@ + all: $(__stcdll___depname) $(__stclib___depname) + + install: all $(__install_stcdll___depname) $(__install_stclib___depname) ++ ++install-common: + $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR) + for f in wx/stc/stc.h; do \ + if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \ diff --git a/x11-toolkits/wxgtk26/files/patch-contrib-src-svg-Makefile.in b/x11-toolkits/wxgtk26/files/patch-contrib-src-svg-Makefile.in new file mode 100644 index 000000000..213aef13d --- /dev/null +++ b/x11-toolkits/wxgtk26/files/patch-contrib-src-svg-Makefile.in @@ -0,0 +1,11 @@ +--- contrib/src/svg/Makefile.in.orig Sun Oct 10 22:18:54 2004 ++++ contrib/src/svg/Makefile.in Wed Nov 24 21:41:44 2004 +@@ -179,6 +179,8 @@ + all: $(__svgdll___depname) $(__svglib___depname) + + install: all $(__install_svgdll___depname) $(__install_svglib___depname) ++ ++install-common: + $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR) + for f in wx/svg/dcsvg.h; do \ + if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \ diff --git a/x11-toolkits/wxgtk26/files/patch-contrib-utils-Makefile.in b/x11-toolkits/wxgtk26/files/patch-contrib-utils-Makefile.in new file mode 100644 index 000000000..acbcfacb0 --- /dev/null +++ b/x11-toolkits/wxgtk26/files/patch-contrib-utils-Makefile.in @@ -0,0 +1,12 @@ +--- contrib/utils/Makefile.in.orig Mon Jun 28 03:47:07 2004 ++++ contrib/utils/Makefile.in Mon Jun 28 03:47:23 2004 +@@ -5,6 +5,9 @@ + all: + @for d in $(CONTRIB_UTILS); do (cd $$d && $(MAKE)); done + ++install: ++ @for d in $(CONTRIB_UTILS); do (cd $$d && $(MAKE) install); done ++ + clean: + @for d in $(CONTRIB_UTILS); do (cd $$d && $(MAKE) clean); done + diff --git a/x11-toolkits/wxgtk26/files/patch-src-common-intl.cpp b/x11-toolkits/wxgtk26/files/patch-src-common-intl.cpp new file mode 100644 index 000000000..7d964d682 --- /dev/null +++ b/x11-toolkits/wxgtk26/files/patch-src-common-intl.cpp @@ -0,0 +1,20 @@ +--- src/common/intl.cpp.orig Wed Mar 22 05:42:10 2006 ++++ src/common/intl.cpp Tue Jan 9 00:27:17 2007 +@@ -1452,6 +1452,8 @@ + m_initialized = false; + } + ++#define wxSTRINGIZE2(x) wxSTRINGIZE(x) ++ + // NB: this function has (desired) side effect of changing current locale + bool wxLocale::Init(const wxChar *szName, + const wxChar *szShort, +@@ -1520,7 +1522,7 @@ + bool bOk = true; + if ( bLoadDefault ) + { +- bOk = AddCatalog(wxT("wxstd")); ++ bOk = AddCatalog(wxT("wxstd" wxSTRINGIZE2(wxMAJOR_VERSION) wxSTRINGIZE2(wxMINOR_VERSION))); + + // there may be a catalog with toolkit specific overrides, it is not + // an error if this does not exist diff --git a/x11-toolkits/wxgtk26/files/patch-src-gtk-button.cpp b/x11-toolkits/wxgtk26/files/patch-src-gtk-button.cpp new file mode 100644 index 000000000..0f06c4088 --- /dev/null +++ b/x11-toolkits/wxgtk26/files/patch-src-gtk-button.cpp @@ -0,0 +1,11 @@ +--- src/gtk/button.cpp.orig 2006-03-22 00:42:16.000000000 +0100 ++++ src/gtk/button.cpp 2007-11-22 14:00:47.000000000 +0100 +@@ -89,7 +89,7 @@ + right_border += default_border->right; + top_border += default_border->top; + bottom_border += default_border->bottom; +- g_free( default_border ); ++ gtk_border_free( default_border ); + } + #else + left_border = 6; diff --git a/x11-toolkits/wxgtk26/files/patch-src-gtk-gsockgtk.cpp b/x11-toolkits/wxgtk26/files/patch-src-gtk-gsockgtk.cpp new file mode 100644 index 000000000..113f73e51 --- /dev/null +++ b/x11-toolkits/wxgtk26/files/patch-src-gtk-gsockgtk.cpp @@ -0,0 +1,16 @@ +--- src/gtk//gsockgtk.cpp.orig 2007-03-20 16:50:07.000000000 +0100 ++++ src/gtk/gsockgtk.cpp 2009-09-18 14:46:47.000000000 +0200 +@@ -14,8 +14,13 @@ + #include <stdlib.h> + #include <stdio.h> + ++// newer versions of glib define its own GSocket but we unfortunately use this ++// name in our own (semi-)public header and so can't change it -- rename glib ++// one instead ++#define GSocket GlibGSocket + #include <gdk/gdk.h> + #include <glib.h> ++#undef GSocket + + #include "wx/gsocket.h" + #include "wx/unix/gsockunx.h" diff --git a/x11-toolkits/wxgtk26/files/patch-src-gtk-window.cpp b/x11-toolkits/wxgtk26/files/patch-src-gtk-window.cpp new file mode 100644 index 000000000..663168de4 --- /dev/null +++ b/x11-toolkits/wxgtk26/files/patch-src-gtk-window.cpp @@ -0,0 +1,11 @@ +--- src/gtk/window.cpp.orig 2006-03-22 00:42:17.000000000 +0100 ++++ src/gtk/window.cpp 2007-11-22 14:01:22.000000000 +0100 +@@ -3279,7 +3279,7 @@ + right_border += default_border->right; + top_border += default_border->top; + bottom_border += default_border->bottom; +- g_free( default_border ); ++ gtk_border_free( default_border ); + } + #else + left_border = 6; diff --git a/x11-toolkits/wxgtk26/files/patch-utils-wxrc-Makefile.in b/x11-toolkits/wxgtk26/files/patch-utils-wxrc-Makefile.in new file mode 100644 index 000000000..353821f40 --- /dev/null +++ b/x11-toolkits/wxgtk26/files/patch-utils-wxrc-Makefile.in @@ -0,0 +1,21 @@ +--- utils/wxrc/Makefile.in.orig Thu Nov 25 21:52:45 2004 ++++ utils/wxrc/Makefile.in Thu Nov 25 21:58:43 2004 +@@ -28,6 +28,7 @@ + TOOLKIT = @TOOLKIT@ + TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ + TOOLKIT_VERSION = @TOOLKIT_VERSION@ ++TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ + EXTRALIBS = @EXTRALIBS@ + EXTRALIBS_XML = @EXTRALIBS_XML@ + HOST_SUFFIX = @HOST_SUFFIX@ +@@ -113,9 +114,7 @@ + + @COND_USE_XRC_1@install_wxrc: + @COND_USE_XRC_1@ $(INSTALL_DIR) $(DESTDIR)$(bindir) +-@COND_USE_XRC_1@ $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir) +-@COND_USE_XRC_1@ mv -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE) +-@COND_USE_XRC_1@ (cd $(DESTDIR)$(bindir) && $(LN_S) wxrc-$(WX_RELEASE) wxrc$(EXEEXT)) ++@COND_USE_XRC_1@ $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(TOOLCHAIN_NAME) + + wxrc_wxrc.o: $(srcdir)/wxrc.cpp + $(CXXC) -c -o $@ $(WXRC_CXXFLAGS) $< diff --git a/x11-toolkits/wxgtk26/files/patch-wx-config.in b/x11-toolkits/wxgtk26/files/patch-wx-config.in new file mode 100644 index 000000000..91a9738d8 --- /dev/null +++ b/x11-toolkits/wxgtk26/files/patch-wx-config.in @@ -0,0 +1,11 @@ +--- wx-config.in.orig 2007-03-20 21:49:55.000000000 +0600 ++++ wx-config.in 2009-03-15 14:05:53.000000000 +0600 +@@ -1129,7 +1129,7 @@ + _include_cppflags="-I${includedir} -I${prefix}/contrib/include" + fi + +-_cppflags=`echo "-I${libdir}/wx/include/@TOOLCHAIN_FULLNAME@" $_include_cppflags "@WXDEBUG_DEFINE@" "@TOOLCHAIN_DEFS@" "@TOOLCHAIN_DLL_DEFS@" $_gui_cppflags "@WXCONFIG_INCLUDE@" "@WX_LARGEFILE_FLAGS@" "@GCC_PRAGMA_FLAGS@"` ++_cppflags=`echo "-I${includedir}/wx-@WX_RELEASE@/@TOOLCHAIN_FULLNAME@" $_include_cppflags "@WXDEBUG_DEFINE@" "@TOOLCHAIN_DEFS@" "@TOOLCHAIN_DLL_DEFS@" $_gui_cppflags "@WXCONFIG_INCLUDE@" "@WX_LARGEFILE_FLAGS@" "@GCC_PRAGMA_FLAGS@"` + + # now without further ado, we can answer these too. + [ -z "$output_option_cppflags" ] || echo $_cppflags |