diff options
author | Martin Väth <martin@mvath.de> | 2022-05-21 10:19:49 +0200 |
---|---|---|
committer | Martin Väth <martin@mvath.de> | 2022-05-21 10:19:49 +0200 |
commit | 9f20c74de61ebaa986515ce7bbd0510d99554fc4 (patch) | |
tree | 3d61c2efe26e7b515478ac2b4bb8ec607a797584 | |
parent | app-arch/archwrap app-portage/portage-bashrc-mv app-shells/termcolors-mv: bump (diff) | |
download | mv-9f20c74de61ebaa986515ce7bbd0510d99554fc4.tar.gz mv-9f20c74de61ebaa986515ce7bbd0510d99554fc4.tar.bz2 mv-9f20c74de61ebaa986515ce7bbd0510d99554fc4.zip |
x11-libs/gtk+: Version bump
Signed-off-by: Martin Väth <martin@mvath.de>
-rw-r--r-- | metadata/pkg_desc_index | 2 | ||||
-rw-r--r-- | x11-libs/gtk+/Manifest | 3 | ||||
-rw-r--r-- | x11-libs/gtk+/gtk+-3.24.33-r1.ebuild | 265 | ||||
-rw-r--r-- | x11-libs/gtk+/gtk+-3.24.34.ebuild (renamed from x11-libs/gtk+/gtk+-3.24.33.ebuild) | 2 |
4 files changed, 3 insertions, 269 deletions
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index index 6b2f757b..2dc084ba 100644 --- a/metadata/pkg_desc_index +++ b/metadata/pkg_desc_index @@ -127,5 +127,5 @@ www-plugins/google-translator-for-firefox 3.0.3.3: Firefox webextension: transla www-plugins/no-color 0.9.4: Firefox webextension: remove colors and background images from the page www-plugins/noscript 11.4.4: Firefox webextension: restrict active contents like java/javascript/flash www-plugins/translate-to-me 1.1: Firefox webextension: translate the selected text with www.linguee.com -x11-libs/gtk+ 2.24.33 3.24.33 3.24.33-r1: Gimp ToolKit + +x11-libs/gtk+ 2.24.33 3.24.34: Gimp ToolKit + x11-libs/motif 2.3.8-r2: The Motif user interface component toolkit diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest index 06daa67a..5c83f9e7 100644 --- a/x11-libs/gtk+/Manifest +++ b/x11-libs/gtk+/Manifest @@ -1,3 +1,2 @@ DIST gtk+-2.24.33.tar.xz 12661828 BLAKE2B f3488b220aaee54bf36fa77e2112d060152e57938845d240014a7d43a5743b1d4de19cc09c683d9d238fd1967cd67cc3c493f2475e4e481f6709f5cdc652c65c SHA512 71b588797c81f727dfac8dcb1be193f7436f717d30ecf18eae2d3aeb0f445b3be4743400acac16435490db8f564f01032065d3f42d27871317f80c98aef929d5 -DIST gtk+-3.24.33-add-legacy-icons.patch 157847 BLAKE2B 298a872d876421bb0d34f897b5d65984be768f623f294f0dd98e722df16ca2177c417e9508aa14fb81c75e3ff24981e018739d398748b62ae5450804f3286cee SHA512 a11b1e30a67214fbd65182efa0a7c1315a6fe75426d211a48678e5b4c13799b389b487e07b07b7a7044b7d3e277f7342a9842819e53176674ec71668481b9976 -DIST gtk+-3.24.33.tar.xz 22449472 BLAKE2B 7fb75393ecd0a932ed5ef6ea3c694e61dec237403e87addca3bbfdcc1dd8dcd4646d11fab3f0a8b7717bfb8c0c64926132a5aa8b1009e8c20f656c6eaa593c1b SHA512 35c844af67d442a9d55197028c6b660668c701ad8f83a64791669fca2930ada15194452b59b2ee11f8068098986218744fe9fc4742897af5a6b3eba23c98395e +DIST gtk+-3.24.34.tar.xz 21587592 BLAKE2B 708e03ee9e62f1a1742faffb63a352ec2d90a1dc46a4e0162e343bf68355ab80fbd30c1f2261b5e5339cbb66a02cfb48addbc5ecbc2b8a37f97aae86c5af1405 SHA512 95af4441b53be175acf16121a90b1db7a152cbfb3e5ed2dffc59f622b2eb5a4d74720ae8e05dc1421b6b23588f28e09e0f153f0b92777c836f522881720fb0a2 diff --git a/x11-libs/gtk+/gtk+-3.24.33-r1.ebuild b/x11-libs/gtk+/gtk+-3.24.33-r1.ebuild deleted file mode 100644 index 0b4dbf15..00000000 --- a/x11-libs/gtk+/gtk+-3.24.33-r1.ebuild +++ /dev/null @@ -1,265 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors and Martin V\"ath -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -GNOME2_EAUTORECONF="yes" - -inherit gnome2 multilib multilib-minimal virtualx - -DESCRIPTION="Gimp ToolKit +" -HOMEPAGE="https://www.gtk.org/" -SRC_URI="${SRC_URI-} -https://gitlab.gnome.org/GNOME/gtk/-/commit/5a0ffbbb4568e39bdf26006e1bf18c1c1d0d597a.patch -> ${P}-add-legacy-icons.patch" - -LICENSE="LGPL-2+" -SLOT="3" -IUSE="adwaita-icon-theme aqua atk-bridge broadway colord cups examples gtk-doc +introspection sysprof test vim-syntax wayland +X xinerama" -REQUIRED_USE=" - || ( aqua wayland X ) - xinerama? ( X ) -" - -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - -# Upstream wants us to do their job: -# https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1 -RESTRICT="test" - -# FIXME: introspection data is built against system installation of gtk+:3, -# bug #???? -COMMON_DEPEND=" - >=dev-libs/atk-2.32.0[introspection?,${MULTILIB_USEDEP}] - >=dev-libs/fribidi-0.19.7[${MULTILIB_USEDEP}] - >=dev-libs/glib-2.57.2:2[${MULTILIB_USEDEP}] - media-libs/fontconfig[${MULTILIB_USEDEP}] - >=media-libs/harfbuzz-2.2.0:= - >=media-libs/libepoxy-1.4[X(+)?,${MULTILIB_USEDEP}] - virtual/libintl[${MULTILIB_USEDEP}] - >=x11-libs/cairo-1.14[aqua?,glib,svg,X?,${MULTILIB_USEDEP}] - >=x11-libs/gdk-pixbuf-2.30:2[introspection?,${MULTILIB_USEDEP}] - >=x11-libs/pango-1.44.0[introspection?,${MULTILIB_USEDEP}] - x11-misc/shared-mime-info - - colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] ) - cups? ( >=net-print/cups-2.0[${MULTILIB_USEDEP}] ) - introspection? ( >=dev-libs/gobject-introspection-1.39:= ) - sysprof? ( >=dev-util/sysprof-capture-3.33.2:3[${MULTILIB_USEDEP}] ) - wayland? ( - >=dev-libs/wayland-1.14.91[${MULTILIB_USEDEP}] - >=dev-libs/wayland-protocols-1.17 - media-libs/mesa[wayland,${MULTILIB_USEDEP}] - >=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}] - ) - X? ( - atk-bridge? ( >=app-accessibility/at-spi2-atk-2.15.1[${MULTILIB_USEDEP}] ) - media-libs/mesa[X(+),${MULTILIB_USEDEP}] - x11-libs/libX11[${MULTILIB_USEDEP}] - x11-libs/libXcomposite[${MULTILIB_USEDEP}] - x11-libs/libXcursor[${MULTILIB_USEDEP}] - x11-libs/libXdamage[${MULTILIB_USEDEP}] - x11-libs/libXext[${MULTILIB_USEDEP}] - x11-libs/libXfixes[${MULTILIB_USEDEP}] - >=x11-libs/libXi-1.8[${MULTILIB_USEDEP}] - >=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}] - xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) - ) -" -DEPEND="${COMMON_DEPEND} - test? ( - media-fonts/font-cursor-misc - media-fonts/font-misc-misc - ) - X? ( x11-base/xorg-proto ) -" -# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90 -# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90 -RDEPEND="${COMMON_DEPEND} - >=dev-util/gtk-update-icon-cache-3 - !<x11-libs/vte-0.31.0:2.90 -" -# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710 -PDEPEND=" - adwaita-icon-theme? ( gnome-base/librsvg[${MULTILIB_USEDEP}] - >=x11-themes/adwaita-icon-theme-3.14 ) - !adwaita-icon-theme? ( x11-themes/hicolor-icon-theme virtual/freedesktop-icon-theme ) - vim-syntax? ( app-vim/gtk-syntax ) -" -BDEPEND=" - app-text/docbook-xml-dtd:4.1.2 - app-text/docbook-xsl-stylesheets - dev-libs/gobject-introspection-common - dev-libs/libxslt - >=dev-util/gdbus-codegen-2.48 - dev-util/glib-utils - >=dev-util/gtk-doc-am-1.20 - wayland? ( dev-util/wayland-scanner ) - >=sys-devel/gettext-0.19.7 - virtual/pkgconfig - x11-libs/gdk-pixbuf:2 - gtk-doc? ( - app-text/docbook-xml-dtd:4.3 - >=dev-util/gtk-doc-1.20 - ) - dev-vcs/git -" - -MULTILIB_CHOST_TOOLS=( - /usr/bin/gtk-query-immodules-3.0$(get_exeext) -) - -PATCHES=( - # gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache - "${FILESDIR}"/${PN}-3.24.25-update-icon-cache.patch - - # Fix broken autotools logic - "${FILESDIR}"/${PN}-3.22.20-libcloudproviders-automagic.patch -) - -strip_builddir() { - local rule=$1 - shift - local directory=$1 - shift - sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \ - || die "Could not strip director ${directory} from build." -} - -src_prepare() { - if ! use test ; then - # don't waste time building tests - strip_builddir SRC_SUBDIRS testsuite Makefile.{am,in} - - # the tests dir needs to be build now because since commit - # 7ff3c6df80185e165e3bf6aa31bd014d1f8bf224 tests/gtkgears.o needs to be there - # strip_builddir SRC_SUBDIRS tests Makefile.{am,in} - fi - - if ! use examples; then - # don't waste time building demos - strip_builddir SRC_SUBDIRS demos Makefile.{am,in} - strip_builddir SRC_SUBDIRS examples Makefile.{am,in} - fi - - # bug #835966 - git apply "${DISTDIR}/${P}-add-legacy-icons.patch" || die - - # Use patches from BSD to make gtk3-atk-bridge a true option - - # This was intentionally removed by upstream, see - # https://mail.gnome.org/archives/commits-list/2012-June/msg03813.html - eapply "${FILESDIR}"/${PN}-atk-bridge-config.ac.patch - eapply "${FILESDIR}"/${PN}-atk-bridge-config.h.in.patch - eapply "${FILESDIR}"/${PN}-atk-bridge-gtkaccessibility.patch - - eautoreconf - gnome2_src_prepare -} - -multilib_src_configure() { - local myconf=( - $(use_enable aqua quartz-backend) - $(use_enable broadway broadway-backend) - $(use_enable colord) - $(use_enable cups cups auto) - $(multilib_native_use_enable gtk-doc) - $(multilib_native_use_enable introspection) - $(use_enable sysprof profiler) - $(use_enable wayland wayland-backend) - $(use_enable X x11-backend) - $(use_enable X xcomposite) - $(use_enable X xdamage) - $(use_enable X xfixes) - $(use_enable X xkb) - $(use_enable X xrandr) - $(use_enable xinerama) - $(use_with atk-bridge) - # cloudprovider is not packaged in Gentoo yet - --disable-cloudproviders - --disable-papi - --enable-man - --with-xml-catalog="${EPREFIX}"/etc/xml/catalog - # need libdir here to avoid a double slash in a path that libtool doesn't - # grok so well during install (// between $EPREFIX and usr ...) - # TODO: Is this still the case? - --libdir="${EPREFIX}"/usr/$(get_libdir) - CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config" - ) - - if use wayland; then - myconf+=( - # Include wayland immodule into gtk itself, to avoid problems like - # https://gitlab.gnome.org/GNOME/gnome-shell/issues/109 from a - # user overridden GTK_IM_MODULE envvar - --with-included-immodules=wayland - ) - fi; - - ECONF_SOURCE=${S} gnome2_src_configure "${myconf[@]}" - - # work-around gtk-doc out-of-source brokedness - if multilib_is_native_abi; then - local d - for d in gdk gtk libgail-util; do - ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die - done - fi -} - -multilib_src_test() { - "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die - GSETTINGS_SCHEMA_DIR="${S}/gtk" virtx emake check -} - -multilib_src_install() { - gnome2_src_install -} - -multilib_src_install_all() { - insinto /etc/gtk-3.0 - doins "${FILESDIR}"/settings.ini - # Skip README.{in,commits,win32} that would get installed by default - DOCS=( AUTHORS ChangeLog NEWS README ) - einstalldocs -} - -pkg_preinst() { - gnome2_pkg_preinst - - multilib_pkg_preinst() { - # Make immodules.cache belongs to gtk+ alone - local cache="/usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache" - - if [[ -e ${EROOT}${cache} ]]; then - cp "${EROOT}${cache}" "${ED}${cache}" || die - else - touch "${ED}${cache}" || die - fi - } - multilib_parallel_foreach_abi multilib_pkg_preinst -} - -pkg_postinst() { - gnome2_pkg_postinst - - multilib_pkg_postinst() { - gnome2_query_immodules_gtk3 \ - || die "Update immodules cache failed (for ${ABI})" - } - multilib_parallel_foreach_abi multilib_pkg_postinst - - if ! has_version "app-text/evince"; then - elog "Please install app-text/evince for print preview functionality." - elog "Alternatively, check \"gtk-print-preview-command\" documentation and" - elog "add it to your settings.ini file." - fi -} - -pkg_postrm() { - gnome2_pkg_postrm - - if [[ -z ${REPLACED_BY_VERSION} ]]; then - multilib_pkg_postrm() { - rm -f "${EROOT}/usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache" - } - multilib_foreach_abi multilib_pkg_postrm - fi -} diff --git a/x11-libs/gtk+/gtk+-3.24.33.ebuild b/x11-libs/gtk+/gtk+-3.24.34.ebuild index 322423cd..44e1056d 100644 --- a/x11-libs/gtk+/gtk+-3.24.33.ebuild +++ b/x11-libs/gtk+/gtk+-3.24.34.ebuild @@ -8,7 +8,7 @@ inherit gnome2 multilib multilib-minimal virtualx DESCRIPTION="Gimp ToolKit +" HOMEPAGE="https://www.gtk.org/" -SRC_URI=${SRC_URI-} +SRC_URI="${SRC_URI-}" LICENSE="LGPL-2+" SLOT="3" |