aboutsummaryrefslogtreecommitdiff
path: root/x11-toolkits/wxgtk31/files
diff options
context:
space:
mode:
Diffstat (limited to 'x11-toolkits/wxgtk31/files')
-rw-r--r--x11-toolkits/wxgtk31/files/patch-Makefile.in42
-rw-r--r--x11-toolkits/wxgtk31/files/patch-configure54
-rw-r--r--x11-toolkits/wxgtk31/files/patch-setup.h.in20
-rw-r--r--x11-toolkits/wxgtk31/files/patch-src-common-translation.cpp11
-rw-r--r--x11-toolkits/wxgtk31/files/patch-utils-wxrc-Makefile.in23
5 files changed, 150 insertions, 0 deletions
diff --git a/x11-toolkits/wxgtk31/files/patch-Makefile.in b/x11-toolkits/wxgtk31/files/patch-Makefile.in
new file mode 100644
index 000000000000..87b8131c461e
--- /dev/null
+++ b/x11-toolkits/wxgtk31/files/patch-Makefile.in
@@ -0,0 +1,42 @@
+--- Makefile.in.orig 2013-11-11 14:10:39.000000000 +0100
++++ Makefile.in 2014-01-22 10:14:26.000000000 +0100
+@@ -25,6 +25,7 @@
+ SONAME_FLAG = @SONAME_FLAG@
+ STRIP = @STRIP@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_DIR = @INSTALL_DIR@
+ ICC_PCH_USE_SWITCH = @ICC_PCH_USE_SWITCH@
+@@ -15214,9 +15215,9 @@
+
+ install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxexpat___depname) $(__install_wxscintilla___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_htmldll___depname) $(__install_htmllib___depname) $(__install_webviewdll___depname) $(__install_webviewlib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_ribbondll___depname) $(__install_ribbonlib___depname) $(__install_propgriddll___depname) $(__install_propgridlib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_stcdll___depname) $(__install_stclib___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_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 wx_xrc.bkl wx_presets.py $(DESTDIR)$(datadir)/bakefile/presets)
++ (cd $(srcdir)/build/bakefiles/wxpresets/presets/ ; for i in wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py; do $(INSTALL_DATA) $$i $(DESTDIR)$(datadir)/bakefile/presets/wx$(WX_RELEASE_NODOT)$${i##wx}; done)
+ $(DYLIB_RPATH_INSTALL)
+ $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx
+ for f in setup.h $(RCDEFS_H); do \
+@@ -16099,9 +16100,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) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config || cp -p $(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
+@@ -16109,7 +16108,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/wxgtk31/files/patch-configure b/x11-toolkits/wxgtk31/files/patch-configure
new file mode 100644
index 000000000000..31664c2f3e1b
--- /dev/null
+++ b/x11-toolkits/wxgtk31/files/patch-configure
@@ -0,0 +1,54 @@
+--- configure.orig 2014-10-06 21:33:44 UTC
++++ configure
+@@ -3947,7 +3947,7 @@ case "${host}" in
+
+ DEFAULT_DEFAULT_wxUSE_MOTIF=1
+ ;;
+- *-*-freebsd*)
++ *-*-dragonfly*|*-*-freebsd*)
+ USE_BSD=1
+ USE_FREEBSD=1
+ $as_echo "#define __FREEBSD__ 1" >>confdefs.h
+@@ -21894,6 +21894,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+ SEARCH_INCLUDE="\
++ $X11BASE/include \
+ /usr/local/include \
+ /usr/local/X11/include \
+ /usr/local/include/X11 \
+@@ -31852,9 +31853,6 @@ $as_echo "$as_me: WARNING: BeOS threads
+ THREAD_OPTS="-pthreads $THREAD_OPTS"
+ fi
+ ;;
+- *-*-freebsd*)
+- THREAD_OPTS="-kthread lthread $THREAD_OPTS c_r"
+- ;;
+ *-*-darwin* | *-*-cygwin* )
+ THREAD_OPTS=""
+ ;;
+@@ -33127,7 +33125,7 @@ else
+ fi
+ fi
+ fi
+-
++OPTIMISE_CFLAGS=
+
+ if test "x$WXWIN_COMPATIBILITY_2_6" = "xyes"; then
+ $as_echo "#define WXWIN_COMPATIBILITY_2_6 1" >>confdefs.h
+@@ -39390,6 +39388,7 @@ EOF
+ ;;
+
+ powerpc-apple-macos* | \
++ *-*-dragonfly* | \
+ *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | *-*-gnu* | *-*-k*bsd*-gnu | \
+ *-*-mirbsd* | \
+ *-*-sunos4* | \
+@@ -39432,6 +39431,7 @@ EOF
+
+ case "${BAKEFILE_HOST}" in
+ *-*-linux* | *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | \
++ *-*-dragonfly* | \
+ *-*-k*bsd*-gnu | *-*-mirbsd* | *-*-gnu* )
+ if test "x$SUNCXX" = "xyes"; then
+ SONAME_FLAG="-h "
diff --git a/x11-toolkits/wxgtk31/files/patch-setup.h.in b/x11-toolkits/wxgtk31/files/patch-setup.h.in
new file mode 100644
index 000000000000..3571a20c807e
--- /dev/null
+++ b/x11-toolkits/wxgtk31/files/patch-setup.h.in
@@ -0,0 +1,20 @@
+--- setup.h.in.orig 2014-10-06 21:33:44 UTC
++++ setup.h.in
+@@ -757,17 +757,14 @@
+ /*
+ * Define if your compiler has std::tr1::unordered_map
+ */
+-#undef HAVE_TR1_UNORDERED_MAP
+
+ /*
+ * Define if your compiler has std::tr1::unordered_set
+ */
+-#undef HAVE_TR1_UNORDERED_SET
+
+ /*
+ * Define if your compiler has <tr1/type_traits>
+ */
+-#undef HAVE_TR1_TYPE_TRAITS
+
+ /*
+ * Define if your compiler has <type_traits>
diff --git a/x11-toolkits/wxgtk31/files/patch-src-common-translation.cpp b/x11-toolkits/wxgtk31/files/patch-src-common-translation.cpp
new file mode 100644
index 000000000000..5002755f8545
--- /dev/null
+++ b/x11-toolkits/wxgtk31/files/patch-src-common-translation.cpp
@@ -0,0 +1,11 @@
+--- src/common/translation.cpp.orig 2011-02-18 15:12:53.000000000 +0600
++++ src/common/translation.cpp 2011-02-18 15:15:10.000000000 +0600
+@@ -1302,7 +1302,7 @@
+
+ bool wxTranslations::AddStdCatalog()
+ {
+- if ( !AddCatalog(wxS("wxstd")) )
++ if ( !AddCatalog(wxS("wxstd") wxSTRINGIZE(wxMAJOR_VERSION) wxSTRINGIZE(wxMINOR_VERSION)) )
+ return false;
+
+ // there may be a catalog with toolkit specific overrides, it is not
diff --git a/x11-toolkits/wxgtk31/files/patch-utils-wxrc-Makefile.in b/x11-toolkits/wxgtk31/files/patch-utils-wxrc-Makefile.in
new file mode 100644
index 000000000000..1ae8e5792c84
--- /dev/null
+++ b/x11-toolkits/wxgtk31/files/patch-utils-wxrc-Makefile.in
@@ -0,0 +1,23 @@
+--- utils/wxrc/Makefile.in.orig Thu Nov 30 23:00:32 2006
++++ utils/wxrc/Makefile.in Thu Nov 30 23:01:25 2006
+@@ -29,6 +29,7 @@
+ TOOLKIT = @TOOLKIT@
+ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
+ TOOLKIT_VERSION = @TOOLKIT_VERSION@
++TOOLCHAIN_NAME = @TOOLCHAIN_NAME@
+ EXTRALIBS = @EXTRALIBS@
+ EXTRALIBS_XML = @EXTRALIBS_XML@
+ EXTRALIBS_GUI = @EXTRALIBS_GUI@
+@@ -114,11 +115,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@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
+-@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)$(EXEEXT)
+
+ @COND_USE_XRC_1@uninstall_wxrc:
+ @COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT)
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-19 20:21:11 +0000