eva 14/12/27 01:16:09 Modified: gtk+-3.14.6.ebuild ChangeLog Added: gtk+-2.24.25-r1.ebuild Log: Reduce diff between :2 and :3. A number of code path are similar and should stay easily readable from a diff. Add ownership of immodules.cache in :2 ebuild and fix handling in :3 for multilib. Add epatch_user in :3. Fix sed for aqua not looking at files in relevant libdir. (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key C6085806)
Revision Changes Path 1.2 x11-libs/gtk+/gtk+-3.14.6.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/gtk+-3.14.6.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/gtk+-3.14.6.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/gtk+-3.14.6.ebuild?r1=1.1&r2=1.2 Index: gtk+-3.14.6.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.14.6.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gtk+-3.14.6.ebuild 14 Dec 2014 22:42:54 -0000 1.1 +++ gtk+-3.14.6.ebuild 27 Dec 2014 01:16:09 -0000 1.2 @@ -1,12 +1,12 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.14.6.ebuild,v 1.1 2014/12/14 22:42:54 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.14.6.ebuild,v 1.2 2014/12/27 01:16:09 eva Exp $ EAPI="5" GCONF_DEBUG="no" GNOME2_LA_PUNT="yes" -inherit eutils flag-o-matic autotools gnome2 multilib virtualx multilib-minimal +inherit autotools eutils flag-o-matic gnome2 multilib virtualx multilib-minimal DESCRIPTION="Gimp ToolKit +" HOMEPAGE="http://www.gtk.org/"; @@ -68,6 +68,7 @@ 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 >=dev-util/gtk-doc-am-1.20 sys-devel/gettext @@ -113,7 +114,7 @@ src_prepare() { # see bug #525928 - epatch "${FILESDIR}/${PN}-non-bash-support.patch" + epatch "${FILESDIR}"/${PN}-non-bash-support.patch # -O3 and company cause random crashes in applications. Bug #133469 replace-flags -O3 -O2 @@ -121,20 +122,18 @@ if ! use test ; then # don't waste time building tests - strip_builddir SRC_SUBDIRS testsuite Makefile.am - strip_builddir SRC_SUBDIRS testsuite Makefile.in - strip_builddir SRC_SUBDIRS tests Makefile.am - strip_builddir SRC_SUBDIRS tests Makefile.in + strip_builddir SRC_SUBDIRS testsuite Makefile.{am,in} + 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 - strip_builddir SRC_SUBDIRS demos Makefile.in - strip_builddir SRC_SUBDIRS examples Makefile.am - strip_builddir SRC_SUBDIRS examples Makefile.in + strip_builddir SRC_SUBDIRS demos Makefile.{am,in} + strip_builddir SRC_SUBDIRS examples Makefile.{am,in} fi + epatch_user + eautoreconf gnome2_src_prepare } @@ -200,7 +199,7 @@ if use aqua ; then for i in gtk+-3.0.pc gtk+-quartz-3.0.pc gtk+-unix-print-3.0.pc; do sed -e "s:Libs\: :Libs\: -framework Carbon :" \ - -i "${ED}"usr/$(get_libdir)/pkgconfig/$i || die "sed failed" + -i "${ED%/}"/usr/$(get_libdir)/pkgconfig/$i || die "sed failed" done fi } @@ -216,7 +215,7 @@ gnome2_pkg_preinst multilib_pkg_preinst() { - # Make sure loaders.cache belongs to gdk-pixbuf alone + # 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 @@ -230,7 +229,12 @@ pkg_postinst() { gnome2_pkg_postinst - gnome2_query_immodules_gtk3 + + 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." 1.746 x11-libs/gtk+/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/ChangeLog?rev=1.746&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/ChangeLog?rev=1.746&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/ChangeLog?r1=1.745&r2=1.746 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v retrieving revision 1.745 retrieving revision 1.746 diff -u -r1.745 -r1.746 --- ChangeLog 19 Dec 2014 13:43:48 -0000 1.745 +++ ChangeLog 27 Dec 2014 01:16:09 -0000 1.746 @@ -1,6 +1,15 @@ # ChangeLog for x11-libs/gtk+ # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.745 2014/12/19 13:43:48 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.746 2014/12/27 01:16:09 eva Exp $ + +*gtk+-2.24.25-r1 (27 Dec 2014) + + 27 Dec 2014; Gilles Dartiguelongue <[email protected]> +gtk+-2.24.25-r1.ebuild, + gtk+-3.14.6.ebuild: + Reduce diff between :2 and :3. A number of code path are similar and should + stay easily readable from a diff. Add ownership of immodules.cache in :2 + ebuild and fix handling in :3 for multilib. Add epatch_user in :3. Fix sed + for aqua not looking at files in relevant libdir. 19 Dec 2014; Pacho Ramos <[email protected]> gtk+-2.24.25.ebuild: amd64 stable, bug 529964 1.1 x11-libs/gtk+/gtk+-2.24.25-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/gtk+-2.24.25-r1.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/gtk+-2.24.25-r1.ebuild?rev=1.1&content-type=text/plain Index: gtk+-2.24.25-r1.ebuild =================================================================== # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.24.25-r1.ebuild,v 1.1 2014/12/27 01:16:09 eva Exp $ EAPI="5" GCONF_DEBUG="no" inherit autotools eutils flag-o-matic gnome2 multilib virtualx readme.gentoo multilib-minimal DESCRIPTION="Gimp ToolKit +" HOMEPAGE="http://www.gtk.org/"; LICENSE="LGPL-2+" SLOT="2" IUSE="aqua cups debug examples +introspection test vim-syntax xinerama" REQUIRED_USE=" xinerama? ( !aqua ) " KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" # NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf) COMMON_DEPEND=" >=dev-libs/atk-2.10.0[introspection?,${MULTILIB_USEDEP}] >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] >=x11-libs/cairo-1.12.14-r4:=[aqua?,svg,${MULTILIB_USEDEP}] >=x11-libs/gdk-pixbuf-2.30.7:2[introspection?,${MULTILIB_USEDEP}] >=x11-libs/pango-1.36.3[introspection?,${MULTILIB_USEDEP}] x11-misc/shared-mime-info cups? ( >=net-print/cups-1.7.1-r2:=[${MULTILIB_USEDEP}] ) introspection? ( >=dev-libs/gobject-introspection-0.9.3 ) !aqua? ( >=x11-libs/cairo-1.12.14-r4:=[X] >=x11-libs/gdk-pixbuf-2.30.7:2[X] >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}] >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] >=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}] >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] >=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}] >=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}] >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}] >=x11-libs/libXcomposite-0.4.4-r1[${MULTILIB_USEDEP}] >=x11-libs/libXdamage-1.1.4-r1[${MULTILIB_USEDEP}] xinerama? ( >=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] ) ) " DEPEND="${COMMON_DEPEND} dev-libs/gobject-introspection-common >=dev-util/gtk-doc-am-1.20 sys-devel/gettext >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] !aqua? ( >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}] >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] >=x11-proto/inputproto-2.3[${MULTILIB_USEDEP}] >=x11-proto/damageproto-1.2.1-r1[${MULTILIB_USEDEP}] xinerama? ( >=x11-proto/xineramaproto-1.2.1-r1[${MULTILIB_USEDEP}] ) ) test? ( x11-themes/hicolor-icon-theme media-fonts/font-misc-misc media-fonts/font-cursor-misc ) " # gtk+-2.24.8 breaks Alt key handling in <=x11-libs/vte-0.28.2:0 # Add blocker against old gtk-builder-convert to be sure we maintain both # in sync. RDEPEND="${COMMON_DEPEND} !<gnome-base/gail-1000 !<dev-util/gtk-builder-convert-${PV} !<x11-libs/vte-0.28.2-r201:0 abi_x86_32? ( !<=app-emulation/emul-linux-x86-gtklibs-20140508 !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] ) " PDEPEND="vim-syntax? ( app-vim/gtk-syntax )" DISABLE_AUTOFORMATTING="yes" DOC_CONTENTS="To make the gtk2 file chooser use 'current directory' mode by default, edit ~/.config/gtk-2.0/gtkfilechooser.ini to contain the following: [Filechooser Settings] StartupMode=cwd" MULTILIB_CHOST_TOOLS=( /usr/bin/gtk-query-immodules-2.0 ) 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." } set_gtk2_confdir() { # An arch specific config directory is used on multilib systems GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}" } src_prepare() { # Fix building due to moved definition, upstream bug #704766 epatch "${FILESDIR}"/${PN}-2.24.20-darwin-quartz-pasteboard.patch # Fix tests running when building out of sources, bug #510596 epatch "${FILESDIR}"/${PN}-2.24.24-out-of-source.patch # marshalers code was pre-generated with glib-2.31, upstream bug #671763 rm -v gdk/gdkmarshalers.c gtk/gtkmarshal.c gtk/gtkmarshalers.c \ perf/marshalers.c || die # Stop trying to build unmaintained docs, bug #349754 strip_builddir SUBDIRS tutorial docs/Makefile.{am,in} strip_builddir SUBDIRS faq docs/Makefile.{am,in} # -O3 and company cause random crashes in applications. Bug #133469 replace-flags -O3 -O2 strip-flags if ! use test ; then # don't waste time building tests strip_builddir SRC_SUBDIRS tests Makefile.{am,in} strip_builddir SUBDIRS tests gdk/Makefile.{am,in} gtk/Makefile.{am,in} else # Non-working test in gentoo's env sed 's:\(g_test_add_func ("/ui-tests/keys-events.*\):/*\1*/:g' \ -i gtk/tests/testing.c || die "sed 1 failed" # Cannot work because glib is too clever to find real user's home # gentoo bug #285687, upstream bug #639832 # XXX: /!\ Pay extra attention to second sed when bumping /!\ sed '/TEST_PROGS.*recentmanager/d' -i gtk/tests/Makefile.am \ || die "failed to disable recentmanager test (1)" sed '/^TEST_PROGS =/,+3 s/recentmanager//' -i gtk/tests/Makefile.in \ || die "failed to disable recentmanager test (2)" sed 's:\({ "GtkFileChooserButton".*},\):/*\1*/:g' -i gtk/tests/object.c \ || die "failed to disable recentmanager test (3)" # Skip tests known to fail # https://bugzilla.gnome.org/show_bug.cgi?id=646609 sed -e '/g_test_add_func.*test_text_access/s:^://:' \ -i "${S}/gtk/tests/testing.c" || die # https://bugzilla.gnome.org/show_bug.cgi?id=617473 sed -i -e 's:pltcheck.sh:$(NULL):g' \ gtk/Makefile.am || die # UI tests require immodules already installed; bug #413185 if ! has_version 'x11-libs/gtk+:2'; then ewarn "Disabling UI tests because this is the first install of" ewarn "gtk+:2 on this machine. Please re-run the tests after $P" ewarn "has been installed." sed '/g_test_add_func.*ui-tests/ d' \ -i gtk/tests/testing.c || die "sed 2 failed" fi fi if ! use examples; then # don't waste time building demos strip_builddir SRC_SUBDIRS demos Makefile.{am,in} fi epatch_user eautoreconf gnome2_src_prepare } multilib_src_configure() { [[ ${ABI} == ppc64 ]] && append-flags -mminimal-toc # Passing --disable-debug is not recommended for production use ECONF_SOURCE=${S} \ gnome2_src_configure \ $(usex aqua --with-gdktarget=quartz --with-gdktarget=x11) \ $(usex aqua "" --with-xinput) \ $(usex debug --enable-debug=yes "") \ $(use_enable cups cups auto) \ $(multilib_native_use_enable introspection) \ $(use_enable xinerama) \ --disable-papi \ 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() { unset DBUS_SESSION_BUS_ADDRESS Xemake check } multilib_src_install() { gnome2_src_install # add -framework Carbon to the .pc files if use aqua ; then for i in gtk+-2.0.pc gtk+-quartz-2.0.pc gtk+-unix-print-2.0.pc; do sed -e "s:Libs\: :Libs\: -framework Carbon :" \ -i "${ED%/}"/usr/$(get_libdir)/pkgconfig/$i || die "sed failed" done fi } multilib_src_install_all() { # see bug #133241 echo 'gtk-fallback-icon-theme = "gnome"' > "${T}/gtkrc" insinto /usr/share/gtk-2.0 doins "${T}"/gtkrc dodoc AUTHORS ChangeLog* HACKING NEWS* README* # dev-util/gtk-builder-convert split off into a separate package, #402905 rm "${ED}"usr/bin/gtk-builder-convert || die readme.gentoo_create_doc } pkg_preinst() { gnome2_pkg_preinst multilib_pkg_preinst() { # Make immodules.cache belongs to gtk+ alone local cache="usr/$(get_libdir)/gtk-2.0/2.10.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_gtk2 \ || die "Update immodules cache failed (for ${ABI})" } multilib_parallel_foreach_abi multilib_pkg_postinst set_gtk2_confdir if [ -e "${EROOT%/}/etc/gtk-2.0/gtk.immodules" ]; then elog "File /etc/gtk-2.0/gtk.immodules has been moved to \$CHOST" elog "aware location. Removing deprecated file." rm -f ${EROOT%/}/etc/gtk-2.0/gtk.immodules fi if [ -e "${EROOT%/}${GTK2_CONFDIR}/gtk.immodules" ]; then elog "File /etc/gtk-2.0/gtk.immodules has been moved to" elog "${EROOT%/}/usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache" elog "Removing deprecated file." rm -f ${EROOT%/}${GTK2_CONFDIR}/gtk.immodules fi # pixbufs are now handled by x11-libs/gdk-pixbuf if [ -e "${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders" ]; then elog "File ${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders is now handled by x11-libs/gdk-pixbuf" elog "Removing deprecated file." rm -f ${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders fi # two checks needed since we dropped multilib conditional if [ -e "${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders" ]; then elog "File ${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders is now handled by x11-libs/gdk-pixbuf" elog "Removing deprecated file." rm -f ${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders fi if [ -e "${EROOT%/}"/usr/lib/gtk-2.0/2.[^1]* ]; then elog "You need to rebuild ebuilds that installed into" "${EROOT%/}"/usr/lib/gtk-2.0/2.[^1]* elog "to do that you can use qfile from portage-utils:" elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.[^1]*)" fi 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 gtkrc." fi readme.gentoo_print_elog } pkg_postrm() { gnome2_pkg_postrm if [[ -z ${REPLACED_BY_VERSIONS} ]]; then multilib_pkg_postrm() { rm -f "${EROOT}"usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache } multilib_foreach_abi multilib_pkg_postrm fi }
