diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /x11-libs/wxGTK | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'x11-libs/wxGTK')
20 files changed, 2148 insertions, 0 deletions
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest new file mode 100644 index 000000000000..3d7ec206f3b4 --- /dev/null +++ b/x11-libs/wxGTK/Manifest @@ -0,0 +1,10 @@ +DIST wxPython-docs-2.9.4.0.tar.bz2 15477636 SHA256 42a1683f253aa36ae9ee20b8d511d8704b4e45ba124fec256a7dfce38da9f75f SHA512 f996e69f24baaa8d35bf94ef77f31f6beda5dd4ddd65d6b71558e8dbe33098c951f995172b4ccd93ad08c81df07a9b529813eac5d39ffa06290f2a9ccc87620c WHIRLPOOL b6f6d65d319683f44b1eb4708077abaecd1a972a0d79fb6293b055099a0720d36e83506df6d075243f9e8b180849ae0d44badc8a22d5c764c956d5ecfe0cc6da +DIST wxPython-docs-3.0.0.0.tar.bz2 21411087 SHA256 4bb98d37ac9fc68a1cbde45efa03f06c4bd167719249d1cba15ac8a6f8e2dcb8 SHA512 30d680edeb88f5cea096cfeb4324ee554aff4bab233557c1155b81b08baea60601d6f8499f03dd603111a181003e00581686ce45a187cbf608eb003388eaf193 WHIRLPOOL 5db92780fc3815333d68a70b66032356dac5f248e9afa948b27ece6bc8bc8794ae877477bf92f0c38ea0875ec99a7db98211d820bc7226db961a0516b0de1b86 +DIST wxPython-docs-3.0.1.1.tar.bz2 21447868 SHA256 c283db35ebd7dec4f83402b9fe9bb12c99ac66923dab95277bb4843617a8d6d3 SHA512 5886341f8e238b6de94d655dbc25572edac49a2ee33f545482b8be24b008aba69eb4cbbacbecc4df74eff1e1b440e5f2618a7aeeadc7ce358f40e16133223dc5 WHIRLPOOL d73998e83882e9be43bd6f9e1e529ae4c46d35137a9d3017eba9ed72cb1d91d7f917e869027721e9e9e6323d2433815cd5b49a41405e05cc668c91ffa4f6615a +DIST wxPython-docs-3.0.2.0.tar.bz2 21455056 SHA256 9e9b32b7452f8f1885f0326c0382ec1878c68a251146b3e3997c7c3aa70caa57 SHA512 ce4407de4cdf9a3eaa5c64a8a959a0d7010d0d814a710de1ac0ed2a716ea2ee4f4ba34199e271a3e9b7790780294fcadfcd8bc65fead182d4ebe533c35c4d78e WHIRLPOOL ac0b4cd1937c31803399f2d9172158f00f99886462becfb58c3553c263bfe93d54acf5f05662227aeda4fd44610ada0680127b05e165b261104b765f25185715 +DIST wxPython-src-2.8.12.1.tar.bz2 31311482 SHA256 1f3f153d9f1504c6ce2d2c4b23e940b8f58b81f4cba35cda1a5bb31142243cd0 SHA512 4f826ccb57d5f4fc03fe7cae67499be70c727a99aebf9d153ea1060a21641642606d44d079ba897c38b176846336aeaebc21d30d5c7a0abec3934d65cf4529f3 WHIRLPOOL 94f91d359f755a0f805588303e8507b2f1404a7f4af73777f85366265df9f76ca89ac29bff491cffd752b707645952a4f7f2bb12fa7e30f3e7d3728147a9c99d +DIST wxPython-src-2.9.4.0.tar.bz2 50827671 SHA256 78c35c19e85a17cb9c730b86b49d6a479198d76d19e0b13e86db0b55707004be SHA512 100dd4474bc2508e9a80aed6f08d295e2697926e29c5789e1f6aa7c303921e1c5de2574c3eddde568804da8fc670d0214ef225d46f34a3006d0a947423d01fbf WHIRLPOOL feff68600a40a8f02492e91049ecdd1a1865ee6db8024112aa3a85a7eff616f26653c418a8ffde77121e2bf7d2c7090c5b91896f9a2de8eb980573af2ca65507 +DIST wxPython-src-2.9.4.1.patch 3768 SHA256 075e3a7b1cf69dd2bb20010717505d2508c74bc81658540f3e6d8c4fbf0a6b85 SHA512 4a5254a5bb9c246b75095e3cc0b849073e3cc71ff15ab7fb1db6ecfe71359800b9e1a5493bc39ce5b1f338cdc1d142ce84641611d458a8da4315f3c8a6aef3ba WHIRLPOOL 9bec06da4824fe56c172f4f417966681d1ffbf173dcb54f1579e9a484377bc76c45b4f2389911bbb17eff2476cfca786d68d9524856b21accc64b4dffafb1811 +DIST wxPython-src-3.0.0.0.tar.bz2 57831792 SHA256 af88695e820dd914e8375dc91ecb736f6fb605979bb38460ace61bbea494dc11 SHA512 9328f46817e0c1670a6be5d10347c8a7110c42a5332c5c35eb11ed0412d8dddeb15727d98606bb6c699af961cee171c41b82b1f24f3de25463259106660f7387 WHIRLPOOL 7865997e22db366a41bae8a5d5c47e4f46b20d17871377243abced3a6550c46588ea1d5a426d826ccf011c62898f87d6a55a14ac9b4153af4e0795d5f180a647 +DIST wxPython-src-3.0.1.1.tar.bz2 58139645 SHA256 d51463fe760e2fc00271678700c216809f9db32a6081a1808bd4b7c884dc0a32 SHA512 71f75c1e36c9ac27c15d768f69662b18ff1c66ad111ef6ef8579dfdb5296d7c37ffce9f60000afeac289cd6288980037d3a7eb3ea8d6d25e619d8692cf41b914 WHIRLPOOL bb03b78048b368b1c2f5a8b8689aecf412953ff789b2a8d2ef4826112fdc6bff8ed881255d05859ac07f915dd1070f6147d6bfdd97b0ab4b0939c024df3b855a +DIST wxPython-src-3.0.2.0.tar.bz2 58304944 SHA256 d54129e5fbea4fb8091c87b2980760b72c22a386cb3b9dd2eebc928ef5e8df61 SHA512 a3798e89ff19344253aac7d771971e519f7fa9723e82bd97e98f16fd7f1572e513170b02295b872dae0b1ae3fa95efc4ef34d078045b839694b4fdad3a27c9e4 WHIRLPOOL 89cdef12c9ef96044adba0340d47b699e685eaec581a4e7d68f3b95a0890715e29b1f5362027df0f3f8b5b1587e8fe404a7fa88049ece9677dd8316fbdf2e41d diff --git a/x11-libs/wxGTK/files/wxGTK-2.8.10.1-odbc-defines.patch b/x11-libs/wxGTK/files/wxGTK-2.8.10.1-odbc-defines.patch new file mode 100644 index 000000000000..3636b64f976a --- /dev/null +++ b/x11-libs/wxGTK/files/wxGTK-2.8.10.1-odbc-defines.patch @@ -0,0 +1,39 @@ +unixODBC 2.2.14 defines SQLLEN and SQLULEN using the compiler typedef +declaration instead of preprocessor #define macro definition. This breaks +the preprocessor checks in this include file.cpp, causing the source to fall +back to older types instead, leading to compile time errors like this: + +db.cpp:1636: error: cannot convert ‘SQLINTEGER*’ to ‘SQLLEN*’ for argument ‘6’ to +‘SQLRETURN SQLGetData(void*, SQLUSMALLINT, SQLSMALLINT, void*, SQLLEN, SQLLEN*)’ +... +dbtable.cpp:592: error: cannot convert ‘SQLUINTEGER*’ to ‘SQLULEN*’ for argument ‘4’ to +‘SQLRETURN SQLExtendedFetch(void*, SQLUSMALLINT, SQLLEN, SQLULEN*, SQLUSMALLINT*)’ +... + +This change hard-wires the new names, breaking compatibility with ancient +(pre 2001) unixODBC versions. This change may break other ODBC implementations +but in Gentoo only unixODBC is supported. + +References: +http://bugs.gentoo.org/310923 + +2010-03-23 Martin von Gagern + +--- wxPython-src-2.6.4.0.orig/include/wx/db.h ++++ wxPython-src-2.6.4.0/include/wx/db.h +@@ -134,15 +134,6 @@ enum enumDummy {enumDum1}; + #endif + #endif + +-#ifndef _WIN64 +-#ifndef SQLLEN +-#define SQLLEN SQLINTEGER +-#endif +-#ifndef SQLULEN +-#define SQLULEN SQLUINTEGER +-#endif +-#endif +- + const int wxDB_PATH_MAX = 254; + + extern WXDLLIMPEXP_DATA_ODBC(wxChar const *) SQL_LOG_FILENAME; diff --git a/x11-libs/wxGTK/files/wxGTK-2.8.11-collision.patch b/x11-libs/wxGTK/files/wxGTK-2.8.11-collision.patch new file mode 100644 index 000000000000..a5c574cb2d6a --- /dev/null +++ b/x11-libs/wxGTK/files/wxGTK-2.8.11-collision.patch @@ -0,0 +1,74 @@ +Prevent file collisions between multiple installed SLOTs. + + - Don't install wxwin.m4. It is installed with app-eselect/eselect-wxwidgets. + - Version the bakefile preset filenames. Unversioned symlinks to these files + are handled by eselect. + - Version wx-config and wxrc. Unversioned wrapper scripts are installed with + eselect-wxwidgets. + - Version wxstd.mo and modify AddCatalog to find it. (this might need more + work but no one has complained yet) + +--- a/Makefile.in ++++ b/Makefile.in +@@ -11695,10 +11695,9 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \ + 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) $(__auidll___depname) $(__auilib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___depname) $(__cocoa_res___depname) + + install: $(__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_auidll___depname) $(__install_auilib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___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) + $(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) ++ (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)$(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 \ +@@ -12455,7 +12454,8 @@ 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) ++ (cd $(DESTDIR)$(bindir) && rm -f wx-config-$(WX_RELEASE) \ ++ && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE)) + + locale_install: + $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale +@@ -12463,7 +12463,7 @@ locale_install: + $(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 + +--- a/src/common/intl.cpp ++++ b/src/common/intl.cpp +@@ -1529,6 +1529,8 @@ void wxLocale::DoCommonInit() + 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, +@@ -1597,7 +1599,7 @@ bool wxLocale::Init(const wxChar *szName, + 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 +--- a/utils/wxrc/Makefile.in ++++ b/utils/wxrc/Makefile.in +@@ -120,7 +120,6 @@ distclean: clean + @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@uninstall_wxrc: + @COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) diff --git a/x11-libs/wxGTK/files/wxGTK-2.8.11-unicode-odbc.patch b/x11-libs/wxGTK/files/wxGTK-2.8.11-unicode-odbc.patch new file mode 100644 index 000000000000..d272247091b8 --- /dev/null +++ b/x11-libs/wxGTK/files/wxGTK-2.8.11-unicode-odbc.patch @@ -0,0 +1,13 @@ +Allow odbc to be used with unicode builds. + +--- a/Makefile.in ++++ b/Makefile.in +@@ -1217,7 +1217,7 @@ ODBCDLL_CXXFLAGS = $(__odbcdll_PCH_INC) -D__WX$(TOOLKIT)__ \ + $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) \ + $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) \ +- $(__INC_EXPAT_p) -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_ODBC $(PIC_FLAG) \ ++ $(__INC_EXPAT_p) -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_ODBC -DSQL_WCHART_CONVERT $(PIC_FLAG) \ + $(CPPFLAGS) $(CXXFLAGS) + ODBCDLL_OBJECTS = \ + $(__odbcdll___win32rc) \ diff --git a/x11-libs/wxGTK/files/wxGTK-2.8.12.1-autoconf.patch b/x11-libs/wxGTK/files/wxGTK-2.8.12.1-autoconf.patch new file mode 100644 index 000000000000..2701500d7ad9 --- /dev/null +++ b/x11-libs/wxGTK/files/wxGTK-2.8.12.1-autoconf.patch @@ -0,0 +1,27 @@ +From 4164cd68d45ec4b3b46c22ed981c81f766154428 Mon Sep 17 00:00:00 2001 +From: Vadim Zeitlin <vadim@wxwidgets.org> +Date: Thu, 17 Jun 2010 22:30:27 +0000 +Subject: Backport fix from bakefile svn for autoconf 2.65. + +Use AC_REQUIRE() instead of directly using a macro, the latter doesn't work +with autoconf 2.65. + +This is a backport of r1337 from bakefile svn to allow people to use autoconf +2.65 immediately and will become unnecessary when we update to the next +bakefile version. + +git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64620 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 + +diff --git a/build/aclocal/bakefile-lang.m4 b/build/aclocal/bakefile-lang.m4 +index 4cc4a67..ec0f711 100644 +--- a/build/aclocal/bakefile-lang.m4 ++++ b/build/aclocal/bakefile-lang.m4 +@@ -240,7 +240,7 @@ dnl check for different proprietary compilers depending on target platform + dnl _AC_BAKEFILE_PROG_COMPILER(LANG) + AC_DEFUN([_AC_BAKEFILE_PROG_COMPILER], + [ +- AC_PROG_$1 ++ AC_REQUIRE([AC_PROG_$1]) + + dnl Intel compiler can be used under several different OS and even + dnl different architectures (x86, amd64 and Itanium) so it's easier to just diff --git a/x11-libs/wxGTK/files/wxGTK-2.8.12.1-bakefile.patch b/x11-libs/wxGTK/files/wxGTK-2.8.12.1-bakefile.patch new file mode 100644 index 000000000000..f497665cef8f --- /dev/null +++ b/x11-libs/wxGTK/files/wxGTK-2.8.12.1-bakefile.patch @@ -0,0 +1,25 @@ +From 006b0650b0f390c1e9a19361988b6af7a327e296 Mon Sep 17 00:00:00 2001 +From: nE0sIghT <ykonotopov@gmail.com> +Date: Wed, 5 Aug 2015 12:38:39 +0300 +Subject: [PATCH 2/2] Fixed bakefile version + +--- + build/aclocal/bakefile.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/build/aclocal/bakefile.m4 b/build/aclocal/bakefile.m4 +index 88478ca..aa04b16 100644 +--- a/build/aclocal/bakefile.m4 ++++ b/build/aclocal/bakefile.m4 +@@ -837,7 +837,7 @@ AC_DEFUN([AC_BAKEFILE], + AC_SUBST(OBJCXXFLAGS) + + +- BAKEFILE_BAKEFILE_M4_VERSION="0.2.8" ++ BAKEFILE_BAKEFILE_M4_VERSION="0.2.9" + + dnl includes autoconf_inc.m4: + $1 +-- +2.4.6 + diff --git a/x11-libs/wxGTK/files/wxGTK-2.8.12.1-libdir.patch b/x11-libs/wxGTK/files/wxGTK-2.8.12.1-libdir.patch new file mode 100644 index 000000000000..db9571438d86 --- /dev/null +++ b/x11-libs/wxGTK/files/wxGTK-2.8.12.1-libdir.patch @@ -0,0 +1,304 @@ +From e87336e8d583044d62b1a9400db4c29f1474fa50 Mon Sep 17 00:00:00 2001 +From: nE0sIghT <ykonotopov@gmail.com> +Date: Wed, 5 Aug 2015 12:37:36 +0300 +Subject: [PATCH 1/2] Backported new libraries search code + +--- + acinclude.m4 | 75 ++++++++++++++++++++++++++++++++++++++++++++--- + configure.in | 96 +++++++++++++++++++++++------------------------------------- + 2 files changed, 107 insertions(+), 64 deletions(-) + +diff --git a/acinclude.m4 b/acinclude.m4 +index a44747c..1e307c9 100644 +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -43,16 +43,17 @@ for ac_dir in $1 /usr/include; + ]) + + dnl --------------------------------------------------------------------------- +-dnl call WX_PATH_FIND_LIBRARIES(search path, lib name), sets ac_find_libraries +-dnl to the full name of the file that was found or leaves it empty if not found ++dnl call WX_PATH_FIND_LIBRARIES(lib name, [optional extra search paths]) ++dnl sets ac_find_libraries to the full name of the file that was found ++dnl or leaves it empty if not found + dnl --------------------------------------------------------------------------- + AC_DEFUN([WX_PATH_FIND_LIBRARIES], + [ + ac_find_libraries= +- for ac_dir in $1; ++ for ac_dir in $2 $SEARCH_LIB + do + for ac_extension in a so sl dylib dll.a; do +- if test -f "$ac_dir/lib$2.$ac_extension"; then ++ if test -f "$ac_dir/lib$1.$ac_extension"; then + ac_find_libraries=$ac_dir + break 2 + fi +@@ -115,6 +116,72 @@ AC_DEFUN([WX_LINK_PATH_EXIST], + fi + ]) + ++dnl --------------------------------------------------------------------------- ++dnl Usage: WX_FIND_LIB(lib-name, [lib-function to test], [extra search paths]) ++dnl ++dnl Tests in a variety of ways for the presence of lib-name ++dnl ++dnl On success, returns any novel path found in ac_find_libraries; else "std" ++dnl and any cflags in ac_find_cflags ++dnl On failure, ac_find_libraries will be empty ++dnl --------------------------------------------------------------------------- ++AC_DEFUN([WX_FIND_LIB], ++[ ++ ac_find_libraries= ++ ++ dnl Try with pkg-config first. It requires its lib-name parameter lowercase ++ fl_pkgname=`echo "$1" | tr [[:upper:]] [[:lower:]]` ++ dnl suppress PKG_PROG_PKG_CONFIG output; we don't want to keep seeing it ++ PKG_PROG_PKG_CONFIG() AS_MESSAGE_FD> /dev/null ++ PKG_CHECK_MODULES([$1], [$fl_pkgname], ++ [ ++ dnl Start by assuming there are no novel lib paths ++ ac_find_libraries="std" ++ ++ dnl A simple copy of the internal vars $1_CFLAGS $1_LIBS doesn't work ++ dnl inside the macro ++ dnl ++ dnl TODO: When we stop being autoconf 2.61 compatible, the next 2 lines ++ dnl should become: ++ dnl AS_VAR_COPY([ac_find_cflags], [$1_CFLAGS]) ++ dnl AS_VAR_COPY([fl_libs], [$1_LIBS]) ++ eval ac_find_cflags=\$$1_CFLAGS ++ eval fl_libs=\$$1_LIBS ++ ++ dnl fl_libs may now contain -Lfoopath -lfoo (only non-standard paths are ++ dnl added) We only want the path bit, not the lib names ++ for fl_path in $fl_libs ++ do ++ if test `echo "$fl_path" | cut -c 1-2` = "-L"; then ++ dnl there shouldn't be >1 novel path ++ dnl return it without the -L, ready for WX_LINK_PATH_EXIST ++ ac_find_libraries=`echo "$fl_path" | cut -c 3-` ++ fi ++ done ++ ], ++ [ ++ if test "x$ac_find_libraries" = "x"; then ++ dnl Next with AC_CHECK_LIB, if a test function was provided ++ if test "x$2" != "x"; then ++ AC_CHECK_LIB([$1], [$2], [ac_find_libraries="std"]) ++ fi ++ fi ++ ++ if test "x$ac_find_libraries" = "x"; then ++ dnl Finally try the search path ++ dnl Output a message again, as AC_CHECK_LIB will just have said "no" ++ AC_MSG_CHECKING([elsewhere]) ++ dnl $3 will occasionally hold extra path(s) to search ++ WX_PATH_FIND_LIBRARIES([$1], [$3]) ++ if test "x$ac_find_libraries" != "x"; then ++ AC_MSG_RESULT([yes]) ++ else ++ AC_MSG_RESULT([no]) ++ fi ++ fi ++ ]) ++]) ++ + dnl =========================================================================== + dnl C++ features test + dnl =========================================================================== +diff --git a/configure.in b/configure.in +index 021845d..9c78ba3 100644 +--- a/configure.in ++++ b/configure.in +@@ -2767,7 +2767,7 @@ if test "$build" != "$host" -a "$GCC" = yes; then + x_includes=$ac_find_includes + fi + if test -z "$x_libraries" -o "$x_libraries" = NONE; then +- WX_PATH_FIND_LIBRARIES($SEARCH_LIB, Xt) ++ WX_PATH_FIND_LIBRARIES(Xt) + x_libraries=$ac_find_libraries + fi + fi +@@ -3554,7 +3554,7 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config + dnl test for external libxpm if we're configured to use it + if test "$wxUSE_GPE" = "yes"; then + AC_MSG_CHECKING(for gpewidget library) +- WX_PATH_FIND_LIBRARIES($SEARCH_LIB,gpewidget) ++ WX_PATH_FIND_LIBRARIES(gpewidget) + if test "$ac_find_libraries" != "" ; then + WX_LINK_PATH_EXIST($ac_find_libraries,$GUI_TK_LIBRARY) + dnl -lgpewidget must be before all GTK libs and +@@ -3567,7 +3567,7 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config + fi + + dnl AC_MSG_CHECKING(for gpe library) +- dnl WX_PATH_FIND_LIBRARIES($SEARCH_LIB,gpe) ++ dnl WX_PATH_FIND_LIBRARIES(gpe) + dnl if test "$ac_find_libraries" != "" ; then + dnl WX_LINK_PATH_EXIST($ac_find_libraries,$GUI_TK_LIBRARY) + dnl GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lgpe" +@@ -3817,7 +3817,7 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config + + + AC_MSG_CHECKING(for Motif/Lesstif library) +- WX_PATH_FIND_LIBRARIES($SEARCH_LIB, Xm) ++ WX_PATH_FIND_LIBRARIES(Xm) + + if test "x$ac_find_libraries" != "x" ; then + AC_MSG_RESULT(found in $ac_find_libraries) +@@ -3956,7 +3956,7 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config + dnl test for external libxpm if we're configured to use it + if test "$wxUSE_LIBXPM" = "sys"; then + AC_MSG_CHECKING(for Xpm library) +- WX_PATH_FIND_LIBRARIES($SEARCH_LIB,Xpm) ++ WX_PATH_FIND_LIBRARIES(Xpm) + if test "$ac_find_libraries" != "" ; then + WX_LINK_PATH_EXIST($ac_find_libraries,$GUI_TK_LIBRARY) + GUI_TK_LIBRARY="$GUI_TK_LIBRARY$ac_path_to_link" +@@ -4192,41 +4192,23 @@ dnl --------------------------------------------------------------------------- + dnl wxDisplay Sanity checks + dnl --------------------------------------------------------------------------- + ++USE_XINERAMA=0 + if test "$wxUSE_DISPLAY" = "yes"; then + dnl --------------------------------------------------------------------------- + dnl Xinerama (for unix ) - Brian Victor + dnl --------------------------------------------------------------------------- + if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_MAC" != 1 -a "$wxUSE_COCOA" != 1; then +- AC_MSG_CHECKING([for Xinerama]) +- WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],Xinerama) ++ WX_FIND_LIB(Xinerama, XineramaQueryScreens) + if test "$ac_find_libraries" != "" ; then +- WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS]) +- if test "$ac_path_to_link" != " -L/usr/lib" ; then +- LDFLAGS="$LDFLAGS $ac_path_to_link" ++ if test "$ac_find_libraries" != "std" ; then ++ WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS]) ++ if test "$ac_path_to_link" != " -L/usr/lib" ; then ++ LDFLAGS="$LDFLAGS $ac_path_to_link" ++ fi + fi ++ USE_XINERAMA=1 + GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXinerama" +- AC_MSG_RESULT([yes]) +- +- AC_MSG_CHECKING([for Xxf86vm extension]) +- WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],Xxf86vm) +- if test "$ac_find_libraries" != "" ; then +- AC_MSG_RESULT([yes]) +- AC_CHECK_HEADERS([X11/extensions/xf86vmode.h], +- [ +- GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXxf86vm" +- ], +- [], +- [ +- #if HAVE_X11_XLIB_H +- #include <X11/Xlib.h> +- #endif +- ]) +- else +- AC_MSG_RESULT([no]) +- fi +- + else +- AC_MSG_RESULT([no]) + AC_MSG_WARN([Xinerama not found; disabling wxDisplay]) + wxUSE_DISPLAY="no" + fi +@@ -4243,17 +4225,16 @@ dnl X11 session management + dnl --------------------------------------------------------------------------- + if test "$wxUSE_DETECT_SM" = "yes"; then + if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_MAC" != 1 -a "$wxUSE_COCOA" != 1; then +- AC_MSG_CHECKING([for -lSM - X11 session management]) +- WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],SM) ++ WX_FIND_LIB(SM, SmcOpenConnection) + if test "$ac_find_libraries" != "" ; then +- WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS]) +- if test "$ac_path_to_link" != " -L/usr/lib" ; then ++ if test "$ac_find_libraries" != "std" ; then ++ WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS]) ++ if test "$ac_path_to_link" != " -L/usr/lib" ; then + LDFLAGS="$LDFLAGS $ac_path_to_link" ++ fi + fi + GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lSM" +- AC_MSG_RESULT([yes]) + else +- AC_MSG_RESULT([no]) + AC_MSG_WARN([libSM not found; disabling session management detection]) + wxUSE_DETECT_SM="no" + fi +@@ -4295,51 +4276,46 @@ if test "$wxUSE_OPENGL" = "yes"; then + AC_CHECK_HEADER(GL/glu.h, [ + found_gl=0 + +- AC_MSG_CHECKING([for -lGL]) +- WX_PATH_FIND_LIBRARIES([$SEARCH_LIB /opt/graphics/OpenGL/lib],GL) ++ WX_FIND_LIB(GL, glBegin, [/opt/graphics/OpenGL/lib]) + if test "$ac_find_libraries" != "" ; then +- AC_MSG_RESULT([found in $ac_find_libraries]) +- +- WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS]) +- if test "$ac_path_to_link" != " -L/usr/lib" ; then ++ if test "$ac_find_libraries" != "std" ; then ++ WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS]) ++ if test "$ac_path_to_link" != " -L/usr/lib" ; then + LDFLAGS_GL="$ac_path_to_link" ++ fi + fi + + dnl don't suppose that libGL and libGLU are always in the + dnl same directory -- this is not true for some common + dnl distributions +- AC_MSG_CHECKING([for -lGLU]) +- WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],GLU) ++ WX_FIND_LIB(GLU, gluBeginCurve, [/opt/graphics/OpenGL/lib]) + if test "$ac_find_libraries" != "" ; then ++ if test "$ac_find_libraries" != "std" ; then + WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS]) + if test "$ac_path_to_link" != " -L/usr/lib" -a \ +- "$ac_path_to_link" != "$LDFLAGS_GL"; then +- LDFLAGS_GL="$LDFLAGS_GL$ac_path_to_link" ++ "$ac_path_to_link" != "$LDFLAGS_GL" ; then ++ LDFLAGS_GL="$LDFLAGS_GL$ac_path_to_link" + fi ++ fi + + found_gl=1 + OPENGL_LIBS="-lGL -lGLU" +- AC_MSG_RESULT([yes]) +- else +- AC_MSG_RESULT([no]) + fi +- else +- AC_MSG_RESULT([no]) + fi + + if test "$found_gl" != 1; then +- AC_MSG_CHECKING([for -lMesaGL]) +- WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],MesaGL) ++ WX_FIND_LIB(MesaGL, glEnable, [/opt/graphics/OpenGL/lib]) + if test "$ac_find_libraries" != "" ; then ++ if test "$ac_find_libraries" != "std" ; then + WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS]) +- LDFLAGS_GL="$LDFLAGS$ac_path_to_link" +- OPENGL_LIBS="-lMesaGL -lMesaGLU" +- AC_MSG_RESULT([yes]) +- else +- AC_MSG_RESULT([no]) ++ if test "$ac_path_to_link" != " -L/usr/lib" ; then ++ LDFLAGS_GL="$LDFLAGS_GL$ac_path_to_link" ++ fi ++ fi ++ OPENGL_LIBS="-lMesaGL -lMesaGLU" + fi + fi +- ]) ++ ],, [ ]) + ], + [], + [ ]) +-- +2.4.6 + diff --git a/x11-libs/wxGTK/files/wxGTK-2.8.7-mmedia.patch b/x11-libs/wxGTK/files/wxGTK-2.8.7-mmedia.patch new file mode 100644 index 000000000000..cbe3103a0bce --- /dev/null +++ b/x11-libs/wxGTK/files/wxGTK-2.8.7-mmedia.patch @@ -0,0 +1,11 @@ +diff -Naur wxPython-src-2.8.7.1-orig/contrib/src/Makefile.in wxPython-src-2.8.7.1/contrib/src/Makefile.in +--- wxPython-src-2.8.7.1-orig/contrib/src/Makefile.in 2007-07-27 17:57:27.000000000 -0600 ++++ wxPython-src-2.8.7.1/contrib/src/Makefile.in 2007-12-28 17:34:28.000000000 -0600 +@@ -1,6 +1,6 @@ + # $Id$ + +-CONTRIB_SUBDIRS=fl gizmos mmedia ogl plot stc svg #deprecated #applet ++CONTRIB_SUBDIRS=fl gizmos ogl plot stc svg #deprecated #applet mmedia + + all: + @for d in $(CONTRIB_SUBDIRS); do (cd $$d && $(MAKE)); done diff --git a/x11-libs/wxGTK/files/wxGTK-2.9.3.1-collision.patch b/x11-libs/wxGTK/files/wxGTK-2.9.3.1-collision.patch new file mode 100644 index 000000000000..ed82c4eb51f1 --- /dev/null +++ b/x11-libs/wxGTK/files/wxGTK-2.9.3.1-collision.patch @@ -0,0 +1,77 @@ +Prevent file collisions between multiple installed SLOTs. + + - Don't install wxwin.m4. It is installed with app-eselect/eselect-wxwidgets. + - Version the bakefile preset filenames. Unversioned symlinks to these files + are handled by eselect. + - Version wx-config and wxrc. The unversioned forms are wrapper scripts + installed with eselect-wxwidgets. + - Version wxstd.mo and modify AddStdCatalog to use it. + +--- a/Makefile.in ++++ b/Makefile.in +@@ -14076,10 +14076,10 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \ + all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxexpat___depname) $(__wxscintilla___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) $(__htmldll___depname) $(__htmllib___depname) $(__webviewdll___depname) $(__webviewlib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__ribbondll___depname) $(__ribbonlib___depname) $(__propgriddll___depname) $(__propgridlib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___depname) $(__cocoa_res___depname) + + 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) + $(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 \ +@@ -14964,15 +14964,16 @@ 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) +- ++ (cd $(DESTDIR)$(bindir) && rm -f wx-config-$(WX_RELEASE) \ ++ && $(LN_S) ../lib/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE)) + locale_install: + $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale + for l in $(LOCALE_LINGUAS) ; do \ + $(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 + +--- a/build/bakefiles/wx.bkl ++++ b/build/bakefiles/wx.bkl +@@ -138,7 +138,7 @@ + <using module="gettext"/> + <gettext-catalogs id="locale"> + <srcdir>$(SRCDIR)/locale</srcdir> +- <catalog-name>wxstd</catalog-name> ++ <catalog-name>wxstd$(WX_RELEASE_NODOT)</catalog-name> + <linguas> + ca cs da de el es fi fr hu id it ja nl pl ru sl sv tr uk + zh zh_CN zh_TW +--- a/src/common/translation.cpp ++++ b/src/common/translation.cpp +@@ -1302,7 +1302,7 @@ wxArrayString wxTranslations::GetAvailableTranslations(const wxString& domain) c + + 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 +--- a/utils/wxrc/Makefile.in ++++ b/utils/wxrc/Makefile.in +@@ -124,7 +124,6 @@ distclean: clean + @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@uninstall_wxrc: + @COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) diff --git a/x11-libs/wxGTK/files/wxGTK-2.9.4.1-collision.patch b/x11-libs/wxGTK/files/wxGTK-2.9.4.1-collision.patch new file mode 100644 index 000000000000..7657f9b58c63 --- /dev/null +++ b/x11-libs/wxGTK/files/wxGTK-2.9.4.1-collision.patch @@ -0,0 +1,75 @@ +Prevent file collisions between multiple installed SLOTs. + + - Don't install wxwin.m4. It is installed with app-eselect/eselect-wxwidgets. + - Version the bakefile preset filenames. Unversioned symlinks to these files + are handled by eselect. + - Version wx-config and wxrc. The unversioned forms are wrapper scripts + installed with eselect-wxwidgets. + - Version wxstd.mo and modify AddStdCatalog to use it. + +--- a/Makefile.in ++++ b/Makefile.in +@@ -14774,10 +14774,10 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \ + all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxexpat___depname) $(__wxscintilla___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) $(__htmldll___depname) $(__htmllib___depname) $(__webviewdll___depname) $(__webviewlib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__ribbondll___depname) $(__ribbonlib___depname) $(__propgriddll___depname) $(__propgridlib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___depname) $(__cocoa_res___depname) + + 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) + $(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 \ +@@ -15662,7 +15662,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) ++ (cd $(DESTDIR)$(bindir) && rm -f wx-config-$(WX_RELEASE) && $(LN_S) $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE)) + + locale_install: + $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale +@@ -15670,7 +15670,7 @@ locale_install: + $(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 + +--- a/build/bakefiles/wx.bkl ++++ b/build/bakefiles/wx.bkl +@@ -138,7 +138,7 @@ + <using module="gettext"/> + <gettext-catalogs id="locale"> + <srcdir>$(SRCDIR)/locale</srcdir> +- <catalog-name>wxstd</catalog-name> ++ <catalog-name>wxstd$(WX_RELEASE_NODOT)</catalog-name> + <linguas> + ca cs da de el es fi fr hu id it ja nl pl ru sl sv tr uk + zh zh_CN zh_TW +--- a/src/common/translation.cpp ++++ b/src/common/translation.cpp +@@ -1302,7 +1302,7 @@ wxArrayString wxTranslations::GetAvailableTranslations(const wxString& domain) c + + 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 +--- a/utils/wxrc/Makefile.in ++++ b/utils/wxrc/Makefile.in +@@ -125,7 +125,6 @@ distclean: clean + @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@uninstall_wxrc: + @COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) diff --git a/x11-libs/wxGTK/files/wxGTK-3.0.0.0-collision.patch b/x11-libs/wxGTK/files/wxGTK-3.0.0.0-collision.patch new file mode 100644 index 000000000000..a2c6c6e1a8e3 --- /dev/null +++ b/x11-libs/wxGTK/files/wxGTK-3.0.0.0-collision.patch @@ -0,0 +1,75 @@ +Prevent file collisions between multiple installed SLOTs. + + - Don't install wxwin.m4. It is installed with app-eselect/eselect-wxwidgets. + - Version the bakefile preset filenames. Unversioned symlinks to these files + are handled by eselect. + - Version wx-config and wxrc. The unversioned forms are wrapper scripts + installed with eselect-wxwidgets. + - Version wxstd.mo and modify AddStdCatalog to use it. + +--- a/Makefile.in ++++ b/Makefile.in +@@ -15213,10 +15213,10 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \ + all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxexpat___depname) $(__wxscintilla___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) $(__htmldll___depname) $(__htmllib___depname) $(__webviewdll___depname) $(__webviewlib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__ribbondll___depname) $(__ribbonlib___depname) $(__propgriddll___depname) $(__propgridlib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___depname) $(__cocoa_res___depname) + + 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) + $(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 \ +@@ -16101,7 +16101,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) ++ (cd $(DESTDIR)$(bindir) && rm -f wx-config-$(WX_RELEASE) && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE) || cp -p $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE)) + + locale_install: + $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale +@@ -16109,7 +16109,7 @@ locale_install: + $(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 + +--- a/build/bakefiles/wx.bkl ++++ b/build/bakefiles/wx.bkl +@@ -137,7 +137,7 @@ + <using module="gettext"/> + <gettext-catalogs id="locale"> + <srcdir>$(SRCDIR)/locale</srcdir> +- <catalog-name>wxstd</catalog-name> ++ <catalog-name>wxstd$(WX_RELEASE_NODOT)</catalog-name> + <linguas> + ca cs da de el es fi fr hu id it ja nl pl ru sl sv tr uk + zh zh_CN zh_TW +--- a/src/common/translation.cpp ++++ b/src/common/translation.cpp +@@ -1458,7 +1458,7 @@ wxArrayString wxTranslations::GetAvailableTranslations(const wxString& domain) c + + 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 +--- a/utils/wxrc/Makefile.in ++++ b/utils/wxrc/Makefile.in +@@ -125,7 +125,6 @@ distclean: clean + @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@uninstall_wxrc: + @COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) diff --git a/x11-libs/wxGTK/metadata.xml b/x11-libs/wxGTK/metadata.xml new file mode 100644 index 000000000000..bacea1ae3fb7 --- /dev/null +++ b/x11-libs/wxGTK/metadata.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>wxwidgets</herd> + <maintainer> + <email>wxwidgets@gentoo.org</email> + <description>All modifications to this package must be approved by the wxwidgets herd.</description> + </maintainer> + <use> + <flag name="gstreamer"> + Enable the wxMediaCtrl class for playing audio and video through + gstreamer. + </flag> + <flag name="gnome"> + Use <pkg>gnome-base/libgnomeprintui</pkg> for printing tasks. + </flag> + <flag name="sdl"> + Use Simple Directmedia Layer (<pkg>media-libs/libsdl</pkg>) for + audio. + </flag> + </use> + <upstream> + <remote-id type="sourceforge">wxpython</remote-id> + </upstream> +</pkgmetadata> diff --git a/x11-libs/wxGTK/wxGTK-2.8.12.1-r1.ebuild b/x11-libs/wxGTK/wxGTK-2.8.12.1-r1.ebuild new file mode 100644 index 000000000000..0fc560405479 --- /dev/null +++ b/x11-libs/wxGTK/wxGTK-2.8.12.1-r1.ebuild @@ -0,0 +1,187 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +inherit eutils flag-o-matic multilib versionator + +DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit" +HOMEPAGE="http://wxwidgets.org/" + +BASE_PV="$(get_version_component_range 1-3)" +BASE_P="${PN}-${BASE_PV}" + +# we use the wxPython tarballs because they include the full wxGTK sources and +# docs, and are released more frequently than wxGTK. +SRC_URI="mirror://sourceforge/wxpython/wxPython-src-${PV}.tar.bz2" + +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +IUSE="+X aqua doc debug gnome gstreamer odbc opengl pch sdl tiff" + +SLOT="2.8" + +RDEPEND=" + dev-libs/expat + odbc? ( dev-db/unixODBC ) + sdl? ( media-libs/libsdl ) + X? ( + dev-libs/glib:2 + media-libs/libpng:0= + sys-libs/zlib + virtual/jpeg + x11-libs/gtk+:2 + x11-libs/libSM + x11-libs/libXinerama + x11-libs/libXxf86vm + x11-libs/pango[X] + gnome? ( gnome-base/libgnomeprintui:2.2 ) + gstreamer? ( + gnome-base/gconf:2 + media-libs/gstreamer:0.10 + media-libs/gst-plugins-base:0.10 ) + opengl? ( virtual/opengl ) + tiff? ( media-libs/tiff:0 ) + ) + aqua? ( + >=x11-libs/gtk+-2.4[aqua=] + virtual/jpeg + tiff? ( media-libs/tiff:0 ) + )" + +DEPEND="${RDEPEND} + virtual/pkgconfig + opengl? ( virtual/glu ) + X? ( + x11-proto/xproto + x11-proto/xineramaproto + x11-proto/xf86vidmodeproto + )" + +PDEPEND=">=app-eselect/eselect-wxwidgets-0.7" + +LICENSE="wxWinLL-3 + GPL-2 + odbc? ( LGPL-2 ) + doc? ( wxWinFDL-3 )" + +S="${WORKDIR}/wxPython-src-${PV}" + +src_prepare() { + epatch "${FILESDIR}"/${PN}-2.8.11-unicode-odbc.patch + epatch "${FILESDIR}"/${PN}-2.8.11-collision.patch + epatch "${FILESDIR}"/${PN}-2.8.7-mmedia.patch # Bug #174874 + epatch "${FILESDIR}"/${PN}-2.8.10.1-odbc-defines.patch # Bug #310923 + + # x32 https://bugs.gentoo.org/421851 + sed -i -e "/wx_cv_std_libpath=/s:=.*:=$(get_libdir):" configure || die + + # prefix https://bugs.gentoo.org/394123 + sed -i -e "s:/usr:${EPREFIX}/usr:g" \ + -e '/SEARCH_INCLUDE="\\/,/"/cSEARCH_INCLUDE="'${EPREFIX}'/usr/include"' \ + configure || die + + epatch_user +} + +src_configure() { + local myconf + + append-flags -fno-strict-aliasing + + # X independent options + myconf="--enable-compat26 + --enable-shared + --enable-unicode + --with-regex=builtin + --with-zlib=sys + --with-expat=sys + $(use_enable debug) + $(use_enable pch precomp-headers) + $(use_with odbc odbc sys) + $(use_with sdl) + $(use_with tiff libtiff sys)" + + # wxGTK options + # --enable-graphics_ctx - needed for webkit, editra + # --without-gnomevfs - bug #203389 + use X && \ + myconf="${myconf} + --enable-graphics_ctx + --enable-gui + --with-libpng=sys + --with-libxpm=sys + --with-libjpeg=sys + $(use_enable gstreamer mediactrl) + $(use_enable opengl) + $(use_with opengl) + $(use_with gnome gnomeprint) + --without-gnomevfs" + + use aqua && \ + myconf="${myconf} + --enable-graphics_ctx + --enable-gui + --with-libpng=sys + --with-libxpm=sys + --with-libjpeg=sys + --with-mac + --with-opengl" + # cocoa toolkit seems to be broken + + # wxBase options + if use !X && use !aqua ; then + myconf="${myconf} + --disable-gui" + fi + + mkdir "${S}"/wxgtk_build + cd "${S}"/wxgtk_build + + ECONF_SOURCE="${S}" econf ${myconf} +} + +src_compile() { + cd "${S}"/wxgtk_build + + emake + + if [[ -d contrib/src ]]; then + cd contrib/src + emake + fi +} + +src_install() { + cd "${S}"/wxgtk_build + + emake DESTDIR="${D}" install + + if [[ -d contrib/src ]]; then + cd contrib/src + emake DESTDIR="${D}" install + fi + + cd "${S}"/docs + dodoc changes.txt readme.txt todo30.txt + newdoc base/readme.txt base_readme.txt + newdoc gtk/readme.txt gtk_readme.txt + + if use doc; then + dohtml -r "${S}"/docs/html/* + fi + + # Stray windows locale file, causes collisions + local wxmsw="${ED}usr/share/locale/it/LC_MESSAGES/wxmsw.mo" + [[ -e ${wxmsw} ]] && rm "${wxmsw}" +} + +pkg_postinst() { + has_version app-eselect/eselect-wxwidgets \ + && eselect wxwidgets update +} + +pkg_postrm() { + has_version app-eselect/eselect-wxwidgets \ + && eselect wxwidgets update +} diff --git a/x11-libs/wxGTK/wxGTK-2.8.12.1-r2.ebuild b/x11-libs/wxGTK/wxGTK-2.8.12.1-r2.ebuild new file mode 100644 index 000000000000..269abdf3ed49 --- /dev/null +++ b/x11-libs/wxGTK/wxGTK-2.8.12.1-r2.ebuild @@ -0,0 +1,188 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +inherit autotools eutils flag-o-matic versionator multilib-minimal + +DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit" +HOMEPAGE="http://wxwidgets.org/" + +BASE_PV="$(get_version_component_range 1-3)" +BASE_P="${PN}-${BASE_PV}" + +# we use the wxPython tarballs because they include the full wxGTK sources and +# docs, and are released more frequently than wxGTK. +SRC_URI="mirror://sourceforge/wxpython/wxPython-src-${PV}.tar.bz2" + +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +IUSE="+X aqua doc debug gnome gstreamer odbc opengl pch sdl tiff" + +SLOT="2.8" + +RDEPEND=" + dev-libs/expat[${MULTILIB_USEDEP}] + odbc? ( dev-db/unixODBC[${MULTILIB_USEDEP}] ) + sdl? ( media-libs/libsdl[${MULTILIB_USEDEP}] ) + X? ( + dev-libs/glib:2[${MULTILIB_USEDEP}] + media-libs/libpng:0=[${MULTILIB_USEDEP}] + sys-libs/zlib[${MULTILIB_USEDEP}] + virtual/jpeg:=[${MULTILIB_USEDEP}] + x11-libs/gtk+:2[${MULTILIB_USEDEP}] + x11-libs/libSM[${MULTILIB_USEDEP}] + x11-libs/libXinerama[${MULTILIB_USEDEP}] + x11-libs/libXxf86vm[${MULTILIB_USEDEP}] + x11-libs/pango[X,${MULTILIB_USEDEP}] + gnome? ( gnome-base/libgnomeprintui:2.2[${MULTILIB_USEDEP}] ) + gstreamer? ( + gnome-base/gconf:2[${MULTILIB_USEDEP}] + media-libs/gstreamer:0.10[${MULTILIB_USEDEP}] + media-libs/gst-plugins-base:0.10[${MULTILIB_USEDEP}] ) + opengl? ( virtual/opengl[${MULTILIB_USEDEP}] ) + tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] ) + ) + aqua? ( + >=x11-libs/gtk+-2.4:2[aqua=,${MULTILIB_USEDEP}] + virtual/jpeg:=[${MULTILIB_USEDEP}] + tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] ) + )" + +DEPEND="${RDEPEND} + virtual/pkgconfig[${MULTILIB_USEDEP}] + opengl? ( virtual/glu[${MULTILIB_USEDEP}] ) + X? ( + x11-proto/xproto[${MULTILIB_USEDEP}] + x11-proto/xineramaproto[${MULTILIB_USEDEP}] + x11-proto/xf86vidmodeproto[${MULTILIB_USEDEP}] + ) +" + +PDEPEND=">=app-eselect/eselect-wxwidgets-0.7" + +LICENSE="wxWinLL-3 + GPL-2 + odbc? ( LGPL-2 ) + doc? ( wxWinFDL-3 )" + +S="${WORKDIR}/wxPython-src-${PV}" + +src_prepare() { + epatch "${FILESDIR}"/${PN}-2.8.11-unicode-odbc.patch + epatch "${FILESDIR}"/${PN}-2.8.11-collision.patch + epatch "${FILESDIR}"/${PN}-2.8.7-mmedia.patch # Bug #174874 + epatch "${FILESDIR}"/${PN}-2.8.10.1-odbc-defines.patch # Bug #310923 + + # Bug #421851 + epatch "${FILESDIR}"/${P}-libdir.patch + epatch "${FILESDIR}"/${P}-bakefile.patch + epatch "${FILESDIR}"/${P}-autoconf.patch + + # prefix https://bugs.gentoo.org/394123 + sed -i -e "s:/usr:${EPREFIX}/usr:g" \ + -e '/SEARCH_INCLUDE="\\/,/"/cSEARCH_INCLUDE="'${EPREFIX}'/usr/include"' \ + configure || die + + epatch_user + + mv configure.in configure.ac || die + eautoconf +} + +multilib_src_configure() { + local myconf + + append-flags -fno-strict-aliasing + + # X independent options + myconf="--enable-compat26 + --enable-shared + --enable-unicode + --with-regex=builtin + --with-zlib=sys + --with-expat=sys + $(use_enable debug) + $(use_enable pch precomp-headers) + $(use_with odbc odbc sys) + $(use_with sdl) + $(use_with tiff libtiff sys)" + + # wxGTK options + # --enable-graphics_ctx - needed for webkit, editra + # --without-gnomevfs - bug #203389 + use X && \ + myconf="${myconf} + --enable-graphics_ctx + --enable-gui + --with-libpng=sys + --with-libxpm=sys + --with-libjpeg=sys + $(use_enable gstreamer mediactrl) + $(use_enable opengl) + $(use_with opengl) + $(use_with gnome gnomeprint) + --without-gnomevfs" + + use aqua && \ + myconf="${myconf} + --enable-graphics_ctx + --enable-gui + --with-libpng=sys + --with-libxpm=sys + --with-libjpeg=sys + --with-mac + --with-opengl" + # cocoa toolkit seems to be broken + + # wxBase options + if use !X && use !aqua ; then + myconf="${myconf} + --disable-gui" + fi + + ECONF_SOURCE="${S}" econf ${myconf} +} + +multilib_src_compile() { + emake + + if [[ -d contrib/src ]]; then + cd contrib/src || die + emake + fi +} + +multilib_src_install() { + default + + if [[ -d contrib/src ]]; then + cd contrib/src || die + emake DESTDIR="${D}" install + fi +} + +multilib_src_install_all() { + cd "${S}"/docs || die + dodoc changes.txt readme.txt todo30.txt + newdoc base/readme.txt base_readme.txt + newdoc gtk/readme.txt gtk_readme.txt + + if use doc; then + dodoc -r "${S}"/docs/html + fi + + # Stray windows locale file, causes collisions + local wxmsw="${ED}usr/share/locale/it/LC_MESSAGES/wxmsw.mo" + [[ -e ${wxmsw} ]] && rm "${wxmsw}" +} + +pkg_postinst() { + has_version app-eselect/eselect-wxwidgets \ + && eselect wxwidgets update +} + +pkg_postrm() { + has_version app-eselect/eselect-wxwidgets \ + && eselect wxwidgets update +} diff --git a/x11-libs/wxGTK/wxGTK-2.9.4.1-r1.ebuild b/x11-libs/wxGTK/wxGTK-2.9.4.1-r1.ebuild new file mode 100644 index 000000000000..cca3f12633f2 --- /dev/null +++ b/x11-libs/wxGTK/wxGTK-2.9.4.1-r1.ebuild @@ -0,0 +1,178 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +inherit eutils flag-o-matic + +DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit" +HOMEPAGE="http://wxwidgets.org/" + +# we use the wxPython tarballs because they include the full wxGTK sources and +# docs, and are released more frequently than wxGTK. +SRC_URI="mirror://sourceforge/wxpython/wxPython-src-2.9.4.0.tar.bz2 + doc? ( mirror://sourceforge/wxpython/wxPython-docs-2.9.4.0.tar.bz2 ) + mirror://sourceforge/wxpython/wxPython-src-${PV}.patch" + +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +IUSE="+X aqua doc debug gnome gstreamer opengl pch sdl tiff webkit" + +SLOT="2.9/2.9.4" + +RDEPEND=" + dev-libs/expat + sdl? ( media-libs/libsdl ) + X? ( + >=dev-libs/glib-2.22:2 + media-libs/libpng:0= + sys-libs/zlib + virtual/jpeg + >=x11-libs/gtk+-2.18:2 + x11-libs/libSM + x11-libs/libXinerama + x11-libs/libXxf86vm + x11-libs/pango[X] + gnome? ( gnome-base/libgnomeprintui:2.2 ) + gstreamer? ( + media-libs/gstreamer:0.10 + media-libs/gst-plugins-base:0.10 ) + opengl? ( virtual/opengl ) + tiff? ( media-libs/tiff:0 ) + webkit? ( net-libs/webkit-gtk:2 ) + ) + aqua? ( + >=x11-libs/gtk+-2.4[aqua=] + virtual/jpeg + tiff? ( media-libs/tiff:0 ) + )" + +DEPEND="${RDEPEND} + virtual/pkgconfig + opengl? ( virtual/glu ) + X? ( + x11-proto/xproto + x11-proto/xineramaproto + x11-proto/xf86vidmodeproto + )" +# test? ( dev-util/cppunit ) + +PDEPEND=">=app-eselect/eselect-wxwidgets-1.4" + +LICENSE="wxWinLL-3 + GPL-2 + doc? ( wxWinFDL-3 )" + +S="${WORKDIR}/wxPython-src-2.9.4.0" + +src_prepare() { + epatch "${FILESDIR}"/${P}-collision.patch + epatch "${DISTDIR}"/wxPython-src-${PV}.patch + epatch_user +} + +src_configure() { + local myconf + + append-flags -fno-strict-aliasing + + # X independent options + myconf="--enable-compat26 + --with-zlib=sys + --with-expat=sys + $(use_enable pch precomp-headers) + $(use_with sdl)" + + # debug in >=2.9 + # if USE="debug" set max debug level (wxDEBUG_LEVEL=2) + # if USE="-debug" use the default (wxDEBUG_LEVEL=1) + # do not use --disable-debug + # this means we always build debugging features into the library, and + # apps can disable these features by building w/ -NDEBUG or wxDEBUG_LEVEL_0. + # wxDEBUG_LEVEL=2 enables assertions that have expensive runtime costs. + # http://docs.wxwidgets.org/2.9/overview_debugging.html + # http://groups.google.com/group/wx-dev/browse_thread/thread/c3c7e78d63d7777f/05dee25410052d9c + use debug \ + && myconf="${myconf} --enable-debug=max" + + # wxGTK options + # --enable-graphics_ctx - needed for webkit, editra + # --without-gnomevfs - bug #203389 + use X && \ + myconf="${myconf} + --enable-graphics_ctx + --enable-gui + --with-libpng=sys + --with-libxpm=sys + --with-libjpeg=sys + --without-gnomevfs + $(use_enable gstreamer mediactrl) + $(use_enable webkit webview) + $(use_with opengl) + $(use_with gnome gnomeprint) + $(use_with !gnome gtkprint) + $(use_with tiff libtiff sys)" + + use aqua && \ + myconf="${myconf} + --enable-graphics_ctx + --enable-gui + --with-libpng=sys + --with-libxpm=sys + --with-libjpeg=sys + --with-mac + --with-opengl" + # cocoa toolkit seems to be broken + + # wxBase options + if use !X && use !aqua ; then + myconf="${myconf} + --disable-gui" + fi + + mkdir "${S}"/wxgtk_build + cd "${S}"/wxgtk_build + + ECONF_SOURCE="${S}" econf ${myconf} +} + +src_compile() { + cd "${S}"/wxgtk_build + emake +} + +# Currently fails - need to investigate +#src_test() { +# cd "${S}"/wxgtk_build/tests +# emake || die "failed building testsuite" +# ./test -d || ewarn "failed running testsuite" +#} + +src_install() { + cd "${S}"/wxgtk_build + + emake DESTDIR="${D}" install + + cd "${S}"/docs + dodoc changes.txt readme.txt + newdoc base/readme.txt base_readme.txt + newdoc gtk/readme.txt gtk_readme.txt + + if use doc; then + dohtml -r "${S}"/docs/doxygen/out/html/* + fi + + # Stray windows locale file, causes collisions + local wxmsw="${ED}usr/share/locale/it/LC_MESSAGES/wxmsw.mo" + [[ -e ${wxmsw} ]] && rm "${wxmsw}" +} + +pkg_postinst() { + has_version app-eselect/eselect-wxwidgets \ + && eselect wxwidgets update +} + +pkg_postrm() { + has_version app-eselect/eselect-wxwidgets \ + && eselect wxwidgets update +} diff --git a/x11-libs/wxGTK/wxGTK-3.0.0.0.ebuild b/x11-libs/wxGTK/wxGTK-3.0.0.0.ebuild new file mode 100644 index 000000000000..ef1e0cbe571e --- /dev/null +++ b/x11-libs/wxGTK/wxGTK-3.0.0.0.ebuild @@ -0,0 +1,169 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +inherit eutils flag-o-matic + +DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit" +HOMEPAGE="http://wxwidgets.org/" + +# we use the wxPython tarballs because they include the full wxGTK sources and +# docs, and are released more frequently than wxGTK. +SRC_URI="mirror://sourceforge/wxpython/wxPython-src-${PV}.tar.bz2 + doc? ( mirror://sourceforge/wxpython/wxPython-docs-${PV}.tar.bz2 )" + +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +IUSE="+X aqua doc debug gstreamer libnotify opengl sdl tiff webkit" + +SLOT="3.0" + +RDEPEND=" + dev-libs/expat + sdl? ( media-libs/libsdl ) + X? ( + >=dev-libs/glib-2.22:2 + media-libs/libpng:0= + sys-libs/zlib + virtual/jpeg + >=x11-libs/gtk+-2.18:2 + x11-libs/gdk-pixbuf + x11-libs/libSM + x11-libs/libXxf86vm + x11-libs/pango[X] + gstreamer? ( + media-libs/gstreamer:0.10 + media-libs/gst-plugins-base:0.10 ) + libnotify? ( x11-libs/libnotify ) + opengl? ( virtual/opengl ) + tiff? ( media-libs/tiff:0 ) + webkit? ( net-libs/webkit-gtk:2 ) + ) + aqua? ( + >=x11-libs/gtk+-2.4[aqua=] + virtual/jpeg + tiff? ( media-libs/tiff:0 ) + )" + +DEPEND="${RDEPEND} + virtual/pkgconfig + opengl? ( virtual/glu ) + X? ( + x11-proto/xproto + x11-proto/xineramaproto + x11-proto/xf86vidmodeproto + )" + +PDEPEND=">=app-eselect/eselect-wxwidgets-20131230" + +LICENSE="wxWinLL-3 + GPL-2 + doc? ( wxWinFDL-3 )" + +S="${WORKDIR}/wxPython-src-${PV}" + +src_prepare() { + epatch "${FILESDIR}"/${P}-collision.patch + + # https://bugs.gentoo.org/421851 + # https://bugs.gentoo.org/499984 + sed -i -e "/wx_cv_std_libpath=/s:=.*:=$(get_libdir):" configure || die + + epatch_user +} + +src_configure() { + local myconf + + # X independent options + myconf=" + --with-zlib=sys + --with-expat=sys + --enable-compat28 + $(use_with sdl)" + + # debug in >=2.9 + # there is no longer separate debug libraries (gtk2ud) + # wxDEBUG_LEVEL=1 is the default and we will leave it enabled + # wxDEBUG_LEVEL=2 enables assertions that have expensive runtime costs. + # apps can disable these features by building w/ -NDEBUG or wxDEBUG_LEVEL_0. + # http://docs.wxwidgets.org/3.0/overview_debugging.html + # http://groups.google.com/group/wx-dev/browse_thread/thread/c3c7e78d63d7777f/05dee25410052d9c + use debug \ + && myconf="${myconf} --enable-debug=max" + + # wxGTK options + # --enable-graphics_ctx - needed for webkit, editra + # --without-gnomevfs - bug #203389 + use X && \ + myconf="${myconf} + --enable-graphics_ctx + --with-gtkprint + --enable-gui + --with-libpng=sys + --with-libxpm=sys + --with-libjpeg=sys + --without-gnomevfs + $(use_enable gstreamer mediactrl) + $(use_enable webkit webview) + $(use_with libnotify) + $(use_with opengl) + $(use_with tiff libtiff sys)" + + use aqua && \ + myconf="${myconf} + --enable-graphics_ctx + --enable-gui + --with-libpng=sys + --with-libxpm=sys + --with-libjpeg=sys + --with-mac + --with-opengl" + # cocoa toolkit seems to be broken + + # wxBase options + if use !X && use !aqua ; then + myconf="${myconf} + --disable-gui" + fi + + mkdir "${S}"/wxgtk_build + cd "${S}"/wxgtk_build + + ECONF_SOURCE="${S}" econf ${myconf} +} + +src_compile() { + cd "${S}"/wxgtk_build + emake +} + +src_install() { + cd "${S}"/wxgtk_build + + emake DESTDIR="${D}" install + + cd "${S}"/docs + dodoc changes.txt readme.txt + newdoc base/readme.txt base_readme.txt + newdoc gtk/readme.txt gtk_readme.txt + + if use doc; then + dohtml -r "${S}"/docs/doxygen/out/html/* + fi + + # Stray windows locale file, causes collisions + local wxmsw="${ED}usr/share/locale/it/LC_MESSAGES/wxmsw.mo" + [[ -e ${wxmsw} ]] && rm "${wxmsw}" +} + +pkg_postinst() { + has_version app-eselect/eselect-wxwidgets \ + && eselect wxwidgets update +} + +pkg_postrm() { + has_version app-eselect/eselect-wxwidgets \ + && eselect wxwidgets update +} diff --git a/x11-libs/wxGTK/wxGTK-3.0.1.1.ebuild b/x11-libs/wxGTK/wxGTK-3.0.1.1.ebuild new file mode 100644 index 000000000000..667195eb62a2 --- /dev/null +++ b/x11-libs/wxGTK/wxGTK-3.0.1.1.ebuild @@ -0,0 +1,169 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +inherit eutils flag-o-matic + +DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit" +HOMEPAGE="http://wxwidgets.org/" + +# we use the wxPython tarballs because they include the full wxGTK sources and +# docs, and are released more frequently than wxGTK. +SRC_URI="mirror://sourceforge/wxpython/wxPython-src-${PV}.tar.bz2 + doc? ( mirror://sourceforge/wxpython/wxPython-docs-${PV}.tar.bz2 )" + +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +IUSE="+X aqua doc debug gstreamer libnotify opengl sdl tiff webkit" + +SLOT="3.0" + +RDEPEND=" + dev-libs/expat + sdl? ( media-libs/libsdl ) + X? ( + >=dev-libs/glib-2.22:2 + media-libs/libpng:0= + sys-libs/zlib + virtual/jpeg + >=x11-libs/gtk+-2.18:2 + x11-libs/gdk-pixbuf + x11-libs/libSM + x11-libs/libXxf86vm + x11-libs/pango[X] + gstreamer? ( + media-libs/gstreamer:0.10 + media-libs/gst-plugins-base:0.10 ) + libnotify? ( x11-libs/libnotify ) + opengl? ( virtual/opengl ) + tiff? ( media-libs/tiff:0 ) + webkit? ( net-libs/webkit-gtk:2 ) + ) + aqua? ( + >=x11-libs/gtk+-2.4[aqua=] + virtual/jpeg + tiff? ( media-libs/tiff:0 ) + )" + +DEPEND="${RDEPEND} + virtual/pkgconfig + opengl? ( virtual/glu ) + X? ( + x11-proto/xproto + x11-proto/xineramaproto + x11-proto/xf86vidmodeproto + )" + +PDEPEND=">=app-eselect/eselect-wxwidgets-20131230" + +LICENSE="wxWinLL-3 + GPL-2 + doc? ( wxWinFDL-3 )" + +S="${WORKDIR}/wxPython-src-${PV}" + +src_prepare() { + epatch "${FILESDIR}"/${PN}-3.0.0.0-collision.patch + + # https://bugs.gentoo.org/421851 + # https://bugs.gentoo.org/499984 + sed -i -e "/wx_cv_std_libpath=/s:=.*:=$(get_libdir):" configure || die + + epatch_user +} + +src_configure() { + local myconf + + # X independent options + myconf=" + --with-zlib=sys + --with-expat=sys + --enable-compat28 + $(use_with sdl)" + + # debug in >=2.9 + # there is no longer separate debug libraries (gtk2ud) + # wxDEBUG_LEVEL=1 is the default and we will leave it enabled + # wxDEBUG_LEVEL=2 enables assertions that have expensive runtime costs. + # apps can disable these features by building w/ -NDEBUG or wxDEBUG_LEVEL_0. + # http://docs.wxwidgets.org/3.0/overview_debugging.html + # http://groups.google.com/group/wx-dev/browse_thread/thread/c3c7e78d63d7777f/05dee25410052d9c + use debug \ + && myconf="${myconf} --enable-debug=max" + + # wxGTK options + # --enable-graphics_ctx - needed for webkit, editra + # --without-gnomevfs - bug #203389 + use X && \ + myconf="${myconf} + --enable-graphics_ctx + --with-gtkprint + --enable-gui + --with-libpng=sys + --with-libxpm=sys + --with-libjpeg=sys + --without-gnomevfs + $(use_enable gstreamer mediactrl) + $(use_enable webkit webview) + $(use_with libnotify) + $(use_with opengl) + $(use_with tiff libtiff sys)" + + use aqua && \ + myconf="${myconf} + --enable-graphics_ctx + --enable-gui + --with-libpng=sys + --with-libxpm=sys + --with-libjpeg=sys + --with-mac + --with-opengl" + # cocoa toolkit seems to be broken + + # wxBase options + if use !X && use !aqua ; then + myconf="${myconf} + --disable-gui" + fi + + mkdir "${S}"/wxgtk_build + cd "${S}"/wxgtk_build + + ECONF_SOURCE="${S}" econf ${myconf} +} + +src_compile() { + cd "${S}"/wxgtk_build + emake +} + +src_install() { + cd "${S}"/wxgtk_build + + emake DESTDIR="${D}" install + + cd "${S}"/docs + dodoc changes.txt readme.txt + newdoc base/readme.txt base_readme.txt + newdoc gtk/readme.txt gtk_readme.txt + + if use doc; then + dohtml -r "${S}"/docs/doxygen/out/html/* + fi + + # Stray windows locale file, causes collisions + local wxmsw="${ED}usr/share/locale/it/LC_MESSAGES/wxmsw.mo" + [[ -e ${wxmsw} ]] && rm "${wxmsw}" +} + +pkg_postinst() { + has_version app-eselect/eselect-wxwidgets \ + && eselect wxwidgets update +} + +pkg_postrm() { + has_version app-eselect/eselect-wxwidgets \ + && eselect wxwidgets update +} diff --git a/x11-libs/wxGTK/wxGTK-3.0.2.0-r1.ebuild b/x11-libs/wxGTK/wxGTK-3.0.2.0-r1.ebuild new file mode 100644 index 000000000000..53f1ed73e61a --- /dev/null +++ b/x11-libs/wxGTK/wxGTK-3.0.2.0-r1.ebuild @@ -0,0 +1,174 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +inherit eutils flag-o-matic + +DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit" +HOMEPAGE="http://wxwidgets.org/" + +# we use the wxPython tarballs because they include the full wxGTK sources and +# docs, and are released more frequently than wxGTK. +SRC_URI="mirror://sourceforge/wxpython/wxPython-src-${PV}.tar.bz2 + doc? ( mirror://sourceforge/wxpython/wxPython-docs-${PV}.tar.bz2 )" + +KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +IUSE="+X aqua doc debug gstreamer libnotify opengl sdl tiff webkit" + +SLOT="3.0" + +RDEPEND=" + dev-libs/expat + sdl? ( media-libs/libsdl ) + X? ( + >=dev-libs/glib-2.22:2 + media-libs/libpng:0= + sys-libs/zlib + virtual/jpeg + >=x11-libs/gtk+-2.18:2 + x11-libs/gdk-pixbuf + x11-libs/libSM + x11-libs/libXxf86vm + x11-libs/pango[X] + gstreamer? ( + media-libs/gstreamer:0.10 + media-libs/gst-plugins-base:0.10 ) + libnotify? ( x11-libs/libnotify ) + opengl? ( virtual/opengl ) + tiff? ( media-libs/tiff:0 ) + webkit? ( net-libs/webkit-gtk:2 ) + ) + aqua? ( + >=x11-libs/gtk+-2.4[aqua=] + virtual/jpeg + tiff? ( media-libs/tiff:0 ) + )" + +DEPEND="${RDEPEND} + virtual/pkgconfig + opengl? ( virtual/glu ) + X? ( + x11-proto/xproto + x11-proto/xineramaproto + x11-proto/xf86vidmodeproto + )" + +PDEPEND=">=app-eselect/eselect-wxwidgets-20131230" + +LICENSE="wxWinLL-3 + GPL-2 + doc? ( wxWinFDL-3 )" + +S="${WORKDIR}/wxPython-src-${PV}" + +src_prepare() { + epatch "${FILESDIR}"/${PN}-3.0.0.0-collision.patch + + # https://bugs.gentoo.org/421851 + # https://bugs.gentoo.org/499984 + # https://bugs.gentoo.org/536004 + sed \ + -e "/wx_cv_std_libpath=/s:=.*:=$(get_libdir):" \ + -e 's:3\.0\.1:3.0.2:g' \ + -e 's:^wx_release_number=1$:wx_release_number=2:' \ + -i configure || die + + epatch_user +} + +src_configure() { + local myconf + + # X independent options + myconf=" + --with-zlib=sys + --with-expat=sys + --enable-compat28 + $(use_with sdl)" + + # debug in >=2.9 + # there is no longer separate debug libraries (gtk2ud) + # wxDEBUG_LEVEL=1 is the default and we will leave it enabled + # wxDEBUG_LEVEL=2 enables assertions that have expensive runtime costs. + # apps can disable these features by building w/ -NDEBUG or wxDEBUG_LEVEL_0. + # http://docs.wxwidgets.org/3.0/overview_debugging.html + # http://groups.google.com/group/wx-dev/browse_thread/thread/c3c7e78d63d7777f/05dee25410052d9c + use debug \ + && myconf="${myconf} --enable-debug=max" + + # wxGTK options + # --enable-graphics_ctx - needed for webkit, editra + # --without-gnomevfs - bug #203389 + use X && \ + myconf="${myconf} + --enable-graphics_ctx + --with-gtkprint + --enable-gui + --with-libpng=sys + --with-libxpm=sys + --with-libjpeg=sys + --without-gnomevfs + $(use_enable gstreamer mediactrl) + $(use_enable webkit webview) + $(use_with libnotify) + $(use_with opengl) + $(use_with tiff libtiff sys)" + + use aqua && \ + myconf="${myconf} + --enable-graphics_ctx + --enable-gui + --with-libpng=sys + --with-libxpm=sys + --with-libjpeg=sys + --with-mac + --with-opengl" + # cocoa toolkit seems to be broken + + # wxBase options + if use !X && use !aqua ; then + myconf="${myconf} + --disable-gui" + fi + + mkdir "${S}"/wxgtk_build + cd "${S}"/wxgtk_build + + ECONF_SOURCE="${S}" econf ${myconf} +} + +src_compile() { + cd "${S}"/wxgtk_build + emake +} + +src_install() { + cd "${S}"/wxgtk_build + + emake DESTDIR="${D}" install + + cd "${S}"/docs + dodoc changes.txt readme.txt + newdoc base/readme.txt base_readme.txt + newdoc gtk/readme.txt gtk_readme.txt + + if use doc; then + dohtml -r "${S}"/docs/doxygen/out/html/* + fi + + # Stray windows locale file, causes collisions + local wxmsw="${ED}usr/share/locale/it/LC_MESSAGES/wxmsw.mo" + [[ -e ${wxmsw} ]] && rm "${wxmsw}" +} + +pkg_postinst() { + has_version app-eselect/eselect-wxwidgets \ + && eselect wxwidgets update +} + +pkg_postrm() { + has_version app-eselect/eselect-wxwidgets \ + && eselect wxwidgets update +} diff --git a/x11-libs/wxGTK/wxGTK-3.0.2.0-r2.ebuild b/x11-libs/wxGTK/wxGTK-3.0.2.0-r2.ebuild new file mode 100644 index 000000000000..c2317a9a6172 --- /dev/null +++ b/x11-libs/wxGTK/wxGTK-3.0.2.0-r2.ebuild @@ -0,0 +1,159 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +inherit eutils flag-o-matic multilib-minimal + +DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit" +HOMEPAGE="http://wxwidgets.org/" + +# we use the wxPython tarballs because they include the full wxGTK sources and +# docs, and are released more frequently than wxGTK. +SRC_URI="mirror://sourceforge/wxpython/wxPython-src-${PV}.tar.bz2 + doc? ( mirror://sourceforge/wxpython/wxPython-docs-${PV}.tar.bz2 )" + +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +IUSE="+X aqua doc debug gstreamer libnotify opengl sdl tiff webkit" + +SLOT="3.0" + +RDEPEND=" + dev-libs/expat[${MULTILIB_USEDEP}] + sdl? ( media-libs/libsdl[${MULTILIB_USEDEP}] ) + X? ( + >=dev-libs/glib-2.22:2[${MULTILIB_USEDEP}] + media-libs/libpng:0=[${MULTILIB_USEDEP}] + sys-libs/zlib[${MULTILIB_USEDEP}] + virtual/jpeg:=[${MULTILIB_USEDEP}] + >=x11-libs/gtk+-2.18:2[${MULTILIB_USEDEP}] + x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}] + x11-libs/libSM[${MULTILIB_USEDEP}] + x11-libs/libXxf86vm[${MULTILIB_USEDEP}] + x11-libs/pango[X,${MULTILIB_USEDEP}] + gstreamer? ( + media-libs/gstreamer:0.10[${MULTILIB_USEDEP}] + media-libs/gst-plugins-base:0.10[${MULTILIB_USEDEP}] ) + libnotify? ( x11-libs/libnotify[${MULTILIB_USEDEP}] ) + opengl? ( virtual/opengl[${MULTILIB_USEDEP}] ) + tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] ) + webkit? ( net-libs/webkit-gtk:2 ) + ) + aqua? ( + >=x11-libs/gtk+-2.4:2[aqua=,${MULTILIB_USEDEP}] + virtual/jpeg:=[${MULTILIB_USEDEP}] + tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] ) + )" + +DEPEND="${RDEPEND} + virtual/pkgconfig[${MULTILIB_USEDEP}] + opengl? ( virtual/glu[${MULTILIB_USEDEP}] ) + X? ( + x11-proto/xproto[${MULTILIB_USEDEP}] + x11-proto/xineramaproto[${MULTILIB_USEDEP}] + x11-proto/xf86vidmodeproto[${MULTILIB_USEDEP}] + )" + +PDEPEND=">=app-eselect/eselect-wxwidgets-20131230" + +LICENSE="wxWinLL-3 + GPL-2 + doc? ( wxWinFDL-3 )" + +S="${WORKDIR}/wxPython-src-${PV}" + +src_prepare() { + epatch "${FILESDIR}"/${PN}-3.0.0.0-collision.patch + epatch_user + + # https://bugs.gentoo.org/536004 + sed \ + -e 's:3\.0\.1:3.0.2:g' \ + -e 's:^wx_release_number=1$:wx_release_number=2:' \ + -i "${S}"/configure || die + +} + +multilib_src_configure() { + local myconf + + # X independent options + myconf=" + --with-zlib=sys + --with-expat=sys + --enable-compat28 + $(use_with sdl)" + + # debug in >=2.9 + # there is no longer separate debug libraries (gtk2ud) + # wxDEBUG_LEVEL=1 is the default and we will leave it enabled + # wxDEBUG_LEVEL=2 enables assertions that have expensive runtime costs. + # apps can disable these features by building w/ -NDEBUG or wxDEBUG_LEVEL_0. + # http://docs.wxwidgets.org/3.0/overview_debugging.html + # http://groups.google.com/group/wx-dev/browse_thread/thread/c3c7e78d63d7777f/05dee25410052d9c + use debug \ + && myconf="${myconf} --enable-debug=max" + + # wxGTK options + # --enable-graphics_ctx - needed for webkit, editra + # --without-gnomevfs - bug #203389 + use X && \ + myconf="${myconf} + --enable-graphics_ctx + --with-gtkprint + --enable-gui + --with-libpng=sys + --with-libxpm=sys + --with-libjpeg=sys + --without-gnomevfs + $(use_enable gstreamer mediactrl) + $(multilib_native_use_enable webkit webview) + $(use_with libnotify) + $(use_with opengl) + $(use_with tiff libtiff sys)" + + use aqua && \ + myconf="${myconf} + --enable-graphics_ctx + --enable-gui + --with-libpng=sys + --with-libxpm=sys + --with-libjpeg=sys + --with-mac + --with-opengl" + # cocoa toolkit seems to be broken + + # wxBase options + if use !X && use !aqua ; then + myconf="${myconf} + --disable-gui" + fi + + ECONF_SOURCE="${S}" econf ${myconf} +} + +multilib_src_install_all() { + cd "${S}"/docs || die + dodoc changes.txt readme.txt + newdoc base/readme.txt base_readme.txt + newdoc gtk/readme.txt gtk_readme.txt + + if use doc; then + dodoc -r "${S}"/docs/doxygen/out/html + fi + + # Stray windows locale file, causes collisions + local wxmsw="${ED}usr/share/locale/it/LC_MESSAGES/wxmsw.mo" + [[ -e ${wxmsw} ]] && rm "${wxmsw}" +} + +pkg_postinst() { + has_version app-eselect/eselect-wxwidgets \ + && eselect wxwidgets update +} + +pkg_postrm() { + has_version app-eselect/eselect-wxwidgets \ + && eselect wxwidgets update +} diff --git a/x11-libs/wxGTK/wxGTK-3.0.2.0.ebuild b/x11-libs/wxGTK/wxGTK-3.0.2.0.ebuild new file mode 100644 index 000000000000..667195eb62a2 --- /dev/null +++ b/x11-libs/wxGTK/wxGTK-3.0.2.0.ebuild @@ -0,0 +1,169 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +inherit eutils flag-o-matic + +DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit" +HOMEPAGE="http://wxwidgets.org/" + +# we use the wxPython tarballs because they include the full wxGTK sources and +# docs, and are released more frequently than wxGTK. +SRC_URI="mirror://sourceforge/wxpython/wxPython-src-${PV}.tar.bz2 + doc? ( mirror://sourceforge/wxpython/wxPython-docs-${PV}.tar.bz2 )" + +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +IUSE="+X aqua doc debug gstreamer libnotify opengl sdl tiff webkit" + +SLOT="3.0" + +RDEPEND=" + dev-libs/expat + sdl? ( media-libs/libsdl ) + X? ( + >=dev-libs/glib-2.22:2 + media-libs/libpng:0= + sys-libs/zlib + virtual/jpeg + >=x11-libs/gtk+-2.18:2 + x11-libs/gdk-pixbuf + x11-libs/libSM + x11-libs/libXxf86vm + x11-libs/pango[X] + gstreamer? ( + media-libs/gstreamer:0.10 + media-libs/gst-plugins-base:0.10 ) + libnotify? ( x11-libs/libnotify ) + opengl? ( virtual/opengl ) + tiff? ( media-libs/tiff:0 ) + webkit? ( net-libs/webkit-gtk:2 ) + ) + aqua? ( + >=x11-libs/gtk+-2.4[aqua=] + virtual/jpeg + tiff? ( media-libs/tiff:0 ) + )" + +DEPEND="${RDEPEND} + virtual/pkgconfig + opengl? ( virtual/glu ) + X? ( + x11-proto/xproto + x11-proto/xineramaproto + x11-proto/xf86vidmodeproto + )" + +PDEPEND=">=app-eselect/eselect-wxwidgets-20131230" + +LICENSE="wxWinLL-3 + GPL-2 + doc? ( wxWinFDL-3 )" + +S="${WORKDIR}/wxPython-src-${PV}" + +src_prepare() { + epatch "${FILESDIR}"/${PN}-3.0.0.0-collision.patch + + # https://bugs.gentoo.org/421851 + # https://bugs.gentoo.org/499984 + sed -i -e "/wx_cv_std_libpath=/s:=.*:=$(get_libdir):" configure || die + + epatch_user +} + +src_configure() { + local myconf + + # X independent options + myconf=" + --with-zlib=sys + --with-expat=sys + --enable-compat28 + $(use_with sdl)" + + # debug in >=2.9 + # there is no longer separate debug libraries (gtk2ud) + # wxDEBUG_LEVEL=1 is the default and we will leave it enabled + # wxDEBUG_LEVEL=2 enables assertions that have expensive runtime costs. + # apps can disable these features by building w/ -NDEBUG or wxDEBUG_LEVEL_0. + # http://docs.wxwidgets.org/3.0/overview_debugging.html + # http://groups.google.com/group/wx-dev/browse_thread/thread/c3c7e78d63d7777f/05dee25410052d9c + use debug \ + && myconf="${myconf} --enable-debug=max" + + # wxGTK options + # --enable-graphics_ctx - needed for webkit, editra + # --without-gnomevfs - bug #203389 + use X && \ + myconf="${myconf} + --enable-graphics_ctx + --with-gtkprint + --enable-gui + --with-libpng=sys + --with-libxpm=sys + --with-libjpeg=sys + --without-gnomevfs + $(use_enable gstreamer mediactrl) + $(use_enable webkit webview) + $(use_with libnotify) + $(use_with opengl) + $(use_with tiff libtiff sys)" + + use aqua && \ + myconf="${myconf} + --enable-graphics_ctx + --enable-gui + --with-libpng=sys + --with-libxpm=sys + --with-libjpeg=sys + --with-mac + --with-opengl" + # cocoa toolkit seems to be broken + + # wxBase options + if use !X && use !aqua ; then + myconf="${myconf} + --disable-gui" + fi + + mkdir "${S}"/wxgtk_build + cd "${S}"/wxgtk_build + + ECONF_SOURCE="${S}" econf ${myconf} +} + +src_compile() { + cd "${S}"/wxgtk_build + emake +} + +src_install() { + cd "${S}"/wxgtk_build + + emake DESTDIR="${D}" install + + cd "${S}"/docs + dodoc changes.txt readme.txt + newdoc base/readme.txt base_readme.txt + newdoc gtk/readme.txt gtk_readme.txt + + if use doc; then + dohtml -r "${S}"/docs/doxygen/out/html/* + fi + + # Stray windows locale file, causes collisions + local wxmsw="${ED}usr/share/locale/it/LC_MESSAGES/wxmsw.mo" + [[ -e ${wxmsw} ]] && rm "${wxmsw}" +} + +pkg_postinst() { + has_version app-eselect/eselect-wxwidgets \ + && eselect wxwidgets update +} + +pkg_postrm() { + has_version app-eselect/eselect-wxwidgets \ + && eselect wxwidgets update +} |