summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMart Raudsepp <leio@gentoo.org>2020-01-11 21:17:07 +0200
committerMart Raudsepp <leio@gentoo.org>2020-01-11 21:17:07 +0200
commitc8f4fe21440e1dd522862db20bb2d1efe6ca7096 (patch)
tree77d146623674b8edc624d91808ab3a6062ca1e87 /x11-libs
parentx11-libs/gtk+: ia64 stable (bug #702260) (diff)
downloadgentoo-c8f4fe21440e1dd522862db20bb2d1efe6ca7096.tar.gz
gentoo-c8f4fe21440e1dd522862db20bb2d1efe6ca7096.tar.bz2
gentoo-c8f4fe21440e1dd522862db20bb2d1efe6ca7096.zip
x11-libs/gtk+: remove old
Package-Manager: Portage-2.3.79, Repoman-2.3.12 Signed-off-by: Mart Raudsepp <leio@gentoo.org>
Diffstat (limited to 'x11-libs')
-rw-r--r--x11-libs/gtk+/Manifest1
-rw-r--r--x11-libs/gtk+/files/3.24.4-more-gtkswitch-fallback.patch34
-rw-r--r--x11-libs/gtk+/files/gtk+-3.22.2-update-icon-cache.patch138
-rw-r--r--x11-libs/gtk+/gtk+-3.24.4-r1.ebuild235
4 files changed, 0 insertions, 408 deletions
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 7716ba624f81..90e7dc4c0f01 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -4,4 +4,3 @@ DIST gtk+-3.24.10.tar.xz 20958300 BLAKE2B 60a70341f15b59b95316cbce55cd18b54a6dff
DIST gtk+-3.24.11.tar.xz 20974300 BLAKE2B f338782d6141df64f83caae84649558296e11240ab082d4db129480a77e85cd26f86dee66e7f2650db48f13a30b0cb7191a8deb4bc545c9c7ee3b73796638a98 SHA512 15e33169030aa38e363730e5b19bbde614897b1a0de5db29c5292940a97e3613383b3eeb1c83ab8c09015a2a3f3ad425511bacd8fdbb79b30e0a47d4d4b57008
DIST gtk+-3.24.13-patchset.tar.xz 57652 BLAKE2B deda8cb4e0026431b52c0299266d60c4d4be2a2c870bee06daf3d9f63918d47243b88c73c4441f9415c859116fd873f276496b7ea9c2243a9540351ca53c5897 SHA512 dc8abad0812c936f7316425ca456d5892f3438ca6f843ed49fd53258695958b2a52a1df878ff25547d176aa054ea48ae9fc1b971698afc4d4aedae9cb643feae
DIST gtk+-3.24.13.tar.xz 23206464 BLAKE2B d58130d490d8886d0656a3106ddd4f24c0b83a512b6daa22cbb6cbfa6f0582a22a8f6e0063016c120e15b031a3c5585a557bd3dc94b1e55ac0ae553da871d64a SHA512 9129d4574cca258b4a517d8d65dad246a746fc3dc574b78e098db9aa9743956ce227efbf963f63e1e0f1a1a09810716150526b2bfe8015a5960bad38b0c88406
-DIST gtk+-3.24.4.tar.xz 21102236 BLAKE2B 1ef6445d582217a54538549fd63c59dd1e7f14832b33a41e971d2dd184a8887876d1eb599cb9fcbd590ec1a16ca29f0be92bc96344b1e7d2fdf88456d63c9a7f SHA512 d1cce6d0d7f1c5ef0f4e8988b88372a32b9d8a2924da4cfc46a80ede91cf8a2aacdcd87eec122dfab1369b36fc849d875832ac11d79426cf6884e1730e5d4dd1
diff --git a/x11-libs/gtk+/files/3.24.4-more-gtkswitch-fallback.patch b/x11-libs/gtk+/files/3.24.4-more-gtkswitch-fallback.patch
deleted file mode 100644
index 629a2d750e17..000000000000
--- a/x11-libs/gtk+/files/3.24.4-more-gtkswitch-fallback.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 6a4ce55a69c5ecbbf06bc905ac0bfdd04f64bb66 Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Wed, 23 Jan 2019 12:02:27 -0500
-Subject: [PATCH] switch: Avoid problems with glyph availability
-
-If none of the glyphs we want are available, fall
-back to using empty strings here, rather than causing
-critical warnings.
----
- gtk/gtkswitch.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/gtk/gtkswitch.c b/gtk/gtkswitch.c
-index 1d42f572a9..4c49e243ed 100644
---- a/gtk/gtkswitch.c
-+++ b/gtk/gtkswitch.c
-@@ -302,12 +302,14 @@ gtk_switch_create_pango_layouts (GtkSwitch *self)
- const char *on_glyphs[] = {
- "⏽", /* U+23FD POWER ON SYMBOL */
- "❙", /* U+2759 MEDIUM VERTICAL BAR */
-+ ""
- };
-
- /* Glyphs for the OFF state, in descending order of preference */
- const char *off_glyphs[] = {
- "⭘", /* U+2B58 HEAVY CIRCLE */
- "○", /* U+25CB WHITE CIRCLE */
-+ ""
- };
- int i;
-
---
-2.17.0
-
diff --git a/x11-libs/gtk+/files/gtk+-3.22.2-update-icon-cache.patch b/x11-libs/gtk+/files/gtk+-3.22.2-update-icon-cache.patch
deleted file mode 100644
index fc1e86e997d0..000000000000
--- a/x11-libs/gtk+/files/gtk+-3.22.2-update-icon-cache.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-From 101b43f4a38904ee21070a3e2eb5ba03dfe17647 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Tue, 1 Nov 2016 15:24:22 +0100
-Subject: [PATCH] Always use external gtk-update-icon-cache
-
-Check for gtk-update-icon-cache to install demos, otherwise it is not
-used when building.
----
- configure.ac | 2 ++
- demos/gtk-demo/Makefile.am | 2 +-
- demos/widget-factory/Makefile.am | 2 +-
- docs/reference/gtk/Makefile.am | 1 -
- gtk/Makefile.am | 44 ----------------------------------------
- 5 files changed, 4 insertions(+), 47 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 4f9f183..ecf99dc 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -999,6 +999,8 @@ dnl Look for a host system's gdk-pixbuf-csource if we are cross-compiling
-
- AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)
-
-+AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, [gtk-update-icon-cache], [no])
-+
- ########################################
- # Windowing system checks
- ########################################
-diff --git a/demos/gtk-demo/Makefile.am b/demos/gtk-demo/Makefile.am
-index 8c15e16..5d774d2 100644
---- a/demos/gtk-demo/Makefile.am
-+++ b/demos/gtk-demo/Makefile.am
-@@ -171,7 +171,7 @@ dist_appsicon32_DATA = data/32x32/gtk3-demo.png data/32x32/gtk3-demo-symbolic.sy
- dist_appsicon48_DATA = data/48x48/gtk3-demo.png data/48x48/gtk3-demo-symbolic.symbolic.png
- dist_appsicon256_DATA = data/256x256/gtk3-demo.png data/256x256/gtk3-demo-symbolic.symbolic.png
-
--update_icon_cache = $(top_builddir)/gtk/gtk-update-icon-cache$(EXEEXT) --ignore-theme-index --force
-+update_icon_cache = $(GTK_UPDATE_ICON_CACHE) --ignore-theme-index --force
-
- install-data-hook: install-update-icon-cache
- uninstall-hook: uninstall-update-icon-cache
-diff --git a/demos/widget-factory/Makefile.am b/demos/widget-factory/Makefile.am
-index a6bfbdc..28a3be2 100644
---- a/demos/widget-factory/Makefile.am
-+++ b/demos/widget-factory/Makefile.am
-@@ -47,7 +47,7 @@ dist_appsicon32_DATA = data/32x32/gtk3-widget-factory.png data/32x32/gtk3-widget
- dist_appsicon48_DATA = data/48x48/gtk3-widget-factory.png data/48x48/gtk3-widget-factory-symbolic.symbolic.png
- dist_appsicon256_DATA = data/256x256/gtk3-widget-factory.png data/256x256/gtk3-widget-factory-symbolic.symbolic.png
-
--update_icon_cache = $(top_builddir)/gtk/gtk-update-icon-cache$(EXEEXT) --ignore-theme-index --force
-+update_icon_cache = $(GTK_UPDATE_ICON_CACHE) --ignore-theme-index --force
-
- install-data-hook: install-update-icon-cache
- uninstall-hook: uninstall-update-icon-cache
-diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am
-index 5a88a12..b51f3ac 100644
---- a/docs/reference/gtk/Makefile.am
-+++ b/docs/reference/gtk/Makefile.am
-@@ -504,7 +504,6 @@ EXTRA_DIST += version.xml.in gtk3.types.in
-
- man_MANS = \
- gtk-query-immodules-3.0.1 \
-- gtk-update-icon-cache.1 \
- gtk-encode-symbolic-svg.1 \
- gtk-launch.1 \
- gtk3-demo.1 \
-diff --git a/gtk/Makefile.am b/gtk/Makefile.am
-index 3b76b82..d4c5681 100644
---- a/gtk/Makefile.am
-+++ b/gtk/Makefile.am
-@@ -1581,7 +1581,6 @@ endif
- #
- bin_PROGRAMS = \
- gtk-query-immodules-3.0 \
-- gtk-update-icon-cache \
- gtk-encode-symbolic-svg \
- gtk-builder-tool \
- gtk-query-settings \
-@@ -1594,9 +1593,6 @@ gtk_query_immodules_3_0_LDADD = \
- $(GMODULE_LIBS) \
- $(GTK_DEP_LIBS)
-
--gtk_update_icon_cache_SOURCES = updateiconcache.c
--gtk_update_icon_cache_LDADD = $(GDK_PIXBUF_LIBS)
--
- gtk_encode_symbolic_svg_SOURCES = encodesymbolic.c
- gtk_encode_symbolic_svg_LDADD = \
- $(GDK_PIXBUF_LIBS) \
-@@ -1621,46 +1617,6 @@ gtk_launch_LDADD = \
- $(top_builddir)/gdk/libgdk-3.la \
- $(GTK_DEP_LIBS)
-
--if OS_WIN32
--
--# Workaround for UAC silliness: programs with "update" in their name
--# are believed to be installers and require elevated privileges to be
--# used... Embed a manifest file into executable to tell Windows that
--# gtk-update-icon-cache.exe doesn't require any special privileges.
--
--GTK_UPDATE_ICON_CACHE_MANIFEST = gtk-update-icon-cache.exe.manifest
--GTK_UPDATE_ICON_CACHE_RC = gtk-update-icon-cache.rc
--GTK_UPDATE_ICON_CACHE_MANIFEST_OBJECT = gtk-update-icon-cache_manifest.o
--
--$(GTK_UPDATE_ICON_CACHE_MANIFEST):
-- (echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>' ; \
-- echo '<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">' ; \
-- echo ' <assemblyIdentity version="1.0.0.0"' ; \
-- echo ' processorArchitecture="'$(EXE_MANIFEST_ARCHITECTURE)'"' ; \
-- echo ' name="gtk-update-icon-cache.exe"' ; \
-- echo ' type="win32"/>' ; \
-- echo ' <!-- Identify the application security requirements. -->' ; \
-- echo ' <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">' ; \
-- echo ' <security>' ; \
-- echo ' <requestedPrivileges>' ; \
-- echo ' <requestedExecutionLevel' ; \
-- echo ' level="asInvoker"' ; \
-- echo ' uiAccess="false"/>' ; \
-- echo ' </requestedPrivileges>' ; \
-- echo ' </security>' ; \
-- echo ' </trustInfo>' ; \
-- echo '</assembly>' ) >$@
--
--$(GTK_UPDATE_ICON_CACHE_RC):
-- (echo 'CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST '$(GTK_UPDATE_ICON_CACHE_MANIFEST)) >$@
--
--$(GTK_UPDATE_ICON_CACHE_MANIFEST_OBJECT): $(GTK_UPDATE_ICON_CACHE_RC) $(GTK_UPDATE_ICON_CACHE_MANIFEST)
-- $(WINDRES) --input $< --output $@ --output-format=coff
--
--gtk_update_icon_cache_LDADD += $(GTK_UPDATE_ICON_CACHE_MANIFEST_OBJECT)
--
--endif
--
- .PHONY: files
-
- files:
---
-2.10.1
-
diff --git a/x11-libs/gtk+/gtk+-3.24.4-r1.ebuild b/x11-libs/gtk+/gtk+-3.24.4-r1.ebuild
deleted file mode 100644
index e3217afab7e0..000000000000
--- a/x11-libs/gtk+/gtk+-3.24.4-r1.ebuild
+++ /dev/null
@@ -1,235 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-GNOME2_EAUTORECONF="yes"
-
-inherit flag-o-matic gnome2 multilib virtualx multilib-minimal
-
-DESCRIPTION="Gimp ToolKit +"
-HOMEPAGE="https://www.gtk.org/"
-
-LICENSE="LGPL-2+"
-SLOT="3"
-IUSE="aqua broadway cloudprint colord cups examples gtk-doc +introspection test vim-syntax wayland +X xinerama"
-REQUIRED_USE="
- || ( aqua wayland X )
- xinerama? ( X )
-"
-
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-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.15[introspection?,${MULTILIB_USEDEP}]
- >=dev-libs/glib-2.53.4:2[${MULTILIB_USEDEP}]
- media-libs/fontconfig[${MULTILIB_USEDEP}]
- >=media-libs/libepoxy-1.4[X(+)?,${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.41.0[introspection?,${MULTILIB_USEDEP}]
- >=media-libs/harfbuzz-0.9:=
- x11-misc/shared-mime-info
-
- cloudprint? (
- >=net-libs/rest-0.7[${MULTILIB_USEDEP}]
- >=dev-libs/json-glib-1.0[${MULTILIB_USEDEP}] )
- colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] )
- cups? ( >=net-print/cups-1.2[${MULTILIB_USEDEP}] )
- introspection? ( >=dev-libs/gobject-introspection-1.39:= )
- wayland? (
- >=dev-libs/wayland-1.9.91[${MULTILIB_USEDEP}]
- >=dev-libs/wayland-protocols-1.12
- media-libs/mesa[wayland,${MULTILIB_USEDEP}]
- >=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}]
- )
- X? (
- >=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}]
- media-libs/mesa[X(+),${MULTILIB_USEDEP}]
- x11-libs/libX11[${MULTILIB_USEDEP}]
- >=x11-libs/libXi-1.3[${MULTILIB_USEDEP}]
- x11-libs/libXext[${MULTILIB_USEDEP}]
- >=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}]
- x11-libs/libXcursor[${MULTILIB_USEDEP}]
- x11-libs/libXfixes[${MULTILIB_USEDEP}]
- x11-libs/libXcomposite[${MULTILIB_USEDEP}]
- x11-libs/libXdamage[${MULTILIB_USEDEP}]
- xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
- )
-"
-DEPEND="${COMMON_DEPEND}
- app-text/docbook-xsl-stylesheets
- app-text/docbook-xml-dtd:4.1.2
- dev-libs/libxslt
- dev-libs/gobject-introspection-common
- >=dev-util/gdbus-codegen-2.48
- dev-util/glib-utils
- >=dev-util/gtk-doc-am-1.20
- gtk-doc? ( >=dev-util/gtk-doc-1.20 )
- >=sys-devel/gettext-0.19.7[${MULTILIB_USEDEP}]
- virtual/pkgconfig[${MULTILIB_USEDEP}]
- X? ( x11-base/xorg-proto )
- test? (
- media-fonts/font-misc-misc
- media-fonts/font-cursor-misc )
-"
-# 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
- !<gnome-base/gail-1000
- !<x11-libs/vte-0.31.0:2.90
-"
-# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
-PDEPEND="
- gnome-base/librsvg[${MULTILIB_USEDEP}]
- >=x11-themes/adwaita-icon-theme-3.14
- vim-syntax? ( app-vim/gtk-syntax )
-"
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/gtk-query-immodules-3.0$(get_exeext)
-)
-
-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
-
- # Add fallback to no glyph for GtkSwitch, so if no glyph for some reason is found, it at least doesn't mess things up completely
- # gtk+-3.24.5 replaces these with CSS gadget icons, but we include this simpler version in revbump as a stable candidate without
- # the Adwaita theme changes found in 3.24.5
- eapply "${FILESDIR}"/${PV}-more-gtkswitch-fallback.patch
-
- # gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache
- eapply "${FILESDIR}"/${PN}-3.22.2-update-icon-cache.patch
-
- # Fix broken autotools logic
- eapply "${FILESDIR}"/${PN}-3.22.20-libcloudproviders-automagic.patch
-
- gnome2_src_prepare
-}
-
-multilib_src_configure() {
- # need libdir here to avoid a double slash in a path that libtool doesn't
- # grok so well during install (// between $EPREFIX and usr ...)
- # cloudprovider is not packaged in Gentoo
- ECONF_SOURCE=${S} \
- gnome2_src_configure \
- $(use_enable aqua quartz-backend) \
- $(use_enable broadway broadway-backend) \
- $(use_enable cloudprint) \
- $(use_enable colord) \
- $(use_enable cups cups auto) \
- $(multilib_native_use_enable gtk-doc) \
- $(multilib_native_use_enable introspection) \
- $(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) \
- --disable-cloudproviders \
- --disable-mir-backend \
- --disable-papi \
- --enable-man \
- --with-xml-catalog="${EPREFIX}"/etc/xml/catalog \
- --libdir="${EPREFIX}"/usr/$(get_libdir) \
- CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config"
-
- # 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} and useless ChangeLog that would get installed by default
- DOCS=( AUTHORS 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
-}