From 8c20fb22dc452c21e96dc59f6d8fe84367da0a3b Mon Sep 17 00:00:00 2001 From: Pacho Ramos Date: Fri, 20 Mar 2015 19:58:31 +0000 Subject: [PATCH] Sync gtkrc with settings.ini from gtk3 and default values from other distdistributions. Readd ~arm64 as looks like it was lost at some point by error. Package-Manager: portage-2.2.17/cvs/Linux x86_64 Manifest-Sign-Key: 0xA188FBD4 --- x11-libs/gtk+/ChangeLog | 9 +- x11-libs/gtk+/Manifest | 9 +- x11-libs/gtk+/gtk+-2.24.27-r1.ebuild | 302 +++++++++++++++++++++++++++ 3 files changed, 315 insertions(+), 5 deletions(-) create mode 100644 x11-libs/gtk+/gtk+-2.24.27-r1.ebuild diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog index 3c72edc64581..542402ea1f83 100644 --- a/x11-libs/gtk+/ChangeLog +++ b/x11-libs/gtk+/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for x11-libs/gtk+ # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.772 2015/03/20 19:45:33 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.773 2015/03/20 19:58:30 pacho Exp $ + +*gtk+-2.24.27-r1 (20 Mar 2015) + + 20 Mar 2015; Pacho Ramos +gtk+-2.24.27-r1.ebuild: + Sync gtkrc with settings.ini from gtk3 and default values from other + distdistributions. Readd ~arm64 as looks like it was lost at some point by + error. 20 Mar 2015; Pacho Ramos -gtk+-2.24.26.ebuild: Drop old diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest index 3ca574bc4395..e6139cd064f4 100644 --- a/x11-libs/gtk+/Manifest +++ b/x11-libs/gtk+/Manifest @@ -23,17 +23,18 @@ DIST gtk+-3.14.9.tar.xz 15716588 SHA256 3be9560e6e99388d7706a168e3353ecd63fc30ec EBUILD gtk+-1.2.10-r12.ebuild 2406 SHA256 03e22a0e23e19cc0ad87697527ac186aeb6904b7e007bb0c023196f80765b716 SHA512 fb4a7905b5d6390a9d12bd5b0dd8e1b19744a5620279da1ae8c6962c80db44b9707dc6cd4d3a80cb091b5f4cfeacfeee7f5ebe46d1ecd2a3f720d8ccb73d8be4 WHIRLPOOL f3414b479f126236bef1670a51b46a2c37553f1c37edc912ed121f807926fa2dc87bcc8af1fa079cd12eeb8bc3084a4348948565356621c6a1ec267f40da1235 EBUILD gtk+-2.24.25-r1.ebuild 9937 SHA256 f03dbe887c0170df7d3856275e10d7f5c109bbc82f68290143edf8e415e2490a SHA512 442efec4c7b807768a409dffb7ef3aaf05590435dd6b7d4ca0406b90a171057835e9c2b74773cdd5120585291b07b69ed9747b2078270ac0e6fe7c9c262ded1e WHIRLPOOL 813af7c32312a2df328b8c4616c04db72565deeea41889396be2156338dafa5a62b47ca8c84bbde4eea9313d464553eed4ca84b300611341f816856a32c0ce37 EBUILD gtk+-2.24.25.ebuild 9303 SHA256 06de60abc98acf5ffbf2f5a738330bcfba09816b4c1d0bfb0de2bcd854301af0 SHA512 1568f20620ebac879bed686c16450f6e0fb62864a83705ae06e55bb5e3e1e50ef92d055c57054532dac3f7492c716ea5fc188cd2ab4ae98cffa5095b84ef1984 WHIRLPOOL 975530592ccc3b92bf04403097a2ad623be9f5ffee902a15c79b08847a71f43702b54ccbcf1b33b93cafbbb239449594beb2ed198a57a1d733e53dd2f2eff743 +EBUILD gtk+-2.24.27-r1.ebuild 9826 SHA256 78386ad3b4a66486d031458c26fa037567a24f0d3600e11033aae898fe77e33e SHA512 ee12a0ceae7ccf9195029e028fb2b38aa6651baadbc2b4666d6b8f81f5958061ebecd22f9e05dc2b054cead74d6e92da75f888d3bd2e9a72cbdabdf018a6a947 WHIRLPOOL 70ecba066ff2b8051daecabd1c62897aff6110260ecdba0fc0bc83543042e49417a735bd84c6e5869cc1df2e4f99d2b9b6811497d90400d737a06b5b5f866191 EBUILD gtk+-2.24.27.ebuild 9571 SHA256 9facf5c43254a3795f3322aff352ffc0454d13fd63d4992bb08df45135ad15cf SHA512 8196280266bad3ad744fd89ef2b3c5e7d63bcd52c16ca2615dd964bbe57803cde121fb78ae9401985d4557dcefa33d9488aea2b920cf8ad347730f5ab0303fa9 WHIRLPOOL 955b1e42083790f7d517212e360cb1543ce78ec3530a8e88997736211a8800aea875a2d67044273acd3a761e3222891546ca033ceed150fba6af9776ac763636 EBUILD gtk+-3.12.2-r2.ebuild 8223 SHA256 ecee6c83c1418c0d69d7f2a21c8219cb9675509d23cfd378455af80b4cb127aa SHA512 5057611b2b8b767bf4ff36a9583e6a1635b470742b6cc429a1876a77af903dae9d1903174062bd01c568b7df9bea4f67f0e2571387fbbd1d409765b5c56653a1 WHIRLPOOL ed6f48b1908ce088dbd4ffe36709772361d80c73de5b247a8996c40ca6fe87eae19a5b61c23a632b91fcbeb53bb4ff8cce4bb841145519737cfa324fceb36626 EBUILD gtk+-3.12.2.ebuild 6597 SHA256 be97832d070fab365a441ef5b124b803417f8ca1fa1fefd22f17772af6632e7e SHA512 d78b8d1696f16607feb4b2695ae48756cf69ea7704b73a1dda99e6f7aec119e8483c2f4197dba17188131ba9ea9a7fc18d1c97190ff3dd3a1981c3093810cd05 WHIRLPOOL e6435dd7ee84c81b9e5f1fa6b9989b6c0bd62aad8f8e35419a6dce57e174507cf60968441681057dfdcd0924f50de8409881f341253fc0d1421faedfe5a67467 EBUILD gtk+-3.14.9.ebuild 7258 SHA256 2733a2998202bb26820273f3d86209ae6a2c80e66f0d45262e4e772a1ace92a6 SHA512 20a0c3df9db6d1059cd8129e0efe6c7a1c21686f01222912dc21312f048f4206d613bcad6585744f6283ac4bde16d3bd62f1eb09830e9fa7a46e544f5fa8b13e WHIRLPOOL b1deee6a82be9ffa70b18855b376d30f9e4376654facb66c64a9fdf2f290c4fd8a0afacbb37b37ec53b3acefc0980aa6daa1f8eb58ec01bf6ba48cb85d56c9f0 -MISC ChangeLog 21535 SHA256 05c6ddcdbf793a06a4d81756c4f888a5a1207251e1bc660eb33861fe5ee90aef SHA512 0e2a494c8cb041cfd71941577e5c0b372db85971ca84bc0e26779d87b1c459b78bd3307e856440c4cf34d0775c614843dba8ba0388dd46aea934462536c20d8c WHIRLPOOL 926734bf537c54ea3fe087c8a301a9308ff74202a8a67d509d1e9fd280ceed12875deb1141c920f70801a3dccdf05093699b0c739e194a83693ed5a940d14959 +MISC ChangeLog 21796 SHA256 b36a3ead9348309639f770151b7c5adf2f751288ab52541e656fbc09bff45c3d SHA512 255bc1a4dc98df2620fa4c1ea89399466c749b141220cea616f3809fb8c2fd58b200e6c75d81c41ff250967f48b9c2622971a18a76b22315d9caa17406d8545d WHIRLPOOL 8a9037390b6aefee5e64143003d6d1e30dc5f33f841301b23e1b5e4f49f96951e28abebba096b9f4d25cdd235b04665ca78957067ba0ccc30d52c141e8af8918 MISC ChangeLog-2012 98793 SHA256 cace01db369f8f0e2902b3893738711adaf7f92ce43ad566b1a38d73b2a90633 SHA512 98499bb7fc111d86c5bc87b5ca415d0d3e73c3a1b3655a14e164e28e45e5f4141a8f0e1c259177141abf9861aecf47e48bddd4b3dfd5b902e5ab01cd9ab24a34 WHIRLPOOL 618327a12a938e54f1e3f86299d51f1721d8be69b12c8ea33fc0061df3020d83dd20025feb658a3ca26a5e05338102e0a37a62ecf8224e3e492bb4e3b571ceec MISC metadata.xml 763 SHA256 03a0b8d26ef0461bedaf694959d0025f192a70b368b2e19f8fe438f5941011ca SHA512 c3126323546eb09681b3a72cb67dd0d0fbbb792fd8df5eee821705f68ae5ffcc708d2e368bc26c97dd602d051d424af2dfd89f2e384d56c50219b3f6a47dd792 WHIRLPOOL 1ea3a03d5b2946841ce1b4945a3a3dd095ce1f6be91afc9f869d2e8d88534ae1ce197dc5904452f099f9054f0dc69d2bc9c37269438ebdbcaadf25eb04c4a365 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlUMeMYACgkQCaWpQKGI+9RtCgCfXLszvXpfUucqXbjAHnz0+oec -ANkAn089loEART+/AoGjv3lWCDGY7wKk -=tppS +iEYEAREIAAYFAlUMe88ACgkQCaWpQKGI+9SOzQCfZihdjuqXLJwXZTyJFsJE1PTr +6z4Anjgtm+fiFFMdScA9VRWfmLtL11Kq +=W1xB -----END PGP SIGNATURE----- diff --git a/x11-libs/gtk+/gtk+-2.24.27-r1.ebuild b/x11-libs/gtk+/gtk+-2.24.27-r1.ebuild new file mode 100644 index 000000000000..68ac54bbcfef --- /dev/null +++ b/x11-libs/gtk+/gtk+-2.24.27-r1.ebuild @@ -0,0 +1,302 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.24.27-r1.ebuild,v 1.1 2015/03/20 19:58:30 pacho Exp $ + +EAPI="5" +GCONF_DEBUG="yes" +GNOME2_LA_PUNT="yes" + +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 examples +introspection test vim-syntax xinerama" +REQUIRED_USE=" + xinerama? ( !aqua ) +" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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} + ! "${T}/gtkrc" + echo 'gtk-theme-name = "Adwaita"' >> "${T}/gtkrc" + echo 'gtk-icon-theme-name = "gnome"' >> "${T}/gtkrc" + echo 'gtk-cursor-theme-name = "Adwaita"' >> "${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 +} -- 2.26.2