commit: 97b99746cd649bf647f4790b8d80507247eb73e9
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Thu May 15 11:51:07 2025 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu May 15 11:51:07 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97b99746
x11-libs/wxGTK: drop 3.2.2.1-r5, 3.2.5, 3.2.5-r1
Signed-off-by: David Seifert <soap <AT> gentoo.org>
x11-libs/wxGTK/Manifest | 4 -
.../wxGTK-3.2.1-gtk3-translation-domain.patch | 12 -
.../files/wxGTK-3.2.2.1-backport-pr24197.patch | 88 -------
.../files/wxGTK-3.2.2.1-dont-break-flags.patch | 48 ----
x11-libs/wxGTK/wxGTK-3.2.2.1-r5.ebuild | 262 ---------------------
x11-libs/wxGTK/wxGTK-3.2.5-r1.ebuild | 262 ---------------------
x11-libs/wxGTK/wxGTK-3.2.5.ebuild | 258 --------------------
7 files changed, 934 deletions(-)
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index a881375950d7..18186a0400b5 100644
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -1,7 +1,3 @@
-DIST wxWidgets-3.2.2.1-docs-html.tar.bz2 18109775 BLAKE2B
bb5dad886c2ba64feb9ec3be05f2cd4bcfb127d55f0a0af6d0aa59ee8f47663e39e7fcb3c0472cfdda9fbf99f1d32e07ff29604261e168f3b4218b9b5b61abc2
SHA512
9b883e1c611ac78f7b8457ffd8682c614d7653f561215c48e6239b6394cc4c084b34d6c55fe84fb7b76b38189591e94dc4596242f9e8653d2c72ae6f4b3a6293
-DIST wxWidgets-3.2.2.1.tar.bz2 27339515 BLAKE2B
e761e768dbb32bf76dbabf27aa9feb634760aa214c2d8f85f9b4284700d01390617c275a855fa3ae28481a38233f3a71f8560e5a8a360d7b72ace2603c551327
SHA512
289d61ea2abd75a329aafcbd347ab84b136f31fca01dd902593f661691ecd30a4416286ff501c4257baa6765cf356ade3087eb8609af9a44599cfdc20e2f03a6
-DIST wxWidgets-3.2.5-docs-html.tar.bz2 18205089 BLAKE2B
8bf09c0f9698e72e425a4e4fcbd57498851c93f02dca33fadcd785e04f3927807ff65e8b7dbecaadde64b2bf7653e950a93c5d522ff4e27a8e3baaa85ef6c692
SHA512
cc80c827c4f8607ef38e435eb7fd5dab9fcad5e93ab81bca262d212f5a061b85093d1bc1a1bdc82a7422c4744b6fdd5c82f3142b6a497e85067f571ce9513f5e
-DIST wxWidgets-3.2.5.tar.bz2 27539152 BLAKE2B
e262860b5d64d30576bbe61913d14c98c7e56bc1f108696abe0d446145e8c8cea3711bae4f3248c7def06ee988ee4441652376113ad2b4f04402249d7c1e6961
SHA512
b5bd8e4b53b7c44f79b76a39de0071d14e1f0325e66b7a9f2c7f1934a4146be3c78332f610119f7ba46ca4cd1055272a3d8937ad46665ce5abd867a803f22c86
DIST wxWidgets-3.2.6-docs-html.tar.bz2 18221396 BLAKE2B
cc990c848517a47664d4b14638aeaf97ffc57df29ae544e4a90bd15bcb2998fcd19f540d2e2453813197cae64a53f336fd259a99f392256cb6456376f3f6c926
SHA512
f2399f8dd205645c7dfd9fbdf89cf0b11145489cad9e218d592c2778f2a8734e6f852c99009b905b649cc0796612389d0755feedcb523b44c9bb3d631964d5f1
DIST wxWidgets-3.2.6.tar.bz2 27528560 BLAKE2B
6d35a9acd3fa0dbcce3ea38367119eb572c7cf2f63598bac87050d122af7ce6a339892dd5f15d9832e47dac058893fb8b1f4a73db14aa7911a54a31ea52cf22a
SHA512
87830a73df096ab35d4ff7e131872131153da76f76c58d70e57558915c3faea280af193104163ce24e9e249a62b8e65d19ebfa20046ce0d2c45b2368b108619f
DIST wxWidgets-3.2.7-docs-html.tar.bz2 18282275 BLAKE2B
685b0758236bc63fe2a6fcf595e0944fa23cb8c9994ccd9e7281c5246d59be54114503685d9f7794d6569057a6326456f5b8104de43d8f8a1e282372de7a1df4
SHA512
52e4b5d05aaa76aa1bb4bf5bb2f5809cef7bd3d17aacce3d7505f6712cc2188a2a6120349b08f55c5be1096f8ce9417bb86f597ea80a86cf27ea9428c5596c8b
diff --git a/x11-libs/wxGTK/files/wxGTK-3.2.1-gtk3-translation-domain.patch
b/x11-libs/wxGTK/files/wxGTK-3.2.1-gtk3-translation-domain.patch
deleted file mode 100644
index 9fbb9d8bc064..000000000000
--- a/x11-libs/wxGTK/files/wxGTK-3.2.1-gtk3-translation-domain.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Modify AddStdCatalog to use the versioned wxstd32-gtk3.mo.
---- a/src/common/translation.cpp
-+++ b/src/common/translation.cpp
-@@ -1409,7 +1409,7 @@ bool wxTranslations::AddStdCatalog()
- if ( AddCatalog("wxstd-" wxSTRINGIZE(wxMAJOR_VERSION) "."
wxSTRINGIZE(wxMINOR_VERSION)) )
- return true;
-
-- if ( AddCatalog(wxS("wxstd")) )
-+ if ( AddCatalog(wxS("wxstd32-gtk3")) )
- return true;
-
- return false;
diff --git a/x11-libs/wxGTK/files/wxGTK-3.2.2.1-backport-pr24197.patch
b/x11-libs/wxGTK/files/wxGTK-3.2.2.1-backport-pr24197.patch
deleted file mode 100644
index 2adf03aef45b..000000000000
--- a/x11-libs/wxGTK/files/wxGTK-3.2.2.1-backport-pr24197.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-https://bugs.gentoo.org/916884
-https://github.com/wxWidgets/wxWidgets/pull/24197
-
-From 891bfff867b7dc92ed6330ea46ee2dcfa5424ee0 Mon Sep 17 00:00:00 2001
-From: Cliff Zhao <[email protected]>
-Date: Thu, 4 Jan 2024 08:01:00 +0100
-Subject: [PATCH] Fix testsuite failures on s390x
-
-``/sys/power/state`` does not exist on s390x platforms and certain
-types of containers, so check that the file exist before running the
-test case.
-
-Output from ``make check`` was:
-
- ./textfile/textfiletest.cpp:351
-
...............................................................................
-
- ./textfile/textfiletest.cpp:354: FAILED:
- CHECK( f.Open("/sys/power/state") )
- with expansion:
- false
-
- ./textfile/textfiletest.cpp:355: FAILED:
- REQUIRE( f.GetLineCount() == 1 )
- with expansion:
- 0 == 1
----
- tests/file/filetest.cpp | 2 ++
- tests/filename/filenametest.cpp | 2 ++
- tests/textfile/textfiletest.cpp | 2 ++
- 3 files changed, 6 insertions(+)
-
-diff --git a/tests/file/filetest.cpp b/tests/file/filetest.cpp
-index 8902eb4d6684..fc3c90569480 100644
---- a/tests/file/filetest.cpp
-+++ b/tests/file/filetest.cpp
-@@ -153,6 +153,7 @@ TEST_CASE("wxFile::Special", "[file][linux][special-file]")
- CHECK( fileProc.ReadAll(&s) );
- CHECK( !s.empty() );
-
-+ if ( wxFile::Exists("/sys/power/state") ) {
- // All files in /sys have the size of one kernel page, even if they don't
- // have that much data in them.
- const long pageSize = sysconf(_SC_PAGESIZE);
-@@ -163,6 +164,7 @@ TEST_CASE("wxFile::Special", "[file][linux][special-file]")
- CHECK( fileSys.ReadAll(&s) );
- CHECK( !s.empty() );
- CHECK( s.length() < pageSize );
-+ }
- }
-
- #endif // __LINUX__
-diff --git a/tests/filename/filenametest.cpp b/tests/filename/filenametest.cpp
-index 84356b39f719..ce2ec2af2760 100644
---- a/tests/filename/filenametest.cpp
-+++ b/tests/filename/filenametest.cpp
-@@ -1040,9 +1040,11 @@ TEST_CASE("wxFileName::GetSizeSpecial",
"[filename][linux][special-file]")
- INFO( "size of /proc/kcore=" << size );
- CHECK( size > 0 );
-
-+ if ( wxFile::Exists("/sys/power/state") ) {
- // All files in /sys are one page in size, irrespectively of the size of
- // their actual contents.
- CHECK( wxFileName::GetSize("/sys/power/state") == sysconf(_SC_PAGESIZE) );
-+ }
- }
-
- #endif // __LINUX__
-diff --git a/tests/textfile/textfiletest.cpp b/tests/textfile/textfiletest.cpp
-index f744ffc3271b..73467be8f85f 100644
---- a/tests/textfile/textfiletest.cpp
-+++ b/tests/textfile/textfiletest.cpp
-@@ -348,6 +348,7 @@ TEST_CASE("wxTextFile::Special",
"[textfile][linux][special-file]")
- CHECK( f.GetLineCount() > 1 );
- }
-
-+ if ( wxFile::Exists("/sys/power/state") ) {
- SECTION("/sys")
- {
- wxTextFile f;
-@@ -356,6 +357,7 @@ TEST_CASE("wxTextFile::Special",
"[textfile][linux][special-file]")
- INFO( "/sys/power/state contains \"" << f[0] << "\"" );
- CHECK( (f[0].find("mem") != wxString::npos || f[0].find("disk") !=
wxString::npos) );
- }
-+ }
- }
-
- #endif // __LINUX__
diff --git a/x11-libs/wxGTK/files/wxGTK-3.2.2.1-dont-break-flags.patch
b/x11-libs/wxGTK/files/wxGTK-3.2.2.1-dont-break-flags.patch
deleted file mode 100644
index db351b29d648..000000000000
--- a/x11-libs/wxGTK/files/wxGTK-3.2.2.1-dont-break-flags.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From f092f50b794b487e552e930b11d165a736fc8edb Mon Sep 17 00:00:00 2001
-From: Arsen Arsenović <[email protected]>
-Date: Sun, 2 Apr 2023 13:25:11 +0200
-Subject: [PATCH] configure: Remove flag deduplication logic
-
-Parsing compiler flags is a complex task that this function screws up.
-
-Bug: https://bugs.gentoo.org/903668
----
- configure | 5 ++---
- configure.in | 5 ++---
- 2 files changed, 4 insertions(+), 6 deletions(-)
-
-diff --git a/configure b/configure
-index a476a3c..a9b815b 100755
---- a/configure
-+++ b/configure
-@@ -45550,9 +45550,8 @@ esac
-
- dedup_flags()
- {
-- printf "%s " "$@" |
-- awk 'BEGIN { RS=" "; ORS=" " }
-- { if ($0=="-arch" || $0=="-framework" || !seen[$0]++) print }'
-+ # Gentoo: Don't hack out flags, parsing them is complex.
-+ printf '%s ' "$@"
- }
-
- WX_CPPFLAGS=`dedup_flags "$CPPFLAGS"`
-diff --git a/configure.in b/configure.in
-index a4c4178..9cf9c30 100644
---- a/configure.in
-+++ b/configure.in
-@@ -8570,9 +8570,8 @@ dnl flags which are explicitly allowed to occur multiple
times, as all their
- dnl occurrences must be preserved).
- dedup_flags()
- {
-- printf "%s " "$@" |
-- awk 'BEGIN { RS=" "; ORS=" " }
-- { if ($0=="-arch" || $0=="-framework" || !seen[[$0]]++) print }'
-+ # Gentoo: Don't hack out flags, parsing them is complex.
-+ printf '%s ' "$@"
- }
-
- WX_CPPFLAGS=`dedup_flags "$CPPFLAGS"`
---
-2.40.0
-
diff --git a/x11-libs/wxGTK/wxGTK-3.2.2.1-r5.ebuild
b/x11-libs/wxGTK/wxGTK-3.2.2.1-r5.ebuild
deleted file mode 100644
index a694537d0a36..000000000000
--- a/x11-libs/wxGTK/wxGTK-3.2.2.1-r5.ebuild
+++ /dev/null
@@ -1,262 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit multilib-minimal flag-o-matic
-
-WXSUBVERSION="${PV}-gtk3" # 3.2.1-gtk3
-WXVERSION="$(ver_cut 1-3)" # 3.2.1
-# Make sure that this matches the number of components in ${PV}
-WXRELEASE="$(ver_cut 1-2)-gtk3" # 3.2-gtk3
-WXRELEASE_NODOT=${WXRELEASE//./} # 32-gtk3
-
-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
)"
-S="${WORKDIR}/wxWidgets-${PV}"
-
-LICENSE="wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )"
-SLOT="${WXRELEASE}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86
~amd64-linux ~x86-linux"
-IUSE="+X curl doc debug keyring gstreamer libnotify +lzma opengl pch sdl
+spell test tiff wayland webkit X"
-REQUIRED_USE="test? ( tiff ) tiff? ( X ) spell? ( X ) keyring? ( X )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=app-eselect/eselect-wxwidgets-20131230
- dev-libs/expat[${MULTILIB_USEDEP}]
- dev-libs/libpcre2[pcre16,pcre32,unicode]
- sdl? ( media-libs/libsdl2[${MULTILIB_USEDEP}] )
- curl? ( net-misc/curl )
- lzma? ( app-arch/xz-utils )
- X? (
- >=dev-libs/glib-2.22:2[${MULTILIB_USEDEP}]
- media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}]
- media-libs/libpng:0=[${MULTILIB_USEDEP}]
- sys-libs/zlib[${MULTILIB_USEDEP}]
- x11-libs/cairo[${MULTILIB_USEDEP}]
- >=x11-libs/gtk+-3.24.41-r1:3[wayland?,X?,${MULTILIB_USEDEP}]
- x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
- x11-libs/libSM[${MULTILIB_USEDEP}]
- x11-libs/libX11[${MULTILIB_USEDEP}]
- x11-libs/libXtst
- x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
- media-libs/fontconfig
- x11-libs/pango[${MULTILIB_USEDEP}]
- keyring? ( app-crypt/libsecret )
- gstreamer? (
- media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
- media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
- media-libs/gst-plugins-bad:1.0[${MULTILIB_USEDEP}]
- )
- libnotify? ( x11-libs/libnotify[${MULTILIB_USEDEP}] )
- opengl? (
- virtual/opengl[${MULTILIB_USEDEP}]
- wayland? ( dev-libs/wayland )
- )
- spell? ( app-text/gspell:= )
- tiff? ( media-libs/tiff:=[${MULTILIB_USEDEP}] )
- webkit? ( net-libs/webkit-gtk:4= )
- )"
-DEPEND="${RDEPEND}
- opengl? ( virtual/glu[${MULTILIB_USEDEP}] )
- X? ( x11-base/xorg-proto )"
-BDEPEND="
- test? ( >=dev-util/cppunit-1.8.0 )
- >=app-eselect/eselect-wxwidgets-20131230
- virtual/pkgconfig"
-
-# Note about the gst-plugin-base dep: The build system queries for it,
-# but doesn't link it for some reason? Either way - probably best to
-# depend on it anyway.
-# Note about the wayland dep: Appears to be only required for the OpenGL
-# canvas, and it seems impossible to disable the X dependency, unless
-# I'm missing something. This is an automagic header dep, though.
-
-PATCHES=(
- #"${WORKDIR}"/wxGTK-3.0.5_p20210214/
- "${FILESDIR}/${PN}-3.2.1-gtk3-translation-domain.patch"
- #"${FILESDIR}"/wxGTK-ignore-c++-abi.patch #676878
- "${FILESDIR}/${PN}-3.2.1-configure-tests.patch"
- "${FILESDIR}/${PN}-3.2.1-wayland-control.patch"
- "${FILESDIR}/${PN}-3.2.1-prefer-lib64-in-tests.patch"
- "${FILESDIR}/${PN}-3.2.2.1-dont-break-flags.patch"
- "${FILESDIR}/${PN}-3.2.2.1-backport-pr24197.patch"
-)
-
-src_prepare() {
- default
-
- # find . -iname Makefile.in -not -path ./samples'/*' \
- # | xargs grep -l WX_RELEASE
- local versioned_makefiles=(
- ./tests/benchmarks/Makefile.in
- ./tests/Makefile.in
- ./utils/emulator/src/Makefile.in
- ./utils/execmon/Makefile.in
- ./utils/wxrc/Makefile.in
- ./utils/helpview/src/Makefile.in
- ./utils/hhp2cached/Makefile.in
- ./utils/screenshotgen/src/Makefile.in
- ./utils/ifacecheck/src/Makefile.in
- ./Makefile.in
- ./demos/life/Makefile.in
- ./demos/bombs/Makefile.in
- ./demos/fractal/Makefile.in
- ./demos/forty/Makefile.in
- ./demos/poem/Makefile.in
- )
-
- # 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):" \
- "${versioned_makefiles[@]}" || 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() {
- # defang automagic dependencies, bug #927952
- use wayland || append-cflags -DGENTOO_GTK_HIDE_WAYLAND
- use X || append-cflags -DGENTOO_GTK_HIDE_X11
-
- # Workaround for bug #915154
- append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
-
- # X independent options
- local myeconfargs=(
- --with-zlib=sys
- --with-expat=sys
- --enable-compat30
- --enable-xrc
- $(use_with sdl)
- $(use_with lzma liblzma)
- # Currently defaults to curl, could change. Watch the VDB!
- $(use_enable curl webrequest)
-
- # PCHes are unstable and are disabled in-tree where possible
- # See bug #504204
- # Commits 8c4774042b7fdfb08e525d8af4b7912f26a2fdce,
fb809aeadee57ffa24591e60cfb41aecd4823090
- $(use_enable pch precomp-headers)
-
- # Don't hard-code libdir's prefix for wx-config
- --libdir='${prefix}'/$(get_libdir)
- )
-
- # By default, we now build with the GLX GLCanvas because some software
like
- # PrusaSlicer does not yet support EGL:
- #
- # https://github.com/prusa3d/PrusaSlicer/issues/9774 .
- #
- # A solution for this is being developed upstream:
- #
- # https://github.com/wxWidgets/wxWidgets/issues/22325 .
- #
- # Any software that needs to use OpenGL under Wayland can be patched
like
- # this to run under xwayland:
- #
- #
https://github.com/visualboyadvance-m/visualboyadvance-m/commit/aca206a721265366728222d025fec30ee500de82
.
- #
- # Check that the macro wxUSE_GLCANVAS_EGL is set to 1.
- #
- myeconfargs+=( "--disable-glcanvasegl" )
-
- # 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 && myeconfargs+=( --enable-debug=max )
-
- # wxGTK options
- # --enable-graphics_ctx - needed for webkit, editra
- # --without-gnomevfs - bug #203389
- use X && myeconfargs+=(
- --enable-graphics_ctx
- --with-gtkprint
- --enable-gui
- --with-gtk=3
- --with-libpng=sys
- --with-libjpeg=sys
-
- # Choosing to enable this unconditionally seems fair, pcre2 is
- # almost certain to be installed.
- --with-regex=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_enable keyring secretstore)
- $(use_enable spell spellcheck)
- $(use_enable test tests)
- $(use_enable wayland)
- )
-
- # wxBase options
- ! use X && myeconfargs+=( --disable-gui )
-
- # wxWidgets installs a configuration file with a reference to EGREP.
- # Autoconf discovers these programs via full paths, which is
- # unnecessary and fails if a build happened on a merged-usr system
- # but is being used on a split-usr system. Bug #927920.
- export ac_cv_path_SED="sed"
- export ac_cv_path_EGREP="grep -E"
- export ac_cv_path_EGREP_TRADITIONAL="grep -E"
- export ac_cv_path_FGREP="grep -F"
- export ac_cv_path_GREP="grep"
- export ac_cv_path_lt_DD="dd"
-
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_test() {
- emake -C tests
- (cd tests && ./test '~[.]~[net]') || die
-}
-
-multilib_src_install_all() {
- cd 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
-
- # Unversioned links
- rm "${ED}"/usr/bin/wx-config || die
- rm "${ED}"/usr/bin/wxrc || die
-
- # version bakefile presets
- pushd "${ED}"/usr/share/bakefile/presets >/dev/null || die
- local f
- for f in wx*; do
- mv "${f}" "${f/wx/wx32gtk3}" || die
- done
- popd >/dev/null || die
-}
-
-pkg_postinst() {
- has_version -b app-eselect/eselect-wxwidgets \
- && eselect wxwidgets update
-}
-
-pkg_postrm() {
- has_version -b app-eselect/eselect-wxwidgets \
- && eselect wxwidgets update
-}
diff --git a/x11-libs/wxGTK/wxGTK-3.2.5-r1.ebuild
b/x11-libs/wxGTK/wxGTK-3.2.5-r1.ebuild
deleted file mode 100644
index 26076e8a3cab..000000000000
--- a/x11-libs/wxGTK/wxGTK-3.2.5-r1.ebuild
+++ /dev/null
@@ -1,262 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit multilib-minimal flag-o-matic
-
-WXSUBVERSION="${PV}-gtk3" # 3.2.5-gtk3
-WXVERSION="$(ver_cut 1-3)" # 3.2.5
-# Make sure that this matches the number of components in ${PV}
-WXRELEASE="$(ver_cut 1-2)-gtk3" # 3.2-gtk3
-WXRELEASE_NODOT=${WXRELEASE//./} # 32-gtk3
-
-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
)"
-S="${WORKDIR}/wxWidgets-${PV}"
-
-LICENSE="wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )"
-SLOT="${WXRELEASE}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv
~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="+X curl doc debug keyring gstreamer libnotify +lzma opengl pch sdl
+spell test tiff wayland webkit X"
-REQUIRED_USE="test? ( tiff ) tiff? ( X ) spell? ( X ) keyring? ( X )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=app-eselect/eselect-wxwidgets-20131230
- dev-libs/expat[${MULTILIB_USEDEP}]
- dev-libs/libpcre2[pcre16,pcre32,unicode]
- sdl? ( media-libs/libsdl2[${MULTILIB_USEDEP}] )
- curl? ( net-misc/curl )
- lzma? ( app-arch/xz-utils )
- X? (
- >=dev-libs/glib-2.22:2[${MULTILIB_USEDEP}]
- media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}]
- media-libs/libpng:0=[${MULTILIB_USEDEP}]
- sys-libs/zlib[${MULTILIB_USEDEP}]
- x11-libs/cairo[${MULTILIB_USEDEP}]
- >=x11-libs/gtk+-3.24.41-r1:3[wayland?,X?,${MULTILIB_USEDEP}]
- x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
- x11-libs/libSM[${MULTILIB_USEDEP}]
- x11-libs/libX11[${MULTILIB_USEDEP}]
- x11-libs/libXtst
- x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
- media-libs/fontconfig
- x11-libs/pango[${MULTILIB_USEDEP}]
- keyring? ( app-crypt/libsecret )
- gstreamer? (
- media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
- media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
- media-libs/gst-plugins-bad:1.0[${MULTILIB_USEDEP}]
- )
- libnotify? ( x11-libs/libnotify[${MULTILIB_USEDEP}] )
- opengl? (
- virtual/opengl[${MULTILIB_USEDEP}]
- wayland? ( dev-libs/wayland )
- )
- spell? ( app-text/gspell:= )
- tiff? ( media-libs/tiff:=[${MULTILIB_USEDEP}] )
- webkit? ( net-libs/webkit-gtk:4.1= )
- )"
-DEPEND="${RDEPEND}
- opengl? ( virtual/glu[${MULTILIB_USEDEP}] )
- X? ( x11-base/xorg-proto )"
-BDEPEND="
- test? ( >=dev-util/cppunit-1.8.0 )
- >=app-eselect/eselect-wxwidgets-20131230
- virtual/pkgconfig"
-
-# Note about the gst-plugin-base dep: The build system queries for it,
-# but doesn't link it for some reason? Either way - probably best to
-# depend on it anyway.
-# Note about the wayland dep: Appears to be only required for the OpenGL
-# canvas, and it seems impossible to disable the X dependency, unless
-# I'm missing something. This is an automagic header dep, though.
-
-PATCHES=(
- #"${WORKDIR}"/wxGTK-3.0.5_p20210214/
- "${FILESDIR}/${PN}-3.2.1-gtk3-translation-domain.patch"
- #"${FILESDIR}"/wxGTK-ignore-c++-abi.patch #676878
- "${FILESDIR}/${PN}-3.2.1-configure-tests.patch"
- "${FILESDIR}/${PN}-3.2.1-wayland-control.patch"
- "${FILESDIR}/${PN}-3.2.1-prefer-lib64-in-tests.patch"
- "${FILESDIR}/${PN}-3.2.5-dont-break-flags.patch"
- "${FILESDIR}/${PN}-3.2.2.1-backport-pr24197.patch"
-)
-
-src_prepare() {
- default
-
- # find . -iname Makefile.in -not -path ./samples'/*' \
- # | xargs grep -l WX_RELEASE
- local versioned_makefiles=(
- ./tests/benchmarks/Makefile.in
- ./tests/Makefile.in
- ./utils/emulator/src/Makefile.in
- ./utils/execmon/Makefile.in
- ./utils/wxrc/Makefile.in
- ./utils/helpview/src/Makefile.in
- ./utils/hhp2cached/Makefile.in
- ./utils/screenshotgen/src/Makefile.in
- ./utils/ifacecheck/src/Makefile.in
- ./Makefile.in
- ./demos/life/Makefile.in
- ./demos/bombs/Makefile.in
- ./demos/fractal/Makefile.in
- ./demos/forty/Makefile.in
- ./demos/poem/Makefile.in
- )
-
- # 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):" \
- "${versioned_makefiles[@]}" || 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() {
- # defang automagic dependencies, bug #927952
- use wayland || append-cflags -DGENTOO_GTK_HIDE_WAYLAND
- use X || append-cflags -DGENTOO_GTK_HIDE_X11
-
- # Workaround for bug #915154
- append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
-
- # X independent options
- local myeconfargs=(
- --with-zlib=sys
- --with-expat=sys
- --enable-compat30
- --enable-xrc
- $(use_with sdl)
- $(use_with lzma liblzma)
- # Currently defaults to curl, could change. Watch the VDB!
- $(use_enable curl webrequest)
-
- # PCHes are unstable and are disabled in-tree where possible
- # See bug #504204
- # Commits 8c4774042b7fdfb08e525d8af4b7912f26a2fdce,
fb809aeadee57ffa24591e60cfb41aecd4823090
- $(use_enable pch precomp-headers)
-
- # Don't hard-code libdir's prefix for wx-config
- --libdir='${prefix}'/$(get_libdir)
- )
-
- # By default, we now build with the GLX GLCanvas because some software
like
- # PrusaSlicer does not yet support EGL:
- #
- # https://github.com/prusa3d/PrusaSlicer/issues/9774 .
- #
- # A solution for this is being developed upstream:
- #
- # https://github.com/wxWidgets/wxWidgets/issues/22325 .
- #
- # Any software that needs to use OpenGL under Wayland can be patched
like
- # this to run under xwayland:
- #
- #
https://github.com/visualboyadvance-m/visualboyadvance-m/commit/aca206a721265366728222d025fec30ee500de82
.
- #
- # Check that the macro wxUSE_GLCANVAS_EGL is set to 1.
- #
- myeconfargs+=( "--disable-glcanvasegl" )
-
- # 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 && myeconfargs+=( --enable-debug=max )
-
- # wxGTK options
- # --enable-graphics_ctx - needed for webkit, editra
- # --without-gnomevfs - bug #203389
- use X && myeconfargs+=(
- --enable-graphics_ctx
- --with-gtkprint
- --enable-gui
- --with-gtk=3
- --with-libpng=sys
- --with-libjpeg=sys
-
- # Choosing to enable this unconditionally seems fair, pcre2 is
- # almost certain to be installed.
- --with-regex=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_enable keyring secretstore)
- $(use_enable spell spellcheck)
- $(use_enable test tests)
- $(use_enable wayland)
- )
-
- # wxBase options
- ! use X && myeconfargs+=( --disable-gui )
-
- # wxWidgets installs a configuration file with a reference to EGREP.
- # Autoconf discovers these programs via full paths, which is
- # unnecessary and fails if a build happened on a merged-usr system
- # but is being used on a split-usr system. Bug #927920.
- export ac_cv_path_SED="sed"
- export ac_cv_path_EGREP="grep -E"
- export ac_cv_path_EGREP_TRADITIONAL="grep -E"
- export ac_cv_path_FGREP="grep -F"
- export ac_cv_path_GREP="grep"
- export ac_cv_path_lt_DD="dd"
-
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_test() {
- emake -C tests
- (cd tests && ./test '~[.]~[net]') || die
-}
-
-multilib_src_install_all() {
- cd 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
-
- # Unversioned links
- rm "${ED}"/usr/bin/wx-config || die
- rm "${ED}"/usr/bin/wxrc || die
-
- # version bakefile presets
- pushd "${ED}"/usr/share/bakefile/presets >/dev/null || die
- local f
- for f in wx*; do
- mv "${f}" "${f/wx/wx32gtk3}" || die
- done
- popd >/dev/null || die
-}
-
-pkg_postinst() {
- has_version -b app-eselect/eselect-wxwidgets \
- && eselect wxwidgets update
-}
-
-pkg_postrm() {
- has_version -b app-eselect/eselect-wxwidgets \
- && eselect wxwidgets update
-}
diff --git a/x11-libs/wxGTK/wxGTK-3.2.5.ebuild
b/x11-libs/wxGTK/wxGTK-3.2.5.ebuild
deleted file mode 100644
index c141a0bac991..000000000000
--- a/x11-libs/wxGTK/wxGTK-3.2.5.ebuild
+++ /dev/null
@@ -1,258 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit multilib-minimal flag-o-matic
-
-WXSUBVERSION="${PV}-gtk3" # 3.2.5-gtk3
-WXVERSION="$(ver_cut 1-3)" # 3.2.5
-# Make sure that this matches the number of components in ${PV}
-WXRELEASE="$(ver_cut 1-2)-gtk3" # 3.2-gtk3
-WXRELEASE_NODOT=${WXRELEASE//./} # 32-gtk3
-
-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
)"
-S="${WORKDIR}/wxWidgets-${PV}"
-
-LICENSE="wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )"
-SLOT="${WXRELEASE}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86
~amd64-linux ~x86-linux"
-IUSE="+X curl doc debug keyring gstreamer libnotify +lzma opengl pch sdl
+spell test tiff wayland webkit"
-REQUIRED_USE="test? ( tiff ) tiff? ( X ) spell? ( X ) keyring? ( X )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=app-eselect/eselect-wxwidgets-20131230
- dev-libs/expat[${MULTILIB_USEDEP}]
- dev-libs/libpcre2[pcre16,pcre32,unicode]
- sdl? ( media-libs/libsdl2[${MULTILIB_USEDEP}] )
- curl? ( net-misc/curl )
- lzma? ( app-arch/xz-utils )
- X? (
- >=dev-libs/glib-2.22:2[${MULTILIB_USEDEP}]
- media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}]
- media-libs/libpng:0=[${MULTILIB_USEDEP}]
- sys-libs/zlib[${MULTILIB_USEDEP}]
- x11-libs/cairo[${MULTILIB_USEDEP}]
- x11-libs/gtk+:3[wayland?,${MULTILIB_USEDEP}]
- x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
- x11-libs/libSM[${MULTILIB_USEDEP}]
- x11-libs/libX11[${MULTILIB_USEDEP}]
- x11-libs/libXtst
- x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
- media-libs/fontconfig
- x11-libs/pango[${MULTILIB_USEDEP}]
- keyring? ( app-crypt/libsecret )
- gstreamer? (
- media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
- media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
- media-libs/gst-plugins-bad:1.0[${MULTILIB_USEDEP}]
- )
- libnotify? ( x11-libs/libnotify[${MULTILIB_USEDEP}] )
- opengl? (
- virtual/opengl[${MULTILIB_USEDEP}]
- wayland? ( dev-libs/wayland )
- )
- spell? ( app-text/gspell:= )
- tiff? ( media-libs/tiff:=[${MULTILIB_USEDEP}] )
- webkit? ( net-libs/webkit-gtk:4.1= )
- )"
-DEPEND="${RDEPEND}
- opengl? ( virtual/glu[${MULTILIB_USEDEP}] )
- X? ( x11-base/xorg-proto )"
-BDEPEND="
- test? ( >=dev-util/cppunit-1.8.0 )
- >=app-eselect/eselect-wxwidgets-20131230
- virtual/pkgconfig"
-
-# Note about the gst-plugin-base dep: The build system queries for it,
-# but doesn't link it for some reason? Either way - probably best to
-# depend on it anyway.
-# Note about the wayland dep: Appears to be only required for the OpenGL
-# canvas, and it seems impossible to disable the X dependency, unless
-# I'm missing something. This is an automagic header dep, though.
-
-PATCHES=(
- #"${WORKDIR}"/wxGTK-3.0.5_p20210214/
- "${FILESDIR}/${PN}-3.2.1-gtk3-translation-domain.patch"
- #"${FILESDIR}"/wxGTK-ignore-c++-abi.patch #676878
- "${FILESDIR}/${PN}-3.2.1-configure-tests.patch"
- "${FILESDIR}/${PN}-3.2.1-wayland-control.patch"
- "${FILESDIR}/${PN}-3.2.1-prefer-lib64-in-tests.patch"
- "${FILESDIR}/${PN}-3.2.5-dont-break-flags.patch"
- "${FILESDIR}/${PN}-3.2.2.1-backport-pr24197.patch"
-)
-
-src_prepare() {
- default
-
- # find . -iname Makefile.in -not -path ./samples'/*' \
- # | xargs grep -l WX_RELEASE
- local versioned_makefiles=(
- ./tests/benchmarks/Makefile.in
- ./tests/Makefile.in
- ./utils/emulator/src/Makefile.in
- ./utils/execmon/Makefile.in
- ./utils/wxrc/Makefile.in
- ./utils/helpview/src/Makefile.in
- ./utils/hhp2cached/Makefile.in
- ./utils/screenshotgen/src/Makefile.in
- ./utils/ifacecheck/src/Makefile.in
- ./Makefile.in
- ./demos/life/Makefile.in
- ./demos/bombs/Makefile.in
- ./demos/fractal/Makefile.in
- ./demos/forty/Makefile.in
- ./demos/poem/Makefile.in
- )
-
- # 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):" \
- "${versioned_makefiles[@]}" || 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() {
- # Workaround for bug #915154
- append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
-
- # X independent options
- local myeconfargs=(
- --with-zlib=sys
- --with-expat=sys
- --enable-compat30
- --enable-xrc
- $(use_with sdl)
- $(use_with lzma liblzma)
- # Currently defaults to curl, could change. Watch the VDB!
- $(use_enable curl webrequest)
-
- # PCHes are unstable and are disabled in-tree where possible
- # See bug #504204
- # Commits 8c4774042b7fdfb08e525d8af4b7912f26a2fdce,
fb809aeadee57ffa24591e60cfb41aecd4823090
- $(use_enable pch precomp-headers)
-
- # Don't hard-code libdir's prefix for wx-config
- --libdir='${prefix}'/$(get_libdir)
- )
-
- # By default, we now build with the GLX GLCanvas because some software
like
- # PrusaSlicer does not yet support EGL:
- #
- # https://github.com/prusa3d/PrusaSlicer/issues/9774 .
- #
- # A solution for this is being developed upstream:
- #
- # https://github.com/wxWidgets/wxWidgets/issues/22325 .
- #
- # Any software that needs to use OpenGL under Wayland can be patched
like
- # this to run under xwayland:
- #
- #
https://github.com/visualboyadvance-m/visualboyadvance-m/commit/aca206a721265366728222d025fec30ee500de82
.
- #
- # Check that the macro wxUSE_GLCANVAS_EGL is set to 1.
- #
- myeconfargs+=( "--disable-glcanvasegl" )
-
- # 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 && myeconfargs+=( --enable-debug=max )
-
- # wxGTK options
- # --enable-graphics_ctx - needed for webkit, editra
- # --without-gnomevfs - bug #203389
- use X && myeconfargs+=(
- --enable-graphics_ctx
- --with-gtkprint
- --enable-gui
- --with-gtk=3
- --with-libpng=sys
- --with-libjpeg=sys
-
- # Choosing to enable this unconditionally seems fair, pcre2 is
- # almost certain to be installed.
- --with-regex=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_enable keyring secretstore)
- $(use_enable spell spellcheck)
- $(use_enable test tests)
- $(use_enable wayland)
- )
-
- # wxBase options
- ! use X && myeconfargs+=( --disable-gui )
-
- # wxWidgets installs a configuration file with a reference to EGREP.
- # Autoconf discovers these programs via full paths, which is
- # unnecessary and fails if a build happened on a merged-usr system
- # but is being used on a split-usr system. Bug #927920.
- export ac_cv_path_SED="sed"
- export ac_cv_path_EGREP="grep -E"
- export ac_cv_path_EGREP_TRADITIONAL="grep -E"
- export ac_cv_path_FGREP="grep -F"
- export ac_cv_path_GREP="grep"
- export ac_cv_path_lt_DD="dd"
-
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_test() {
- emake -C tests
- (cd tests && ./test '~[.]~[net]') || die
-}
-
-multilib_src_install_all() {
- cd 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
-
- # Unversioned links
- rm "${ED}"/usr/bin/wx-config || die
- rm "${ED}"/usr/bin/wxrc || die
-
- # version bakefile presets
- pushd "${ED}"/usr/share/bakefile/presets >/dev/null || die
- local f
- for f in wx*; do
- mv "${f}" "${f/wx/wx32gtk3}" || die
- done
- popd >/dev/null || die
-}
-
-pkg_postinst() {
- has_version -b app-eselect/eselect-wxwidgets \
- && eselect wxwidgets update
-}
-
-pkg_postrm() {
- has_version -b app-eselect/eselect-wxwidgets \
- && eselect wxwidgets update
-}
