summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Eden <sven.eden@prydeworx.com>2020-12-10 18:59:36 +0100
committerSven Eden <sven.eden@prydeworx.com>2020-12-10 19:01:21 +0100
commit7e13a91521c530ab14a2db0a0aa8476c459907a9 (patch)
treefe8679f7beec7ca24fa265f8b14949b6b2c0d659
parentRevert "Let's see whether we can enable wxGTK-3.1-gtk3 slot..." (diff)
downloadseden-7e13a91521c530ab14a2db0a0aa8476c459907a9.tar.gz
seden-7e13a91521c530ab14a2db0a0aa8476c459907a9.tar.bz2
seden-7e13a91521c530ab14a2db0a0aa8476c459907a9.zip
Revert "x11-libs/wxGTK: Add 3.0.5 and 3.1.4 (slotted) ebuilds"
(Not worth the hassle...) This reverts commit 6e07e658e0337726fef9e37c65240142837582fa. Signed-off-by: Sven Eden <sven.eden@prydeworx.com>
-rw-r--r--x11-libs/wxGTK/Manifest4
-rw-r--r--x11-libs/wxGTK/files/0088-Don-t-include-webview-in-standard-libraries.patch62
-rw-r--r--x11-libs/wxGTK/files/wxGTK-3.0-gtk3-translation-domain.patch13
-rw-r--r--x11-libs/wxGTK/files/wxGTK-3.0.5-collision.patch75
-rw-r--r--x11-libs/wxGTK/files/wxGTK-3.1-gtk3-translation-domain.patch13
-rw-r--r--x11-libs/wxGTK/files/wxGTK-ignore-c++-abi.patch39
-rw-r--r--x11-libs/wxGTK/metadata.xml30
-rw-r--r--x11-libs/wxGTK/wxGTK-3.0.5-r300.ebuild184
-rw-r--r--x11-libs/wxGTK/wxGTK-3.1.4-r300.ebuild186
9 files changed, 0 insertions, 606 deletions
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
deleted file mode 100644
index 643fdec..0000000
--- a/x11-libs/wxGTK/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST wxWidgets-3.0.5-docs-html.tar.bz2 23844256 SHA256 1c0c6a72821111eaf533e3f8912e17db0647c9cce0fafd4f2d50478f1e0d616e SHA512 f839e67660f2b08aa28d1596a3b7af2c35f7c2c0505c6e6d45888845397212b3dd71c8d34115321e9a4347b9d92a0ce767bb76defd14c172e51c2a3df96cc3ac WHIRLPOOL 8cb486f05a34b22b5841e6d8a6bfb690decc4ee2fdacf0f38d959d758624b76cbf94af80787e821340eb30c1229bbe1556269848322090371871af71fd36893c
-DIST wxWidgets-3.0.5.tar.bz2 20076030 SHA256 8aacd56b462f42fb6e33b4d8f5d40be5abc3d3b41348ea968aa515cc8285d813 SHA512 ea614d56571ab036983c5d988240d65ae5a94c5c37ee68aa59a904440acc54173cca5def73b5f7b130a40ddc85b5cccc4d8b3d5a36e69c500bbdcfc8b62958cb WHIRLPOOL 868094741ace70042324b92522cc5df802c4f926eb535da7167c5f7a72c85da6d50e1643fbbf053c0d2235d96c6880fd806520185b300ebf7b6daf409c65e17f
-DIST wxWidgets-3.1.4-docs-html.tar.bz2 25374105 SHA256 dce37df02a7ca5e6223ad574a7bd1b183116c3620df48dd54851b2c134b4bd98 SHA512 e1bb3030a13ca999ed2b5749f4a9c254c73d9957183222378f47d2ed7793257433c23acd84a4edd3261fd31bae7ade9c0692426976086a37f973402171254fcb WHIRLPOOL fc0454f0d27d3383a573b10aec83e9d6bae94b7887fe21700db7338642def02263b8dd5e2b6647ea7e560b2d855455d3784d2c5c5067948ff8c299c8146c51c1
-DIST wxWidgets-3.1.4.tar.bz2 21581661 SHA256 3ca3a19a14b407d0cdda507a7930c2e84ae1c8e74f946e0144d2fa7d881f1a94 SHA512 aabb257fa222eb819f1e16086977b0ecfd3eb3406d695e0e642ffdb8b4dc586a9721404916be4756a2d92a1a8dc41b661b54717a64e03850a8a92d32d45ece14 WHIRLPOOL 208f697c5e2e60bed47eec82bd9e015bd51caf4e9d07747ee47a427c3fda299e45a8dc76f1b7b34cd7bfdcafdd6e83aaf9b67afa2163a62e45e9ea83d9154196
diff --git a/x11-libs/wxGTK/files/0088-Don-t-include-webview-in-standard-libraries.patch b/x11-libs/wxGTK/files/0088-Don-t-include-webview-in-standard-libraries.patch
deleted file mode 100644
index c127c9b..0000000
--- a/x11-libs/wxGTK/files/0088-Don-t-include-webview-in-standard-libraries.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 25db56174cd8b621dbb154c531cced7ce5d64c4b Mon Sep 17 00:00:00 2001
-From: Vadim Zeitlin <vadim@wxwidgets.org>
-Date: Tue, 27 May 2014 23:59:10 +0000
-Subject: [PATCH] Don't include "webview" in "standard" libraries.
-
-This means `wx-config --libs` doesn't include webview in its output by default
-any longer, it must be explicitly requested.
-
-Closes #16291.
-
-git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76616 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
-(cherry picked from commit a309157a666e2f7582a9134699a69f2548d99949)
----
- configure | 1 -
- configure.in | 1 -
- docs/changes.txt | 6 ++++++
- 3 files changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/configure b/configure
-index 921378935e..bd9119ac43 100755
---- a/configure
-+++ b/configure
-@@ -37629,7 +37629,6 @@ if test "$wxUSE_GUI" = "yes"; then
- BUILT_WX_LIBS="stc $BUILT_WX_LIBS"
- fi
- if test "$wxUSE_WEBVIEW" = "yes" ; then
-- STD_GUI_LIBS="webview $STD_GUI_LIBS"
- BUILT_WX_LIBS="webview $BUILT_WX_LIBS"
- fi
- if test "$wxUSE_XRC" = "yes" ; then
-diff --git a/configure.in b/configure.in
-index 0b8c88a356..933aacc9f9 100644
---- a/configure.in
-+++ b/configure.in
-@@ -7837,7 +7837,6 @@ if test "$wxUSE_GUI" = "yes"; then
- BUILT_WX_LIBS="stc $BUILT_WX_LIBS"
- fi
- if test "$wxUSE_WEBVIEW" = "yes" ; then
-- STD_GUI_LIBS="webview $STD_GUI_LIBS"
- BUILT_WX_LIBS="webview $BUILT_WX_LIBS"
- fi
- if test "$wxUSE_XRC" = "yes" ; then
-diff --git a/docs/changes.txt b/docs/changes.txt
-index 92f74d9ecc..2205a3dd84 100644
---- a/docs/changes.txt
-+++ b/docs/changes.txt
-@@ -18,6 +18,12 @@ Table of contents of this section:
- - Build system changes
- - Major new features in this release
-
-+Changes in behaviour which may result in build errors
-+-----------------------------------------------------
-+
-+- "webview" library is not included in `wx-config --libs` output any more, you
-+ need to request it explicitly, e.g. `wx-config --libs std,webview`.
-+
-
- Unicode-related changes
- -----------------------
---
-2.21.0
-
diff --git a/x11-libs/wxGTK/files/wxGTK-3.0-gtk3-translation-domain.patch b/x11-libs/wxGTK/files/wxGTK-3.0-gtk3-translation-domain.patch
deleted file mode 100644
index 3b449ba..0000000
--- a/x11-libs/wxGTK/files/wxGTK-3.0-gtk3-translation-domain.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Modify AddStdCatalog to use the versioned wxstd30-gtk3.mo.
-
---- 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("wxstd30-gtk3")) )
- return false;
-
- // there may be a catalog with toolkit specific overrides, it is not
diff --git a/x11-libs/wxGTK/files/wxGTK-3.0.5-collision.patch b/x11-libs/wxGTK/files/wxGTK-3.0.5-collision.patch
deleted file mode 100644
index 69531cc..0000000
--- a/x11-libs/wxGTK/files/wxGTK-3.0.5-collision.patch
+++ /dev/null
@@ -1,75 +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. 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) $(__webkit2_ext___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_webkit2_ext___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_SCRIPT) 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/files/wxGTK-3.1-gtk3-translation-domain.patch b/x11-libs/wxGTK/files/wxGTK-3.1-gtk3-translation-domain.patch
deleted file mode 100644
index d2978a3..0000000
--- a/x11-libs/wxGTK/files/wxGTK-3.1-gtk3-translation-domain.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Modify AddStdCatalog to use the versioned wxstd30-gtk3.mo.
-
---- 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("wxstd31-gtk3")) )
- return false;
-
- // there may be a catalog with toolkit specific overrides, it is not
diff --git a/x11-libs/wxGTK/files/wxGTK-ignore-c++-abi.patch b/x11-libs/wxGTK/files/wxGTK-ignore-c++-abi.patch
deleted file mode 100644
index 30026eb..0000000
--- a/x11-libs/wxGTK/files/wxGTK-ignore-c++-abi.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Description: Suppress error about mismatching C++ ABI version
- In practice, the differences between recent ABI versions don't seem to be
- incompatible since they apparently only affect obscure corner cases. So
- suppress this error so we don't have to rebuild the entire wx world in one
- go.
-Author: Olly Betts <olly@survex.com>
-Forwarded: no
-Last-Update: 2017-07-26
-From: https://salsa.debian.org/freewx-team/wx/blob/wx3.0-debian/debian/patches/warn-for-compiler-abi-mismatch.patch
-
---- a/src/common/appbase.cpp
-+++ b/src/common/appbase.cpp
-@@ -762,6 +762,26 @@
- msg.Printf(wxT("Mismatch between the program and library build versions detected.\nThe library used %s,\nand %s used %s."),
- lib.c_str(), progName.c_str(), prog.c_str());
-
-+ int l_off = lib.Find("compiler with C++ ABI ");
-+ int p_off = prog.Find("compiler with C++ ABI ");
-+ if (l_off != wxNOT_FOUND && p_off != wxNOT_FOUND) {
-+ int space;
-+ space = lib.find(',', l_off + 22);
-+ lib.erase(l_off, space - l_off);
-+ space = prog.find(',', p_off + 22);
-+ prog.erase(p_off, space - p_off);
-+ if (lib == prog) {
-+ // The only difference is the ABI version, which apparently only
-+ // affect obscure cases. We used to warn here, so at least
-+ // there was an indication of what's up if there is a problem
-+ // due to ABI incompatibilities, but wxLogWarning() can result
-+ // in a pop up dialog with some applications, which is just too
-+ // intrusive, so just quietly ignore instead.
-+ //wxLogWarning(msg.c_str());
-+ return false;
-+ }
-+ }
-+
- wxLogFatalError(msg.c_str());
-
- // normally wxLogFatalError doesn't return
diff --git a/x11-libs/wxGTK/metadata.xml b/x11-libs/wxGTK/metadata.xml
deleted file mode 100644
index 14caf8a..0000000
--- a/x11-libs/wxGTK/metadata.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <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="libmspack">
- Use <pkg>dev-libs/libmspack</pkg>) to acess Microsoft compression formats.
- </flag>
- <flag name="sdl">
- Use Simple Directmedia Layer (<pkg>media-libs/libsdl</pkg>) for
- audio.
- </flag>
- <flag name="stl">
- Default to use STL C++ classes.
- </flag>
- </use>
- <upstream>
- <remote-id type="sourceforge">wxpython</remote-id>
- </upstream>
- <slots>
- <slot name="*">Slots reflect MAJOR.MINOR versions which can be installed in parallel.</slot>
- </slots>
-</pkgmetadata>
diff --git a/x11-libs/wxGTK/wxGTK-3.0.5-r300.ebuild b/x11-libs/wxGTK/wxGTK-3.0.5-r300.ebuild
deleted file mode 100644
index f1c4248..0000000
--- a/x11-libs/wxGTK/wxGTK-3.0.5-r300.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib-minimal
-
-DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
-HOMEPAGE="https://wxwidgets.org/"
-SRC_URI="https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}.tar.bz2
- doc? ( https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}-docs-html.tar.bz2 )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="+X aqua doc debug gstreamer libnotify opengl sdl tiff webkit"
-
-WXSUBVERSION=${PV}.0-gtk3 # 3.0.5.0-gtk3
-WXVERSION=${WXSUBVERSION%.*} # 3.0.5
-WXRELEASE=${WXVERSION%.*}-gtk3 # 3.0-gtk3
-WXRELEASE_NODOT=${WXRELEASE//./} # 30-gtk3
-
-SLOT="${WXRELEASE}"
-
-RDEPEND="
- dev-libs/expat[${MULTILIB_USEDEP}]
- sdl? ( media-libs/libsdl2[${MULTILIB_USEDEP}] )
- X? (
- >=dev-libs/glib-2.22:2[${MULTILIB_USEDEP}]
- media-libs/libpng:0=[${MULTILIB_USEDEP}]
- sys-libs/zlib[${MULTILIB_USEDEP}]
- virtual/jpeg:0=[${MULTILIB_USEDEP}]
- x11-libs/cairo[${MULTILIB_USEDEP}]
- x11-libs/gtk+:3[${MULTILIB_USEDEP}]
- x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}]
- x11-libs/libSM[${MULTILIB_USEDEP}]
- x11-libs/libX11[${MULTILIB_USEDEP}]
- x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
- x11-libs/pango[${MULTILIB_USEDEP}]
- gstreamer? (
- media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
- media-libs/gst-plugins-base:1.0[${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:4 )
- )
- aqua? (
- x11-libs/gtk+:3[aqua=,${MULTILIB_USEDEP}]
- virtual/jpeg:0=[${MULTILIB_USEDEP}]
- tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
- )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- opengl? ( virtual/glu[${MULTILIB_USEDEP}] )
- X? ( x11-base/xorg-proto )"
-
-PDEPEND=">=app-eselect/eselect-wxwidgets-20131230"
-
-LICENSE="wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )"
-
-S="${WORKDIR}/wxWidgets-${PV}"
-
-PATCHES=(
- "${FILESDIR}"/0088-Don-t-include-webview-in-standard-libraries.patch
- "${FILESDIR}"/wxGTK-${SLOT}-translation-domain.patch
- "${FILESDIR}"/wxGTK-ignore-c++-abi.patch #676878
-)
-
-src_prepare() {
- default
-
- # Versionating
- sed -i \
- -e "s:\(WX_RELEASE = \).*:\1${WXRELEASE}:"\
- -e "s:\(WX_RELEASE_NODOT = \).*:\1${WXRELEASE_NODOT}:"\
- -e "s:\(WX_VERSION = \).*:\1${WXVERSION}:"\
- -e "s:aclocal):aclocal/wxwin${WXRELEASE_NODOT}.m4):" \
- -e "s:wxstd.mo:wxstd${WXRELEASE_NODOT}.mo:" \
- -e "s:wxmsw.mo:wxmsw${WXRELEASE_NODOT}.mo:" \
- Makefile.in || die
-
- sed -i \
- -e "s:\(WX_RELEASE = \).*:\1${WXRELEASE}:"\
- utils/wxrc/Makefile.in || die
-
- sed -i \
- -e "s:\(WX_VERSION=\).*:\1${WXVERSION}:" \
- -e "s:\(WX_RELEASE=\).*:\1${WXRELEASE}:" \
- -e "s:\(WX_SUBVERSION=\).*:\1${WXSUBVERSION}:" \
- -e '/WX_VERSION_TAG=/ s:${WX_RELEASE}:3.0:' \
- 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
- # https://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-gtk=3
- --with-libpng=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
-
- use doc && HTML_DOCS="${WORKDIR}"/wxWidgets-${PV}-docs-html/.
- einstalldocs
-
- # Stray windows locale file, bug #650118
- local wxmsw="${ED}usr/share/locale/it/LC_MESSAGES/wxmsw30-gtk3.mo"
- [[ -e ${wxmsw} ]] && rm "${wxmsw}"
-
- # Unversioned links
- rm "${D}"/usr/bin/wx{-config,rc}
-
- # version bakefile presets
- pushd "${D}"usr/share/bakefile/presets/ > /dev/null
- for f in wx*; do
- mv "${f}" "${f/wx/wx30gtk3}"
- done
- popd > /dev/null
-}
-
-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.1.4-r300.ebuild b/x11-libs/wxGTK/wxGTK-3.1.4-r300.ebuild
deleted file mode 100644
index b0bdff4..0000000
--- a/x11-libs/wxGTK/wxGTK-3.1.4-r300.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib-minimal
-
-DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
-HOMEPAGE="https://wxwidgets.org/"
-SRC_URI="https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}.tar.bz2
- doc? ( https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}-docs-html.tar.bz2 )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="+X aqua doc debug gstreamer libmspack libnotify opengl sdl stl tiff webkit"
-
-WXSUBVERSION=${PV}.0-gtk3 # 3.1.4.0-gtk3
-WXVERSION=${WXSUBVERSION%.*} # 3.1.4
-WXRELEASE=${WXVERSION%.*}-gtk3 # 3.1-gtk3
-WXRELEASE_NODOT=${WXRELEASE//./} # 31-gtk3
-
-SLOT="${WXRELEASE}"
-
-RDEPEND="
- dev-libs/expat[${MULTILIB_USEDEP}]
- sdl? ( media-libs/libsdl2[${MULTILIB_USEDEP}] )
- X? (
- >=dev-libs/glib-2.22:2[${MULTILIB_USEDEP}]
- media-libs/libpng:0=[${MULTILIB_USEDEP}]
- sys-libs/zlib[${MULTILIB_USEDEP}]
- virtual/jpeg:0=[${MULTILIB_USEDEP}]
- x11-libs/cairo[${MULTILIB_USEDEP}]
- x11-libs/gtk+:3[${MULTILIB_USEDEP}]
- x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}]
- x11-libs/libSM[${MULTILIB_USEDEP}]
- x11-libs/libX11[${MULTILIB_USEDEP}]
- x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
- x11-libs/pango[${MULTILIB_USEDEP}]
- gstreamer? (
- media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
- media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}] )
- libmspack? ( dev-libs/libmspack[${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:4 )
- )
- aqua? (
- x11-libs/gtk+:3[aqua=,${MULTILIB_USEDEP}]
- virtual/jpeg:0=[${MULTILIB_USEDEP}]
- tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
- )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- opengl? ( virtual/glu[${MULTILIB_USEDEP}] )
- X? ( x11-base/xorg-proto )"
-
-PDEPEND=">=app-eselect/eselect-wxwidgets-20131230"
-
-LICENSE="wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )"
-
-S="${WORKDIR}/wxWidgets-${PV}"
-
-PATCHES=(
- "${FILESDIR}"/wxGTK-${SLOT}-translation-domain.patch
- "${FILESDIR}"/wxGTK-ignore-c++-abi.patch #676878
-)
-
-src_prepare() {
- default
-
- # Versionating
- sed -i \
- -e "s:\(WX_RELEASE = \).*:\1${WXRELEASE}:"\
- -e "s:\(WX_RELEASE_NODOT = \).*:\1${WXRELEASE_NODOT}:"\
- -e "s:\(WX_VERSION = \).*:\1${WXVERSION}:"\
- -e "s:aclocal):aclocal/wxwin${WXRELEASE_NODOT}.m4):" \
- -e "s:wxstd.mo:wxstd${WXRELEASE_NODOT}.mo:" \
- -e "s:wxmsw.mo:wxmsw${WXRELEASE_NODOT}.mo:" \
- Makefile.in || die
-
- sed -i \
- -e "s:\(WX_RELEASE = \).*:\1${WXRELEASE}:"\
- utils/wxrc/Makefile.in || die
-
- sed -i \
- -e "s:\(WX_VERSION=\).*:\1${WXVERSION}:" \
- -e "s:\(WX_RELEASE=\).*:\1${WXRELEASE}:" \
- -e "s:\(WX_SUBVERSION=\).*:\1${WXSUBVERSION}:" \
- -e '/WX_VERSION_TAG=/ s:${WX_RELEASE}:3.0:' \
- configure || die
-}
-
-multilib_src_configure() {
- local myconf
-
- # X independent options
- myconf="
- --with-zlib=sys
- --with-expat=sys
- --enable-compat28
- $(use_enable stl)
- $(use_with libmspack)
- $(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
- # https://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-gtk=3
- --with-libpng=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
-
- use doc && HTML_DOCS="${WORKDIR}"/wxWidgets-${PV}-docs-html/.
- einstalldocs
-
- # Stray windows locale file, bug #650118
- local wxmsw="${ED}usr/share/locale/it/LC_MESSAGES/wxmsw31-gtk3.mo"
- [[ -e ${wxmsw} ]] && rm "${wxmsw}"
-
- # Unversioned links
- rm "${D}"/usr/bin/wx{-config,rc}
-
- # version bakefile presets
- pushd "${D}"usr/share/bakefile/presets/ > /dev/null
- for f in wx*; do
- mv "${f}" "${f/wx/wx31gtk3}"
- done
- popd > /dev/null
-}
-
-pkg_postinst() {
- has_version app-eselect/eselect-wxwidgets \
- && eselect wxwidgets update
-}
-
-pkg_postrm() {
- has_version app-eselect/eselect-wxwidgets \
- && eselect wxwidgets update
-}