x11-libs/gtk+: bump to 3.24.17
authorMart Raudsepp <leio@gentoo.org>
Sat, 4 Apr 2020 10:04:52 +0000 (13:04 +0300)
committerMart Raudsepp <leio@gentoo.org>
Sat, 4 Apr 2020 12:06:49 +0000 (15:06 +0300)
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp <leio@gentoo.org>
x11-libs/gtk+/Manifest
x11-libs/gtk+/gtk+-3.24.17.ebuild [new file with mode: 0644]

index 7ac954d3c093d74b58b099f7a5429ee1cb143b19..4ebb2adf3db6349141d0be1409b5bd8ca71d633e 100644 (file)
@@ -5,3 +5,4 @@ DIST gtk+-3.24.13-patchset.tar.xz 57652 BLAKE2B deda8cb4e0026431b52c0299266d60c4
 DIST gtk+-3.24.13.tar.xz 23206464 BLAKE2B d58130d490d8886d0656a3106ddd4f24c0b83a512b6daa22cbb6cbfa6f0582a22a8f6e0063016c120e15b031a3c5585a557bd3dc94b1e55ac0ae553da871d64a SHA512 9129d4574cca258b4a517d8d65dad246a746fc3dc574b78e098db9aa9743956ce227efbf963f63e1e0f1a1a09810716150526b2bfe8015a5960bad38b0c88406
 DIST gtk+-3.24.14.tar.xz 20420928 BLAKE2B 3113dd672b819a21cd13eb5849a34fbc659b8cba4e7f8a6667450cb13a497ad2c41878870047ede175ee42cfcbdaf3d3a32d07e12cd386892694d4eadf341e0a SHA512 a5ce659508933f6a3825aaafe9b30f51bd1357a62a6c66526ebd716627c829aa24543b4f8bd6f701dceda1d9fff94ad105f89f02a14d53749744e868bdff26bf
 DIST gtk+-3.24.16.tar.xz 20417592 BLAKE2B a0b18c72cd91ddb6533577efad7327df60870b5424409076698ce2b8cbe68a4382a12d947d7c60243ddf4eebe0e14ae9986d5b82a11bef64f1f0287949354986 SHA512 181d31dea038016357cd0eba5b9e8a17056bc061f4ae2ebc713bceee46cd30787993cec463aae658faddc57b9071549fa196f6a2a1f67c314d99e4365f50a0cb
+DIST gtk+-3.24.17.tar.xz 20987716 BLAKE2B 24522ade457ac1dea79cbd1fac2628184605755858bda164a9ca34818865fb52ce0990a03e3294b4f0890e9a462c5949adf35818ccdd32becc993aedde2ee248 SHA512 42a0f8c3d64f9354f3954a8ecd8955abcf23cac4b9f433daef153b77c2e3abfbdd16231432bf6907d86c57e33d0f22c771685cb83b299a0883dfd3245372df1e
diff --git a/x11-libs/gtk+/gtk+-3.24.17.ebuild b/x11-libs/gtk+/gtk+-3.24.17.ebuild
new file mode 100644 (file)
index 0000000..ddb9245
--- /dev/null
@@ -0,0 +1,245 @@
+# Copyright 1999-2020 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 ~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/fribidi-0.19.7[${MULTILIB_USEDEP}]
+       >=dev-libs/glib-2.57.2: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-2.0[${MULTILIB_USEDEP}] )
+       introspection? ( >=dev-libs/gobject-introspection-1.39:= )
+       wayland? (
+               >=dev-libs/wayland-1.14.91[${MULTILIB_USEDEP}]
+               >=dev-libs/wayland-protocols-1.14
+               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
+               app-text/docbook-xml-dtd:4.3 )
+       >=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
+
+       # gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache
+       eapply "${FILESDIR}"/${PN}-3.24.8-update-icon-cache.patch
+
+       # Fix broken autotools logic
+       eapply "${FILESDIR}"/${PN}-3.22.20-libcloudproviders-automagic.patch
+
+       gnome2_src_prepare
+}
+
+multilib_src_configure() {
+       local myconf=(
+               $(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)
+               # cloudprovider is not packaged in Gentoo yet
+               --disable-cloudproviders
+               --disable-papi
+               # sysprof integration needs >=sysprof-3.33.2
+               --disable-profiler
+               --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
+}