mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-07 18:07:08 -08:00
x11-libs/gtk+: bump to 3.24.20
Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Mart Raudsepp <leio@gentoo.org>
This commit is contained in:
Mart Raudsepp
@@ -2,3 +2,4 @@ DIST gtk+-2.24.32-patchset-r1.tar.xz 13364 BLAKE2B 15e5429b11cc4ccef1bf44105c790
|
||||
DIST gtk+-2.24.32.tar.xz 12620860 BLAKE2B 03f4c0a8be98473f62bc8c86859937969c4169960a5f93d37ff6dcde00413215fa6c7125b15781bf50d67b40aa0056cb71b83fb50acb2c3467b5deb3c8d938f0 SHA512 8e8fd9ae32f1d6fb544da260f00599f0f05090d910d767b06ef086ab4f1f8373a29bb0da9767761c9b5f4cfd51b5c45d0fa5d39b0428c839ddf0a579df806696
|
||||
DIST gtk+-3.24.16.tar.xz 20417592 BLAKE2B a0b18c72cd91ddb6533577efad7327df60870b5424409076698ce2b8cbe68a4382a12d947d7c60243ddf4eebe0e14ae9986d5b82a11bef64f1f0287949354986 SHA512 181d31dea038016357cd0eba5b9e8a17056bc061f4ae2ebc713bceee46cd30787993cec463aae658faddc57b9071549fa196f6a2a1f67c314d99e4365f50a0cb
|
||||
DIST gtk+-3.24.18.tar.xz 21292668 BLAKE2B 4d06789d027f9b9e070093460daa579afa88a14b9d5a3c028db3dbf20dfadbaab671ae56a9820eef5b2244a00f09f4be4413f1c06b11ac4db6c1044f824a01f6 SHA512 51ba13ae3cd0db9b62462ba399f08738885648adcb545bf0852c4e5b04bc2a1dd88629fafefc282f6a200daa8330e7606f22a70bd2ce6fde32a992a6cd7a0950
|
||||
DIST gtk+-3.24.20.tar.xz 22726768 BLAKE2B 75daa850275d55758503fa98055ca4deb9adca172e0f38c39ca4d5e7f8179398ca8753a759b0d3afc1ad1712ac6e3aa2cc1bce29e2a8fff4198a7f2d70002b11 SHA512 bda8eeacf721afcff4565756fe45857cbf8b053494d1d747ca9b97c899e9fe21fddef6871ecd5ec9a7a0f87b0a3ede2f9d6b5e5712de10a845100d82464a4556
|
||||
|
||||
@@ -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
|
||||
}
|
||||
Reference in New Issue
Block a user