From ed6e9ebb6ab4abd792d5b15e97ec245603dd6e2d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 30 Mar 2023 22:03:23 +0100 Subject: gentoo auto-resync : 30:03:2023 - 22:03:23 --- x11-libs/wxGTK/Manifest | 2 +- x11-libs/wxGTK/wxGTK-3.2.2.1-r1.ebuild | 223 +++++++++++++++++++++++++++++++++ x11-libs/wxGTK/wxGTK-3.2.2.1.ebuild | 223 --------------------------------- 3 files changed, 224 insertions(+), 224 deletions(-) create mode 100644 x11-libs/wxGTK/wxGTK-3.2.2.1-r1.ebuild delete mode 100644 x11-libs/wxGTK/wxGTK-3.2.2.1.ebuild (limited to 'x11-libs/wxGTK') diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest index b0c0a6440d37..dc4c59bdb287 100644 --- a/x11-libs/wxGTK/Manifest +++ b/x11-libs/wxGTK/Manifest @@ -19,5 +19,5 @@ DIST wxWidgets-3.2.2.1.tar.bz2 27339515 BLAKE2B e761e768dbb32bf76dbabf27aa9feb63 EBUILD wxGTK-3.0.4-r5.ebuild 3752 BLAKE2B 57acf7f620095191b662e806496ddc5ed38fed912edb57d352b292be0ca65aa86ac547b06049a35ef2359cca0e6990887d133bbb1f7a1f75aa1be08b30bb3bef SHA512 cd84b28e0456e899ddf9bf84607fa9f411ca81efe064d2f7b015102186abaf175c150f26c7b61e109809f86b080d49f386927a01f41b53d0b8d05e18135561a9 EBUILD wxGTK-3.0.5.1-r1.ebuild 5495 BLAKE2B f3daf6569a27e61c3cb60eef9a29aea35305e48523ef6572639905e81757f12e5a41b9e93fecbfdcdb5bf55a29db7d47515d0e2c9c40630bc4b611fa4cc17665 SHA512 2718f47aed0f875407117f85b28f7ba385e2def712fe7be4256d94211ef0d56f7e5eee0f72cc94644500f93c6b5e75ea01c16009ea7065cf112b3d102c6c6a7b EBUILD wxGTK-3.2.1.ebuild 6886 BLAKE2B 00c0384db71bc25f73a390ab4c27c104b3b560e0bd149cf54cf2384830df82c02227afb556518e973c3eaf14a639119c5a0e6a87dd71d57d40edcb345da83223 SHA512 d234b1c37b35976fc7db54ec7f6663b1a7b22b9453ac2d0514033dd4093dd975593489912315f1244a7e94791e35a6604e211802e04f9152ec7f713f5edf89ad -EBUILD wxGTK-3.2.2.1.ebuild 6979 BLAKE2B b76e5cfe59cf8b7dcb08cc36a7c1a4174aedd82f3f879b9e21b66780ccc01c49c1447d0e35a462a8abf419de02d1473984a018763529730c893ab9452c429f9d SHA512 2f4f079ff6061f51de7768a6097e67b09813259807e698b317f1232a02f31373697dcdd80904a728e765e497a469e97fb1372e47c9897bb216e54feccc6a12e9 +EBUILD wxGTK-3.2.2.1-r1.ebuild 6989 BLAKE2B 75dd7071473917af4442570bf22aa7a47490c3b86a20fd2f601f45751e299d48e995bfce5bf01c45668bf6255c99f932e48e991c3b06086baee1875834615d61 SHA512 e46ace2d69c29b861e980cc1ece1ff0e97d963f7912d7e702e90da7ef88f9586c6bad36228269144a2cb7ee0e0d353f02533f5a78847338e1fed770fa97538f4 MISC metadata.xml 756 BLAKE2B 336ffb3375ee9092de02d0808d0a44f7f5bcbc6e4a845c12b6466af0b91f3397c2b335e5433917361a060db43d6cb836cde0f87be2059214f314fa6726199e2d SHA512 190b72992c64b43b46e28ca2f730e1897a5f740ba211b859c816b4892256284feb579fbce06cb1939b774ae989dc68754f5a57f6375cfca50d7770d0c2ed47ed diff --git a/x11-libs/wxGTK/wxGTK-3.2.2.1-r1.ebuild b/x11-libs/wxGTK/wxGTK-3.2.2.1-r1.ebuild new file mode 100644 index 000000000000..bba30b538faf --- /dev/null +++ b/x11-libs/wxGTK/wxGTK-3.2.2.1-r1.ebuild @@ -0,0 +1,223 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit multilib-minimal + +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 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="+X curl doc debug gnome-keyring gstreamer libnotify +lzma opengl pch sdl +spell test tiff wayland webkit" +REQUIRED_USE="test? ( tiff ) tiff? ( X ) spell? ( X ) gnome-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}] + gnome-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" +) + +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() { + # X independent options + local myeconfargs=( + --with-zlib=sys + --with-expat=sys + --enable-compat30 + $(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) + ) + + # 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 gnome-keyring secretstore) + $(use_enable spell spellcheck) + $(use_enable test tests) + $(use_enable wayland) + ) + + # wxBase options + ! use X && myeconfargs+=( --disable-gui ) + + 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-${WXVERSION}-docs-html/. ) + einstalldocs + + # Unversioned links + rm "${ED}"/usr/bin/wx-config || die + use X && { 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.2.1.ebuild b/x11-libs/wxGTK/wxGTK-3.2.2.1.ebuild deleted file mode 100644 index 6198b73591d1..000000000000 --- a/x11-libs/wxGTK/wxGTK-3.2.2.1.ebuild +++ /dev/null @@ -1,223 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit multilib-minimal - -WXSUBVERSION=${PV}-gtk3 # 3.2.1-gtk3 -WXVERSION=${PV} # 3.2.1 -# Make sure that this matches the number of components in ${PV} -WXRELEASE=${WXVERSION%.*.*}-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 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="+X curl doc debug gnome-keyring gstreamer libnotify +lzma opengl pch sdl +spell test tiff wayland webkit" -REQUIRED_USE="test? ( tiff ) tiff? ( X ) spell? ( X ) gnome-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}] - gnome-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" -) - -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() { - # X independent options - local myeconfargs=( - --with-zlib=sys - --with-expat=sys - --enable-compat30 - $(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) - ) - - # 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 gnome-keyring secretstore) - $(use_enable spell spellcheck) - $(use_enable test tests) - $(use_enable wayland) - ) - - # wxBase options - ! use X && myeconfargs+=( --disable-gui ) - - 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-${WXVERSION}-docs-html/. ) - einstalldocs - - # Unversioned links - rm "${ED}"/usr/bin/wx-config || die - use X && { 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 -} -- cgit v1.2.3