From 4215da08a07f443464142fa8894677641c771293 Mon Sep 17 00:00:00 2001 From: "Gregory M. Tuner" Date: Thu, 24 Apr 2014 03:12:31 -0700 Subject: x11-libs/gtk+-{2.24.23-r1,3.10.8-r1}: revbump/merge Signed-off-by: Gregory M. Tuner --- x11-libs/gtk+/Manifest | 5 + x11-libs/gtk+/files/gtk+-3.10.7-clang.patch | 24 +++ x11-libs/gtk+/gtk+-2.24.23-r1.ebuild | 268 ++++++++++++++++++++++++++++ x11-libs/gtk+/gtk+-3.10.8-r1.ebuild | 236 ++++++++++++++++++++++++ 4 files changed, 533 insertions(+) create mode 100644 x11-libs/gtk+/files/gtk+-3.10.7-clang.patch create mode 100644 x11-libs/gtk+/gtk+-2.24.23-r1.ebuild create mode 100644 x11-libs/gtk+/gtk+-3.10.8-r1.ebuild (limited to 'x11-libs') diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest index 7ddca82..dbf853b 100644 --- a/x11-libs/gtk+/Manifest +++ b/x11-libs/gtk+/Manifest @@ -9,6 +9,7 @@ AUX gtk+-2.21.3-multilib.patch 611 SHA256 4c3db89f401176ea121a982974d81ca6ba3db3 AUX gtk+-2.24.20-darwin-quartz-pasteboard.patch 435 SHA256 3eaf1b2f534309344f046c1155b29d821c96287360705f13d88e182e720777b1 SHA512 123526aadb43c98490f361b964d709d78b9e10beebb845b71474a4db8eb7bfe1b102a9736b50f4c6e20bb4fa7ad8dafa52e4237f30dcae9094d2575446148126 WHIRLPOOL cf9bde6aac5e34dae5e5788d0a098e2c1230c585cb614a71d784ca587c6f0bc5f874d42d684af2e9d2314df8a2aee23e2a66d8fb36f625f04925374a7ba5bd64 AUX gtk+-2.24.22-out-of-tree-test.patch 958 SHA256 8e6889dffdb54a0f88c0d9a8f0494cdfb385a87b3dd11ce0d474e3b2f8940537 SHA512 4b8a022788531854ad41768194a5e9efb647427769a695a57d317f7b390991bbb536c83f90e510e6222877fce55e4c4a6a068534808fe2f0fbbc9aa13a93192c WHIRLPOOL 5e3a366ed28e000225d864958a62ad55c9f565cf7b23f8cd84e908bfe09cac1b1f5c6dc0eec419629b78ea7bb42469db3591cb232901ad16086380cd18b7c6a9 AUX gtk+-2.24.7-darwin-quartz-introspection.patch 1239 SHA256 c718aae4511d9de28ea7b300a7f3d5e1099889a320847c8e642a2e6010838069 SHA512 c618aa19791f258d95cc31efe00b7515992b150933c591b9bbc87c0972646f9982126c0a2f279e287bcbb2768b57d117c59d806b1e60641f070818f78957955e WHIRLPOOL 173e0a8404bfcd29adf0b55155eef80d927ca536f89806591bc87c90b6eed4e64f9e2cb9ad5ce15f6f8f63381a378abc4cfb8c9b802166763111a052681c9bc4 +AUX gtk+-3.10.7-clang.patch 638 SHA256 da43b09c7661425776308608352a679ad9085ad7ba3eb17f8a2aaf5e570ddcec SHA512 1cced40ae74cf7123d70e3ea114bdc036b43e06eb15115916ca3b05272650bf5813f5ead7542174d70e707a8260015bf1baf9d8d99899c3abd86dcdd3b63cffe WHIRLPOOL bc57420d7630791e146f77f515fc139c307172982f634646e220510fd0950a5991f2ea3824a3a11e3242066bc3e426e30bfb1502d76f328a685f06dddd344e5b AUX gtk+-3.3.18-fallback-theme.patch 2841 SHA256 a552218132b903835a480881803e29be678a311d3a653b8111eba1fd0ea04922 SHA512 2be5cd482625292780e88c6be5ec3e2932a1b3187ac57f2a0bbb37ebdeb9b34e56481a4ca74fc7af088389fb68dbb748e8e2cffc984052695fa6032bff0556cb WHIRLPOOL 8ae2ea9175a6ad5e0cfa6f8e018bd9ddb580548f496a81360ca302cc9d4d7cf70f5cb86f52967ee770e71f530b238d7b070b8aa61ffd040990ef0cb7b1811804 AUX gtk+-3.3.20-wayland-xkbcommon-headers.patch 1347 SHA256 9876be3bf2ef19413248e5de51e285aa1545b3d94751e840692b811c7b4bd9a9 SHA512 8397530f85a0b8e611ab30fd4ea6a3421c7862a8aeb05ba1eaea951a2e82738bc4482e8c04be620cc03690e413190cce63f0efe0cd39aecb62e70e754e8d240c WHIRLPOOL 0a1f78b076166af3727740fb736471304124dfcf1544a0452ebd6551cd0fe00a02d09ce2c44863c6df51d1b5030cfa849e89226662cc4f633ac820c4d5d2ef78 AUX gtk+-3.4.4-isnan.patch 1507 SHA256 5219d12c27fa6deba8da1530c504288ec8cb9629fbcdc7a9c1e2890bc82c6fd8 SHA512 1bbae03def87a92167fcde8800ec5554b240174c07d7f434e45f5ffc7ae64092cbbc04d428d786c001c0efba071f5a6e2f7db5da161fdb2cd94459b58a6e98a3 WHIRLPOOL e27c9d8d8f69a81e693df85576a29e3ef8d0badfa5b0c7325c185699fc4a70790ac3a5c20406c5d1ddd5756bcb6d1dadf8af8cde0ed43f4d931072af6f4a6190 @@ -20,10 +21,14 @@ AUX gtk+-3.8.6-skip-filechooser-test.patch 795 SHA256 1b900fc9501024170f2bfc48e3 AUX gtkrc 627 SHA256 22e4197e5976ed623233399049082383033b613176d77126d246a1f6cb747294 SHA512 9fb246b8e483cfb5f8d3666397d50547ad0cdaa8bdf5737e67e14dd100952438ac93396f0d752306c02aa4934453a43eb360093c4e323e99bbe0706c40171dc4 WHIRLPOOL fdb1c72ce448e867dd8d591455103fb7790919e1d7e77d6c5aa46e9a3fbc590ad6a189c50d2bc958896471a31b975940960307dc80a2d88416b77fca581b4dfb AUX settings.ini 96 SHA256 a42c86c26b5bfa0da806961e28cdff21da6e2f7c35febf67c67d7f2667658163 SHA512 76eff45e3413ed7b2fb6bb557c363cd6d8a65ae505709cf5ce26d579470e38968d51e72615779f47fac2994937a3c64ac4143c6cbd2cf5a2db23a01bcd9b6418 WHIRLPOOL 64a2c11ef1a6eda0bca40555a182023229202bcf15d527e6da8c52703be2fca26629b78ed677522eb626de7b7f456a7c37ab7fc3fe41907f1a46d770edb1fd67 DIST gtk+-2.24.22.tar.xz 13376344 SHA256 b114b6e9fb389bf3aa8a6d09576538f58dce740779653084046852fb4140ae7f SHA512 be17f877eda8dd80c063dfaa0d1db2efbcdf699550bb740718b809d132a4e75cc074a53d9a03529f079a3d51527fb0841092d702f6d2afb92333b2c7ebb45993 WHIRLPOOL e4a588b588d29aebb79ce47dc161d1bcfeb7d12e6f500bcd4e03bea7d2d9fe399cbde471c40b668775463f11b72f600e5ebf36d65b59d4ea3574e14848f7260d +DIST gtk+-2.24.23.tar.xz 13316276 SHA256 a0a406e27e9b5e7d6b2c4334212706ed5cdcd41e713e66c9ae950655dd61517c SHA512 e6db7d61d753f5d8ce0f41e99b461decda364d04314ff58838d2f98f29aab22313c0b5898f2cf56ddd3a18e0544f47ad796e673390d464ee2160b2542c5f558b WHIRLPOOL 65d5e277ee416bef424fa5ec424363f3f573007fa778ffef0322b75ac6835680c1ea30dc30dc03c1a8ff7b4b732df523509e573141364fcdf8cf367f8dd459b6 DIST gtk+-3.10.7.tar.xz 14363820 SHA256 b7e9de15385031cff43897e7e59f6692eaabf500f36eef80e6b9d6486ad49427 SHA512 cb138b468b8ea159b2fe7888500f08665cf54a66a042bf507539f4d8791e4dde074a98a87f6c6a36094d3996eb300f4a70b4fc9604709f9af6f7ebfb73efe3b7 WHIRLPOOL 5db9a67e620339c042530115b974f177102af003fdeab0d58eb1075f30daf4674aeb97756f3aa397e5471a5b94a251f36c782f6631315408d80c4c1b53bf4c13 +DIST gtk+-3.10.8.tar.xz 14187652 SHA256 5fd28b35ab475d521751fa6ae91318bf58f69cd34e71363f24e23d3ea406b684 SHA512 b96ef832fb76c0d35f8e9a2db48c4d65229dda5a5755f8f0010e3d5731322dc8a6a01d9d0ee10e93e19b5102ad8025286cf7f1caa9466279d1daf9ec52d98b34 WHIRLPOOL 554e1e34a55103be0cfa8d0af00026dd3dc1b4a8666ba99e298ff2004b2da4971a57ddf891110b825f75aa57967c5fbc338c2752ad9b393d1515b8ad148ac79d DIST gtk+-3.8.7.tar.xz 13847376 SHA256 9cb4400922fcd7b71bf899036dd3d09cdcc61af8e5a0f302121c1686c7d67c89 SHA512 cbcf205188baafdeff3e58bd54a4b4f3a55e4d98938cb56f973825eebdb7a5eeb3337aee97dcff85e059520d2cfd830b01b02b36252f225291045973df5e1207 WHIRLPOOL fff4ba16809a2262e939a44c3b6d182108b47ad1d2f0a6d99d5a4e9018b0a51c8c043c171291b22048aa67970d2cbeb0859cd35546e3b50933aca657d9ed4d29 EBUILD gtk+-2.24.22-r1.ebuild 8893 SHA256 b136fa2cf4e06f7ba562bef3bcbce679c02bdfa47c74b7ab22c2901480737468 SHA512 4098ccdbecb6257cd97ee712573b92d2f2abe6a8dc8acc85bf6919854f4eddbfab2a83df77b02fd205a610ad2dea9880f520a54ab7b39e77d8e1f7682350e0c6 WHIRLPOOL b4b11159449e5c3b16fab7ab602d6eb024e3dc1f2dfcae8f9a65aad9e2d922ef4e4d4a462b938c59bdecfb1123613867c2476c0fc4a39004cb43be33ce0320d8 +EBUILD gtk+-2.24.23-r1.ebuild 8854 SHA256 1ef10e8b4ee4048865141d528a7cfba27a7b5908f80069c4214d7f553931396b SHA512 1d0f2bc5c30b31b598f8b5cbb4ea80093170a7d95b9561152c6f8dc7343ce77cb9ca8d06be2705016dd53a146d3fb033407b15916ea90477210223da4b3f18fd WHIRLPOOL 6cd6fcef610a4bff2caccc286366bf7f51621a5de21eaaa6a6bf3d3362ed3091c4f7aafd6f13430f4297ba0cf9e997175ce1e58d04675254dcbdb2a55de1a068 EBUILD gtk+-3.10.7-r1.ebuild 7357 SHA256 2ba1899f5333b63a415da536d466c08acc75977fefb3235674425cbbea2e3992 SHA512 1818c29feae009ca04619a7d7302505c2cfe60d6aa0a73464b181e5d8b8997df84c4d4197665db3ebaa77a325f50c8ecbb8fda51a0e55d9d5644fdd43e04d6a4 WHIRLPOOL 6fcbf800ccef9a00202f97af87508f7b2ee8e61568f6f4945521e69659c2bc5efc495e8c6691c2c8c3329e076e7fbad7f5fcf56fece89641792fadf47b72023c +EBUILD gtk+-3.10.8-r1.ebuild 7405 SHA256 3d3a795ac5810b12e5a568cb978569d44559842008798b045dda3a043d1688be SHA512 572f31a649f013747d38489437d65f1b742ff8dd292ca73fe5be48b6a2ddef1e245230d38ad51eb4b7936c14020fac0b0bdeb7b1e054a4a97ead58f4af596d70 WHIRLPOOL 6c9734b61b0d089256d4b805c7aa612c7da92e570111033e98b9685b585965935ae98f63749a2b64f1e839d2b7b3f053fd56790387e6670ed240b1b1e330e05d EBUILD gtk+-3.8.7-r1.ebuild 7922 SHA256 c6d9ef100d44c5b46b6a512c5bf3f8aa05d0dd5a2556b63ac4a0aa0ca6e477ab SHA512 0ac51aa6d8ca15eede4648ae6ab78fa9ccede987995d997465e02c155e61d77f423e4ad36b36b2b85b48b37a9a0fccb6ad98bcf44e8807215bc67b384a9c7f31 WHIRLPOOL f1bbebfa7481921275aca856c3f097db27a63031fc3aa98750809aa424dc225a293028f8e3af2b45112b4423bf8a2f98892b2f69a746fcf25d27d742a8087c18 MISC ChangeLog 9932 SHA256 54a7a3fa0371b0fc1f8e9f0be2d1191c88277411e1db4d7b34993f98935d5fcb SHA512 4e850b2f0972dfced29c6dc9a7073395f3743c63b51d3a854d22850959e3f0663291b336ccc9ff4787edcf5791affb3be5bd0cc668482f822a95a65c4eaa3197 WHIRLPOOL b271a6c437af187100344842e899e382246335477f19abc5ceaab630efe25a200440e700a3e7422b3d278084937611ae30e5d9c2199282edaced133e3b8ce1f0 MISC ChangeLog-2012 98793 SHA256 cace01db369f8f0e2902b3893738711adaf7f92ce43ad566b1a38d73b2a90633 SHA512 98499bb7fc111d86c5bc87b5ca415d0d3e73c3a1b3655a14e164e28e45e5f4141a8f0e1c259177141abf9861aecf47e48bddd4b3dfd5b902e5ab01cd9ab24a34 WHIRLPOOL 618327a12a938e54f1e3f86299d51f1721d8be69b12c8ea33fc0061df3020d83dd20025feb658a3ca26a5e05338102e0a37a62ecf8224e3e492bb4e3b571ceec diff --git a/x11-libs/gtk+/files/gtk+-3.10.7-clang.patch b/x11-libs/gtk+/files/gtk+-3.10.7-clang.patch new file mode 100644 index 0000000..2f9afb4 --- /dev/null +++ b/x11-libs/gtk+/files/gtk+-3.10.7-clang.patch @@ -0,0 +1,24 @@ +From 9f1159a1a85e022717959b99ec3745f4c95543a7 Mon Sep 17 00:00:00 2001 +From: Matthias Clasen +Date: Sat, 14 Dec 2013 01:05:03 +0000 +Subject: Fix a compiler warning + +Don't return without a value from a non-void function. +--- +(limited to 'gtk/gtkselection.c') + +diff --git a/gtk/gtkselection.c b/gtk/gtkselection.c +index e20d464..caec0dd 100644 +--- a/gtk/gtkselection.c ++++ b/gtk/gtkselection.c +@@ -2295,7 +2295,7 @@ _gtk_selection_request (GtkWidget *widget, + gulong selection_max_size; + + if (event->requestor == NULL) +- return; ++ return FALSE; + + if (initialize) + gtk_selection_init (); +-- +cgit v0.9.2 diff --git a/x11-libs/gtk+/gtk+-2.24.23-r1.ebuild b/x11-libs/gtk+/gtk+-2.24.23-r1.ebuild new file mode 100644 index 0000000..9a3d294 --- /dev/null +++ b/x11-libs/gtk+/gtk+-2.24.23-r1.ebuild @@ -0,0 +1,268 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="5" +GCONF_DEBUG="no" + +inherit eutils flag-o-matic gnome2 multilib virtualx autotools readme.gentoo gnome2-multilib + +DESCRIPTION="Gimp ToolKit +" +HOMEPAGE="http://www.gtk.org/" + +LICENSE="LGPL-2+" +SLOT="2" +KEYWORDS="~amd64" +IUSE="aqua cups debug examples +introspection test vim-syntax xinerama" + +# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf) +COMMON_DEPEND=" + !aqua? ( + x11-libs/libXrender[${MULTILIB_USEDEP}] + x11-libs/libX11[${MULTILIB_USEDEP}] + x11-libs/libXi[${MULTILIB_USEDEP}] + x11-libs/libXext[${MULTILIB_USEDEP}] + >=x11-libs/libXrandr-1.3[${MULTILIB_USEDEP}] + x11-libs/libXcursor[${MULTILIB_USEDEP}] + x11-libs/libXfixes[${MULTILIB_USEDEP}] + x11-libs/libXcomposite[${MULTILIB_USEDEP}] + x11-libs/libXdamage[${MULTILIB_USEDEP}] + >=x11-libs/cairo-1.6:=[X,svg,${MULTILIB_USEDEP}] + x11-libs/gdk-pixbuf:2[X,introspection?,${MULTILIB_USEDEP}] + ) + aqua? ( + >=x11-libs/cairo-1.6:=[aqua,svg,${MULTILIB_USEDEP}] + x11-libs/gdk-pixbuf:2[introspection?,${MULTILIB_USEDEP}] + ) + xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) + >=dev-libs/glib-2.34:2[${MULTILIB_USEDEP}] + >=x11-libs/pango-1.20[introspection?,${MULTILIB_USEDEP}] + >=dev-libs/atk-1.29.2[introspection?,${MULTILIB_USEDEP}] + media-libs/fontconfig[${MULTILIB_USEDEP}] + x11-misc/shared-mime-info + cups? ( net-print/cups:=[${MULTILIB_USEDEP}] ) + introspection? ( >=dev-libs/gobject-introspection-0.9.3[${MULTILIB_USEDEP}] ) + ! "${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 +} + +update-immod-cache() { + if multilib_build_binaries ; then + gtk-query-immodules-2.0 --update-cache || die "Update immodules cache failed" + else + ${CHOST}-gtk-query-immodules-2.0 --update-cache || die "Update immodules cache failed" + fi +} + +pkg_postinst() { + set_gtk2_confdir + + multilib_foreach_abi update-immod-cache + + 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 +} diff --git a/x11-libs/gtk+/gtk+-3.10.8-r1.ebuild b/x11-libs/gtk+/gtk+-3.10.8-r1.ebuild new file mode 100644 index 0000000..390b439 --- /dev/null +++ b/x11-libs/gtk+/gtk+-3.10.8-r1.ebuild @@ -0,0 +1,236 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="5" +GCONF_DEBUG="no" +GNOME2_LA_PUNT="yes" + +inherit gtk-doc flag-o-matic gnome2-multilib virtualx + +DESCRIPTION="Gimp ToolKit +" +HOMEPAGE="http://www.gtk.org/" + +LICENSE="LGPL-2+" +SLOT="3" +# NOTE: This gtk+ has multi-gdk-backend support, see: +# * http://blogs.gnome.org/kris/2010/12/29/gdk-3-0-on-mac-os-x/ +# * http://mail.gnome.org/archives/gtk-devel-list/2010-November/msg00099.html +# I tried this and got it all compiling, but the end result is unusable as it +# horribly mixes up the backends -- grobian +IUSE="aqua colord cups debug examples +introspection packagekit test vim-syntax wayland X xinerama" +REQUIRED_USE=" + || ( aqua wayland X ) + xinerama? ( X )" + +KEYWORDS="~amd64" + +# FIXME: introspection data is built against system installation of gtk+:3 +# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf) +# Use gtk+:2 for gtk-update-icon-cache +COMMON_DEPEND=" + >=dev-libs/atk-2.7.5[introspection?,${MULTILIB_USEDEP}] + >=dev-libs/glib-2.37.5:2[${MULTILIB_USEDEP}] + media-libs/fontconfig[${MULTILIB_USEDEP}] + >=x11-libs/cairo-1.12[aqua?,glib,svg,X?,${MULTILIB_USEDEP}] + >=x11-libs/gdk-pixbuf-2.27.1:2[introspection?,X?,${MULTILIB_USEDEP}] + >=x11-libs/gtk+-2.24:2[${MULTILIB_USEDEP}] + >=x11-libs/pango-1.32.4[introspection?,${MULTILIB_USEDEP}] + x11-misc/shared-mime-info + + colord? ( >=x11-misc/colord-0.1.9[${MULTILIB_USEDEP}] ) + cups? ( >=net-print/cups-1.2[${MULTILIB_USEDEP}] ) + introspection? ( >=dev-libs/gobject-introspection-1.32[${MULTILIB_USEDEP}] ) + wayland? ( + >=dev-libs/wayland-1.2[${MULTILIB_USEDEP}] + media-libs/mesa[wayland,${MULTILIB_USEDEP}] + >=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}] + ) + X? ( + >=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}] + x11-libs/libXrender[${MULTILIB_USEDEP}] + x11-libs/libX11[${MULTILIB_USEDEP}] + >=x11-libs/libXi-1.3[${MULTILIB_USEDEP}] + x11-libs/libXext[${MULTILIB_USEDEP}] + >=x11-libs/libXrandr-1.3[${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}] ) + ) + abi_x86_32? ( + !<=app-emulation/emul-linux-x86-gtklibs-20131008-r1 + !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] + ) +" +DEPEND="${COMMON_DEPEND} + app-text/docbook-xsl-stylesheets + app-text/docbook-xml-dtd:4.1.2 + dev-libs/libxslt[${MULTILIB_USEDEP}] + dev-util/gdbus-codegen + >=dev-util/gtk-doc-am-1.11 + sys-devel/gettext[${MULTILIB_USEDEP}] + virtual/pkgconfig + X? ( + x11-proto/xextproto[${MULTILIB_USEDEP}] + x11-proto/xproto[${MULTILIB_USEDEP}] + x11-proto/inputproto[${MULTILIB_USEDEP}] + x11-proto/damageproto[${MULTILIB_USEDEP}] + xinerama? ( x11-proto/xineramaproto[${MULTILIB_USEDEP}] ) + ) + 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 +# >=xorg-server-1.11.4 needed for +# http://mail.gnome.org/archives/desktop-devel-list/2012-March/msg00024.html +RDEPEND="${COMMON_DEPEND} + !=x11-themes/gnome-themes-standard-3.6[gtk,${MULTILIB_USEDEP}]'; then + ewarn "Tests will be skipped because >=gnome-themes-standard-3.6[gtk]" + ewarn "is not installed. Please re-run tests after installing the" + ewarn "required version of gnome-themes-standard." + return 1 + fi + + # FIXME: this should be handled at eclass level + "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die + + unset DBUS_SESSION_BUS_ADDRESS + GSETTINGS_SCHEMA_DIR="${S}/gtk" Xemake check + return 1 +} + +ehook gnome2-multilib-global-post_src_install my_global_post_install +my_global_post_install() { + insinto /etc/gtk-3.0 + doins "${FILESDIR}"/settings.ini + + dodoc AUTHORS ChangeLog* HACKING NEWS* README* +} + +ehook gnome2-multilib-per-abi-post_src_install my_per_abi_post_install +my_per_abi_post_install() { + # add -framework Carbon to the .pc files + 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" + done + fi +} + +pkg_preinst() { + gnome2-multilib_pkg_preinst + + multilib_foreach_abi abi_pkg_preinst +} + +abi_pkg_preinst() { + # Make sure loaders.cache belongs to gdk-pixbuf 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 +} + +pkg_postinst() { + gnome2-multilib_pkg_postinst + gnome2-multilib_query_immodules_gtk3 + + 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-multilib_pkg_postrm + + [[ -z ${REPLACED_BY_VERSIONS} ]] && \ + multilib_foreach_abi my_per_abi_pkg_postrm +} + +my_per_abi_pkg_postrm() { + rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache +} -- cgit v1.2.3-65-gdbad