commit: 11088ba712cb6a1dfa2861f44aac83f12ef232bb Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> AuthorDate: Thu Aug 16 21:30:09 2018 +0000 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> CommitDate: Thu Aug 16 21:32:34 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11088ba7
x11-libs/wxGTK: remove last-rited 2.8 SLOT Closes: https://bugs.gentoo.org/661284 Package-Manager: Portage-2.3.46, Repoman-2.3.10 profiles/package.mask | 4 +- x11-libs/wxGTK/Manifest | 1 - .../wxGTK/files/wxGTK-2.8.10.1-odbc-defines.patch | 39 --- x11-libs/wxGTK/files/wxGTK-2.8.11-collision.patch | 74 ----- .../wxGTK/files/wxGTK-2.8.11-unicode-odbc.patch | 13 - x11-libs/wxGTK/files/wxGTK-2.8.12.1-autoconf.patch | 27 -- x11-libs/wxGTK/files/wxGTK-2.8.12.1-bakefile.patch | 25 -- .../wxGTK/files/wxGTK-2.8.12.1-fix-c++14.patch | 77 ------ x11-libs/wxGTK/files/wxGTK-2.8.12.1-libdir.patch | 304 --------------------- x11-libs/wxGTK/files/wxGTK-2.8.7-mmedia.patch | 11 - x11-libs/wxGTK/metadata.xml | 3 - x11-libs/wxGTK/wxGTK-2.8.12.1-r2.ebuild | 184 ------------- 12 files changed, 3 insertions(+), 759 deletions(-) diff --git a/profiles/package.mask b/profiles/package.mask index f509f359eb7..0639e25225a 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -101,7 +101,9 @@ dev-python/django-celery # Mart Raudsepp <l...@gentoo.org> (16 Jul 2018) # Parallel-installable old versions with no remaining consumers # in main tree. Use applications ported to wxGTK:3.0 and -# wxpython:3.0 instead. Bug #661284 +# wxpython:3.0 instead. +# Please keep this package.mask entry until at least 16th Oct 2018 +# for extra notification of the unmerge need. Bug #661284 x11-libs/wxGTK:2.8 dev-python/wxpython:2.8 diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest index 3655a1d2606..ecf85f5bc5f 100644 --- a/x11-libs/wxGTK/Manifest +++ b/x11-libs/wxGTK/Manifest @@ -1,6 +1,5 @@ DIST wxGTK-3.0.3_p20180104.tar.xz 84260 BLAKE2B 3840a4a202778b3e7df0c3470945dd8f083b1b18aa69013ae59975b368cec4f5e9fea3bdd8a05a200fcd146c8616d2258f0b2ee389a6457a638201a8534f9a18 SHA512 840c8248d5a689a462d1dcb9d9962dd453473597d10289802728218a881808f594ff799d2002ceb319d2e79b1b7063d59b181d4a0efff7920a2dee9653b40a72 DIST wxGTK-3.0.4_p20180507.tar.xz 2972 BLAKE2B 431855d43aefac6227925195c107b21f7539ca2709c98f6d6beb7d25dbdf8633c61bb160fb4e5c993e97dbddc37cdf90dc7b09753a312c25b16f79f0207cfe98 SHA512 9caa7ca3b6f15fd70014ccd4008c4fa76f12cb07d3fc58a8f0d2b9a591cf8be3f0eb40497dc757b9d0a04d26f54296aaa8fe693aa601bb1c058365529bb4bc8b -DIST wxPython-src-2.8.12.1.tar.bz2 31311482 BLAKE2B 33b3feb5f1182948badcd5695b35a68c673e36694a2db8c77b0b031b185c94c9f8bcf4753d9cbf8937e99a72f4c393d6f79850ed3d730af20a7263b97c620386 SHA512 4f826ccb57d5f4fc03fe7cae67499be70c727a99aebf9d153ea1060a21641642606d44d079ba897c38b176846336aeaebc21d30d5c7a0abec3934d65cf4529f3 DIST wxWidgets-3.0.3-docs-html.tar.bz2 23803675 BLAKE2B 181305a2b8935adee8d50873665bc094f46a061fe1bcf8521f8a4d5613013d6ad58ce172e56118f3833ce3489ab2e919bbd5482445ce55455e696252bb747d3c SHA512 655efde42e467d1d48d8adb95e2394d90cedca8eb6a54a7d53771d3d2d4d5f72637aea6ea12a4c1f570c3905a458aebea067cd74e184c4c85ca73e49e04282cb DIST wxWidgets-3.0.3.tar.bz2 20054446 BLAKE2B ebbe977a59f215fb2e35300aec91ad6d042d099586c4f6624d817c689feae090ff6df5718baa94a79e8e46120a6b4a154a7e9a584e14363e832602841502f0f6 SHA512 dfe53682d7cda1d460f336a890603c4e823078be4b05e7cf43ab36cb49247f702808aa939d9311705bdf5f96eaa076e7a8f77f4415bc07c5bfdc19e5deff1dd1 DIST wxWidgets-3.0.4-docs-html.tar.bz2 24122986 BLAKE2B ffd38d50e6cb44077f346597863a8dfb1cb5172b9380995082acb23b5b5dae060bc1e3d14307a1146ccd93b5ae9c4fd8fb206346c8d5aced5a535cd3d7f8961a SHA512 2b4cefc98f5f034a8c36237c4979bd02e8b0ed60aaeb31946d8661fb8e5297172cec807e45c96fe2939b012f093950721cda8bf9f750697b50e3741711011ccd 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 deleted file mode 100644 index 3636b64f976..00000000000 --- a/x11-libs/wxGTK/files/wxGTK-2.8.10.1-odbc-defines.patch +++ /dev/null @@ -1,39 +0,0 @@ -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 deleted file mode 100644 index a5c574cb2d6..00000000000 --- a/x11-libs/wxGTK/files/wxGTK-2.8.11-collision.patch +++ /dev/null @@ -1,74 +0,0 @@ -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) $(__inst all_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 deleted file mode 100644 index d272247091b..00000000000 --- a/x11-libs/wxGTK/files/wxGTK-2.8.11-unicode-odbc.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 deleted file mode 100644 index 2701500d7ad..00000000000 --- a/x11-libs/wxGTK/files/wxGTK-2.8.12.1-autoconf.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 4164cd68d45ec4b3b46c22ed981c81f766154428 Mon Sep 17 00:00:00 2001 -From: Vadim Zeitlin <va...@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 deleted file mode 100644 index f497665cef8..00000000000 --- a/x11-libs/wxGTK/files/wxGTK-2.8.12.1-bakefile.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 006b0650b0f390c1e9a19361988b6af7a327e296 Mon Sep 17 00:00:00 2001 -From: nE0sIghT <ykonoto...@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-fix-c++14.patch b/x11-libs/wxGTK/files/wxGTK-2.8.12.1-fix-c++14.patch deleted file mode 100644 index dc9b1435910..00000000000 --- a/x11-libs/wxGTK/files/wxGTK-2.8.12.1-fix-c++14.patch +++ /dev/null @@ -1,77 +0,0 @@ -Fix building with C++14, which errors out due to narrowing conversions. -See also: https://bugs.gentoo.org/show_bug.cgi?id=592442 - -Patch by Francesco Turco - ---- a/src/gtk/bdiag.xbm -+++ b/src/gtk/bdiag.xbm -@@ -1,6 +1,6 @@ - #define bdiag_width 16 - #define bdiag_height 16 - static char bdiag_bits[] = { -- 0x80, 0x80, 0x40, 0x40, 0x20, 0x20, 0x10, 0x10, 0x08, 0x08, 0x04, 0x04, -- 0x02, 0x02, 0x01, 0x01, 0x80, 0x80, 0x40, 0x40, 0x20, 0x20, 0x10, 0x10, -- 0x08, 0x08, 0x04, 0x04, 0x02, 0x02, 0x01, 0x01}; -+ (char)0x80, (char)0x80, (char)0x40, (char)0x40, (char)0x20, (char)0x20, (char)0x10, (char)0x10, (char)0x08, (char)0x08, (char)0x04, (char)0x04, -+ (char)0x02, (char)0x02, (char)0x01, (char)0x01, (char)0x80, (char)0x80, (char)0x40, (char)0x40, (char)0x20, (char)0x20, (char)0x10, (char)0x10, -+ (char)0x08, (char)0x08, (char)0x04, (char)0x04, (char)0x02, (char)0x02, (char)0x01, (char)0x01}; ---- a/src/gtk/cdiag.xbm -+++ b/src/gtk/cdiag.xbm -@@ -1,6 +1,6 @@ - #define cdiag_width 16 - #define cdiag_height 16 - static char cdiag_bits[] = { -- 0x81, 0x81, 0x42, 0x42, 0x24, 0x24, 0x18, 0x18, 0x18, 0x18, 0x24, 0x24, -- 0x42, 0x42, 0x81, 0x81, 0x81, 0x81, 0x42, 0x42, 0x24, 0x24, 0x18, 0x18, -- 0x18, 0x18, 0x24, 0x24, 0x42, 0x42, 0x81, 0x81}; -+ (char)0x81, (char)0x81, (char)0x42, (char)0x42, (char)0x24, (char)0x24, (char)0x18, (char)0x18, (char)0x18, (char)0x18, (char)0x24, (char)0x24, -+ (char)0x42, (char)0x42, (char)0x81, (char)0x81, (char)0x81, (char)0x81, (char)0x42, (char)0x42, (char)0x24, (char)0x24, (char)0x18, (char)0x18, -+ (char)0x18, (char)0x18, (char)0x24, (char)0x24, (char)0x42, (char)0x42, (char)0x81, (char)0x81}; ---- a/src/gtk/cross.xbm -+++ b/src/gtk/cross.xbm -@@ -1,6 +1,6 @@ - #define cross_width 15 - #define cross_height 15 - static char cross_bits[] = { -- 0x84, 0x10, 0x84, 0x10, 0xff, 0x7f, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, -- 0x84, 0x10, 0xff, 0x7f, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, -- 0xff, 0x7f, 0x84, 0x10, 0x84, 0x10}; -+ (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0xff, (char)0x7f, (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10, -+ (char)0x84, (char)0x10, (char)0xff, (char)0x7f, (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10, -+ (char)0xff, (char)0x7f, (char)0x84, (char)0x10, (char)0x84, (char)0x10}; ---- a/src/gtk/fdiag.xbm -+++ b/src/gtk/fdiag.xbm -@@ -1,6 +1,6 @@ - #define fdiag_width 16 - #define fdiag_height 16 - static char fdiag_bits[] = { -- 0x01, 0x01, 0x02, 0x02, 0x04, 0x04, 0x08, 0x08, 0x10, 0x10, 0x20, 0x20, -- 0x40, 0x40, 0x80, 0x80, 0x01, 0x01, 0x02, 0x02, 0x04, 0x04, 0x08, 0x08, -- 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x80, 0x80}; -+ (char)0x01, (char)0x01, (char)0x02, (char)0x02, (char)0x04, (char)0x04, (char)0x08, (char)0x08, (char)0x10, (char)0x10, (char)0x20, (char)0x20, -+ (char)0x40, (char)0x40, (char)0x80, (char)0x80, (char)0x01, (char)0x01, (char)0x02, (char)0x02, (char)0x04, (char)0x04, (char)0x08, (char)0x08, -+ (char)0x10, (char)0x10, (char)0x20, (char)0x20, (char)0x40, (char)0x40, (char)0x80, (char)0x80}; ---- a/src/gtk/horiz.xbm -+++ b/src/gtk/horiz.xbm -@@ -1,6 +1,6 @@ - #define horiz_width 15 - #define horiz_height 15 - static char horiz_bits[] = { -- 0x00, 0x00, 0x00, 0x00, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -- 0x00, 0x00, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -- 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00}; -+ (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0xff, (char)0x7f, (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x00, -+ (char)0x00, (char)0x00, (char)0xff, (char)0x7f, (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x00, -+ (char)0xff, (char)0x7f, (char)0x00, (char)0x00, (char)0x00, (char)0x00}; ---- a/src/gtk/verti.xbm -+++ b/src/gtk/verti.xbm -@@ -1,6 +1,6 @@ - #define verti_width 15 - #define verti_height 15 - static char verti_bits[] = { -- 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, -- 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, -- 0x84, 0x10, 0x84, 0x10, 0x84, 0x10}; -+ (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10, -+ (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10, -+ (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10}; 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 deleted file mode 100644 index db9571438d8..00000000000 --- a/x11-libs/wxGTK/files/wxGTK-2.8.12.1-libdir.patch +++ /dev/null @@ -1,304 +0,0 @@ -From e87336e8d583044d62b1a9400db4c29f1474fa50 Mon Sep 17 00:00:00 2001 -From: nE0sIghT <ykonoto...@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 deleted file mode 100644 index cbe3103a0bc..00000000000 --- a/x11-libs/wxGTK/files/wxGTK-2.8.7-mmedia.patch +++ /dev/null @@ -1,11 +0,0 @@ -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/metadata.xml b/x11-libs/wxGTK/metadata.xml index e8b0e725749..aa10f7e1f6d 100644 --- a/x11-libs/wxGTK/metadata.xml +++ b/x11-libs/wxGTK/metadata.xml @@ -10,9 +10,6 @@ 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. diff --git a/x11-libs/wxGTK/wxGTK-2.8.12.1-r2.ebuild b/x11-libs/wxGTK/wxGTK-2.8.12.1-r2.ebuild deleted file mode 100644 index 5bfab6f5f38..00000000000 --- a/x11-libs/wxGTK/wxGTK-2.8.12.1-r2.ebuild +++ /dev/null @@ -1,184 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit autotools eutils flag-o-matic versionator multilib-minimal - -DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit" -HOMEPAGE="https://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 ~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:0=[${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[aqua=,${MULTILIB_USEDEP}] - virtual/jpeg:0=[${MULTILIB_USEDEP}] - tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] ) - )" - -DEPEND="${RDEPEND} - virtual/pkgconfig[${MULTILIB_USEDEP}] - opengl? ( virtual/glu[${MULTILIB_USEDEP}] ) - X? ( x11-base/xorg-proto ) -" - -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 - epatch "${FILESDIR}"/${PN}-2.8.12.1-fix-c++14.patch # Bug #592442 - - # 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 -}
