# ChangeLog for x11-libs/gtk+
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.536 2011/10/18 18:43:56 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.537 2011/10/19 03:48:07 tetromino Exp $
+
+*gtk+-3.2.1 (19 Oct 2011)
+
+ 19 Oct 2011; Alexandre Rostovtsev <tetromino@gentoo.org> +gtk+-3.2.1.ebuild,
+ +files/gtk+-3.2.1-failing-tests.patch, +files/gtk+-3.2.1-selector.errors,
+ metadata.xml:
+ Add gtk+-3.2.1 from the gnome overlay. Disable failing treeview scrolling
+ tests (see bug #384855 and https://bugzilla.gnome.org/show_bug.cgi?id=660931),
+ add missing selectors.errors file (needed for the css parser test),
+ completely skip reftests (many of them fail when building from portage, but
+ strangely enough succeed when building from my home directory; need to
+ investigate why), and disable a11y picker test (GtkFileChooserButton look
+ depends on list of mounted filesystems).
+
+ Notable changes: *lots* (better theming, including a new CSS parser, and dark
+ theme variants; better XInput2 support; gail is no longer a module; tree
+ model improvements; more widgets support height-for-width;
+ GtkFontChooserDialog, GtkLockButton, GtkOverlay).
*gtk+-2.24.7 (18 Oct 2011)
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
AUX gtk+-1.2-locale_fix.patch 419 RMD160 a0fbf3fb111f39b7a62c3fa31a803ef2a0ee945a SHA1 569c877ff692a7694e8aca5aceae9558844ba5dd SHA256 2e3cf84902d2f318dcbf4f9ad976573295d8d984c7a860291f37f768fc7966cb
AUX gtk+-1.2.10-as-needed.patch 19865 RMD160 17c6b5d447b2d1c56fcc89dad676156caf0d700e SHA1 1027f38d29492c6f77205fc40992d8e625da8dbe SHA256 0864194a1e2be5f1b3df91d7dceb50bbe038fbb29f24901891c22829d55d4da7
AUX gtk+-3.0.11-darwin-quartz-introspection.patch 2515 RMD160 e03ad9794395099b729e4cba53135b34ace777d0 SHA1 deda072dc35c454facccc232493bca5a5150b443 SHA256 49f8e2f1635c3eb8d7a4b2d1039150fc573f6a931ad2b3736176691ad2df8faf
AUX gtk+-3.0.12-use-const.patch 8069 RMD160 ca641c05aa678b046ec42a800c39ef80b9d9cf16 SHA1 19d46115ef68b3e77558bede23eb83853d9bc6c6 SHA256 4fbaf845da7aa757280711fc5e9a4b684b4f0f58ac78dc881336ca2cd0064749
AUX gtk+-3.0.8-darwin-quartz.patch 579 RMD160 e7cee263b7edbf2d8cdfb848939c0f588b595567 SHA1 5196ef95f68080e2bd8a1582db7d61b0a65b0aac SHA256 2d30683f849be9be698424514341e814833c102c4f41d12cd02536cba62846fc
+AUX gtk+-3.2.1-failing-tests.patch 1287 RMD160 364821995cd6e6cf1d8d24be55cbc44877b38680 SHA1 59b483d4a562a2563e8b44fbc3c84c97c2ff49d7 SHA256 07368c5a7b577b9493c3be423c51feadcfe48503203785e2e944309996a30850
+AUX gtk+-3.2.1-selector.errors 55 RMD160 e2f54101a3243845dad2fe799e1e17ecedee848f SHA1 73b998497c02bef60bd122d2644eff846fc289d4 SHA256 dfec659411fb82ac9464b07e1675bf428a114f0348836dc1f4a9f98b9a1b5707
AUX gtkrc 627 RMD160 3171e0c9132bb2a9119c51750702db23c4a5f076 SHA1 cdb4665e94e1b9e8bc3985390eecca463469c3b3 SHA256 22e4197e5976ed623233399049082383033b613176d77126d246a1f6cb747294
AUX settings.ini 96 RMD160 ff8d7e28f097820b15ea1d2168d9405db1a5707b SHA1 92c3120655ba14f163846a22d5c94fa50b0eb437 SHA256 a42c86c26b5bfa0da806961e28cdff21da6e2f7c35febf67c67d7f2667658163
DIST gtk+-1.2.10-r8-gentoo.diff.bz2 81223 RMD160 fa41bb12e41f0c60c605dbeac03a1aaa905f4333 SHA1 7350d1ed147e52ddc870a4d4b52073f7407d9f0d SHA256 517bdadbaa0e13285b2d72a667b311219342306d4f68d838c3c1dbc5bfbf1684
DIST gtk+-2.24.7.tar.xz 13224600 RMD160 37fcc2702da52ec9785a6886939b795fb3c764ae SHA1 5f5206b88498aba03fd2dc24a925c210410e6660 SHA256 1fdc7605501bd2932ef9a3c4c3c9a406e505f18667aea9e73af650da28fff994
DIST gtk+-3.0.12-use-const2.patch.xz 12500 RMD160 2cebd73630f83530a76ac263d797e196032994ee SHA1 697b8d41ba24386acd1cfec1d733361901e797dd SHA256 f10b251a52a4f5d73b435315c94297dd30a4bc3c20a25bc947842bb214808cc4
DIST gtk+-3.0.12.tar.xz 13104092 RMD160 c82d14e113ae287476f5887ca03b8b01b8d22e1b SHA1 1b87e12ef3dfe598ee757db1f5bdff6cd66e6558 SHA256 219fdea120897981840e909fac40d4d433fe061a37b12b9402e215c819ebeae9
+DIST gtk+-3.2.1.tar.xz 12664740 RMD160 38f61e8881b5dd1230aeafecc01cfa45629bc6ef SHA1 7f3feaa6e9227bfc9247d58fd34962c677750591 SHA256 f1989f183700cd5f46681cfabc2253e2f526b19b56e4b631dcee2594dddb0ef3
DIST introspection.m4.bz2 1181 RMD160 3648afa820c2ee7e240083076e1452285d043084 SHA1 e5188cc387d0d17feb77684feff7ff163779912f SHA256 69a2a57b12179159420825d1d44c74108014b0864c4d63500265639cfa9151ae
EBUILD gtk+-1.2.10-r12.ebuild 2386 RMD160 ed251a32d854304c5d9622844d07f183f14c9bd5 SHA1 93a6ec39cde941b4939c04da955475d017a6ff6f SHA256 e4874d2dd01bc266e7e0f5b691fcf4e54f6bd3a79658dcec6d5374c5910aa78b
EBUILD gtk+-2.24.4.ebuild 7474 RMD160 6423a1cb33e4f0493c39da224d2a125c45494c8a SHA1 d6d4caaf3ad58d7d81884d82b3fd6fbff6a15120 SHA256 08ae86596433eca5aa8cfa82f6eca0f0463fb4860d5ebfca1363dacb08eb4cc5
EBUILD gtk+-2.24.7.ebuild 7680 RMD160 72bb82e782cf3cbc41509b8d353186fdc781e821 SHA1 a5bd93f5415443d7b3c8a9413c99140aa9d68801 SHA256 a92648d881e6b15915136bde60e473ebb6f078b3554eae8d1988e3af47a7401c
EBUILD gtk+-3.0.12-r1.ebuild 6170 RMD160 ebe92a71db978280d40a63e2966999084886e8e0 SHA1 e46274870fd65b1c4fb6e1275ea2d7ef685dca3b SHA256 8dc2ad3629877acedf276793b926d4da4dc5c4c8453cd2118343951a104ce168
EBUILD gtk+-3.0.12.ebuild 5924 RMD160 304c8786053b789687d2179b017e2bc8b6538943 SHA1 b15b6ffc22ae2c709af8249f8283d1150e209d20 SHA256 a28b2ead97e9a6d44d2aab8db2811befd406444ca7733ca5d4eb3851301f4c9e
-MISC ChangeLog 80367 RMD160 1ae9d58abe955c7aa5de3f977e55c918a2a6a0ec SHA1 cb6d78e7da7de4cf7d382591a0ddb854e640dc61 SHA256 18dbcfc2800c02c44eb22fb8d61f9ea4a34b793fbfb24711edb2b365a72dd673
-MISC metadata.xml 549 RMD160 8d6692e4cf18e0c75421ddef09e2881624c5ce3e SHA1 ce3ed4bec69816eb61b5ca9d48c2db396085a923 SHA256 2e7f82b302d91c37ecf915de09e4b85ef093b790baacbef0325b6fe9b1bb304b
+EBUILD gtk+-3.2.1.ebuild 6258 RMD160 2b4640d8dcbff93d95417a086acc49daf52488ee SHA1 925ad995b2206a8b2bf4c6edcd9a3ac6586de08e SHA256 02bcec73d2ac2eb4ac7625b702d5b8a65a41b629c21f745dfa1399f5c94698ef
+MISC ChangeLog 81336 RMD160 ab1fce9c96e907f939f7265570376cc7021d73c4 SHA1 7fa683e2bf9e1dca68c0e33eaed1df8d0ee31749 SHA256 ce59c38dccb17161b06016e1514f12ba4fcd2db3f676daf6d63c03b0e306d4aa
+MISC metadata.xml 798 RMD160 9c1c01af06ea6cb0d398d66eda999eba1ec6880a SHA1 13f2860e4e48abb065d70fd85b7073074624ec28 SHA256 634c27d323d01eecbcda3159df57a7cc64557e2a0087eac60e6d9e3d94acd85c
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
-iEYEARECAAYFAk6dyPMACgkQCaWpQKGI+9Qj4gCfY/OtJbj9MsQGMosk/tR/nxDi
-2cUAnjNVzsPr3UpPdrFDsV1b8rm8HDIs
-=tIOn
+iF4EAREIAAYFAk6eSHwACgkQdjK8w9WeBnAkTgD/fxIDvZ8uwNtirz6AEa8ZmhEV
+/HN1FQTpJfhXQgvsQbQBAIY3JWeA2gTpWfh40iq/8S8k/tb4+K1peH0yz969y9uT
+=eO9H
-----END PGP SIGNATURE-----
--- /dev/null
+Skip failing tests. See bug #384855 and https://bugzilla.gnome.org/show_bug.cgi?id=660931
+
+diff --git a/gtk/tests/treeview-scrolling.c b/gtk/tests/treeview-scrolling.c
+index 63bf429..0f8bafd 100644
+--- a/gtk/tests/treeview-scrolling.c
++++ b/gtk/tests/treeview-scrolling.c
+@@ -1300,7 +1300,6 @@ add_tests (gboolean mixed,
+ add_test ("750", mixed, test_type, use_align, row_align, setup, scroll_func);
+ add_test ("990", mixed, test_type, use_align, row_align, setup, scroll_func);
+ add_test ("991", mixed, test_type, use_align, row_align, setup, scroll_func);
+- add_test ("995", mixed, test_type, use_align, row_align, setup, scroll_func);
+ add_test ("997", mixed, test_type, use_align, row_align, setup, scroll_func);
+ add_test ("999", mixed, test_type, use_align, row_align, setup, scroll_func);
+ }
+@@ -1491,10 +1490,6 @@ main (int argc, char **argv)
+ ScrollFixture, NULL,
+ scroll_fixture_tree_setup, test_bug93584,
+ scroll_fixture_teardown);
+- g_test_add ("/TreeView/scrolling/specific/bug-111500",
+- ScrollFixture, NULL,
+- scroll_fixture_tree_setup, test_bug111500,
+- scroll_fixture_teardown);
+ g_test_add ("/TreeView/scrolling/specific/bug-111500-mixed",
+ ScrollFixture, NULL,
+ scroll_fixture_mixed_tree_setup, test_bug111500_mixed,
--- /dev/null
+selector.css:201: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
--- /dev/null
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.2.1.ebuild,v 1.1 2011/10/19 03:48:07 tetromino Exp $
+
+EAPI="4"
+
+inherit eutils flag-o-matic gnome.org gnome2-utils libtool 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 doc examples +introspection packagekit test vim-syntax xinerama"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+# 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 and gtk-builder-convert
+# >=x11-libs/gtk+-2.24:2 is needed for bug 359555
+COMMON_DEPEND="!aqua? (
+ x11-libs/libXrender
+ x11-libs/libX11
+ x11-libs/libXi
+ x11-libs/libXt
+ x11-libs/libXext
+ >=x11-libs/libXrandr-1.3
+ x11-libs/libXcursor
+ x11-libs/libXfixes
+ x11-libs/libXcomposite
+ x11-libs/libXdamage
+ >=x11-libs/cairo-1.10.0[X,glib,svg]
+ >=x11-libs/gdk-pixbuf-2.23.5:2[X,introspection?]
+ )
+ aqua? (
+ >=x11-libs/cairo-1.10.0[aqua,glib,svg]
+ >=x11-libs/gdk-pixbuf-2.23.5:2[introspection?]
+ )
+ xinerama? ( x11-libs/libXinerama )
+ >=dev-libs/glib-2.29.14
+ >=x11-libs/pango-1.29.0[introspection?]
+ >=dev-libs/atk-2.1.5[introspection?]
+ >=x11-libs/gtk+-2.24:2
+ media-libs/fontconfig
+ x11-misc/shared-mime-info
+ colord? ( >=x11-misc/colord-0.1.9 )
+ cups? ( net-print/cups )
+ introspection? ( >=dev-libs/gobject-introspection-0.10.1 )"
+DEPEND="${COMMON_DEPEND}
+ >=dev-util/pkgconfig-0.9
+ !aqua? (
+ x11-proto/xextproto
+ x11-proto/xproto
+ x11-proto/inputproto
+ x11-proto/damageproto
+ )
+ xinerama? ( x11-proto/xineramaproto )
+ >=dev-util/gtk-doc-am-1.11
+ doc? (
+ >=dev-util/gtk-doc-1.11
+ ~app-text/docbook-xml-dtd-4.1.2 )
+ test? (
+ media-fonts/font-misc-misc
+ media-fonts/font-cursor-misc )"
+RDEPEND="${COMMON_DEPEND}
+ !<gnome-base/gail-1000
+ packagekit? ( app-admin/packagekit-base )"
+PDEPEND="vim-syntax? ( app-vim/gtk-syntax )"
+
+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() {
+ # -O3 and company cause random crashes in applications. Bug #133469
+ replace-flags -O3 -O2
+ strip-flags
+
+ # 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"
+ sed '\%/recent-manager/add%,/recent_manager_purge/ d' \
+ -i gtk/tests/recentmanager.c || die "sed 2 failed"
+
+ # Missing file, required for tests; https://bugzilla.gnome.org/show_bug.cgi?id=662024
+ cp "${FILESDIR}/${PN}-3.2.1-selector.errors" \
+ tests/css/parser/selector.errors || die "cp failed"
+
+ # FIXME: multiple reftests fail when run from portage (but succeed when
+ # run from a manual compile in a temp directory)
+ sed -e 's:\(SUBDIRS.*\)reftests:\1:' \
+ -i tests/Makefile.* || die "sed 3 failed"
+
+ # Test results depend on the list of mounted filesystems!
+ rm tests/a11y/pickers.{ui,txt} || die "rm failed"
+
+ # Failing treeview scrolling tests; bug #384855,
+ # https://bugzilla.gnome.org/show_bug.cgi?id=660931
+ epatch "${FILESDIR}/${PN}-3.2.1-failing-tests.patch"
+
+ if ! use test; then
+ # don't waste time building tests
+ strip_builddir SRC_SUBDIRS tests Makefile.am
+ strip_builddir SRC_SUBDIRS tests Makefile.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
+ fi
+
+ gnome2_src_prepare
+}
+
+src_configure() {
+ # png always on to display icons (foser)
+ local myconf="$(use_enable doc gtk-doc)
+ $(use_enable xinerama)
+ $(use_enable packagekit)
+ $(use_enable cups cups auto)
+ $(use_enable colord)
+ $(use_enable introspection)
+ --disable-papi
+ --enable-gtk2-dependency"
+
+ # XXX: Maybe with multi-backend we should enable x11 all the time?
+ if use aqua; then
+ myconf="${myconf} --enable-quartz-backend --disable-xinput"
+ else
+ myconf="${myconf} --enable-x11-backend --enable-xinput"
+ fi
+
+ # Passing --disable-debug is not recommended for production use
+ use debug && myconf="${myconf} --enable-debug=yes"
+
+ # need libdir here to avoid a double slash in a path that libtool doesn't
+ # grok so well during install (// between $EPREFIX and usr ...)
+ econf --libdir="${EPREFIX}/usr/$(get_libdir)" ${myconf}
+}
+
+src_test() {
+ unset DBUS_SESSION_BUS_ADDRESS
+ # Exporting HOME fixes tests using XDG directories spec since all defaults
+ # are based on $HOME. It is also backward compatible with functions not
+ # yet ported to this spec.
+ XDG_DATA_HOME="${T}" HOME="${T}" Xemake check || die "tests failed"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ insinto /etc/gtk-3.0
+ doins "${FILESDIR}"/settings.ini
+
+ dodoc AUTHORS ChangeLog* HACKING NEWS* README*
+
+ # Remove unneeded *.la files
+ find "${ED}" -name "*.la" -delete
+
+ # add -framework Carbon to the .pc files
+ use aqua && for i in gtk+-3.0.pc gtk+-quartz-3.0.pc gtk+-unix-print-3.0.pc; do
+ sed -i -e "s:Libs\: :Libs\: -framework Carbon :" "${ED}"usr/$(get_libdir)/pkgconfig/$i || die "sed failed"
+ done
+}
+
+pkg_preinst() {
+ gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+ gnome2_schemas_update
+
+ local GTK3_MODDIR="${EROOT}usr/$(get_libdir)/gtk-3.0/3.0.0"
+ gtk-query-immodules-3.0 > "${GTK3_MODDIR}/immodules.cache" \
+ || ewarn "Failed to run gtk-query-immodules-3.0"
+
+ 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_schemas_update --uninstall
+}
application suites.
</longdescription>
<use>
+ <flag name="colord">Use <pkg>x11-misc/colord</pkg> for color management
+ in printing</flag>
<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
for introspection</flag>
+ <flag name="packagekit">Enable support for the distro-neutral package
+ manager GUI <pkg>app-admin/packagekit</pkg> in application chooser</flag>
</use>
</pkgmetadata>
projects / gentoo.git / commitdiff