From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SR5zV-0008HE-8S for garchives@archives.gentoo.org; Sun, 06 May 2012 18:15:29 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 34686E0856; Sun, 6 May 2012 18:15:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 080A5E0856 for ; Sun, 6 May 2012 18:15:21 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5506864C58 for ; Sun, 6 May 2012 18:15:21 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 220C2E5402 for ; Sun, 6 May 2012 18:15:20 +0000 (UTC) From: "Alexandre Restovtsev" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexandre Restovtsev" Message-ID: <1336328090.35c8fa6ad887bac61ab40ced6ab2f552a61b76f0.tetromino@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/ X-VCS-Repository: proj/gnome X-VCS-Files: x11-libs/gtk+/gtk+-9999.ebuild X-VCS-Directories: x11-libs/gtk+/ X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Restovtsev X-VCS-Revision: 35c8fa6ad887bac61ab40ced6ab2f552a61b76f0 X-VCS-Branch: master Date: Sun, 6 May 2012 18:15:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 567917a0-c811-4686-a9ee-1fb1c258fef2 X-Archives-Hash: 26be2d063d97a57fd857facb3a16017e commit: 35c8fa6ad887bac61ab40ced6ab2f552a61b76f0 Author: Alexandre Rostovtsev gentoo org> AuthorDate: Sun May 6 18:14:50 2012 +0000 Commit: Alexandre Restovtsev gmail com> CommitDate: Sun May 6 18:14:50 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D35c8fa6a x11-libs/gtk+: sync with gx86 --- x11-libs/gtk+/gtk+-9999.ebuild | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/x11-libs/gtk+/gtk+-9999.ebuild b/x11-libs/gtk+/gtk+-9999.ebu= ild index c5863bd..2379dd3 100644 --- a/x11-libs/gtk+/gtk+-9999.ebuild +++ b/x11-libs/gtk+/gtk+-9999.ebuild @@ -52,17 +52,17 @@ COMMON_DEPEND=3D"X? ( x11-libs/cairo[opengl] x11-libs/libxkbcommon ) - >=3Ddev-libs/glib-2.31.20 - >=3Dx11-libs/pango-1.29.0[introspection?] - >=3Ddev-libs/atk-2.1.5[introspection?] + >=3Ddev-libs/glib-2.32 + >=3Dx11-libs/pango-1.30[introspection?] + >=3Ddev-libs/atk-2.2[introspection?] >=3Dx11-libs/cairo-1.10.0[aqua?,glib,svg,X?] - >=3Dx11-libs/gdk-pixbuf-2.25.2:2[introspection?,X?] + >=3Dx11-libs/gdk-pixbuf-2.26:2[introspection?,X?] >=3Dx11-libs/gtk+-2.24:2 media-libs/fontconfig x11-misc/shared-mime-info colord? ( >=3Dx11-misc/colord-0.1.9 ) cups? ( >=3Dnet-print/cups-1.2 ) - introspection? ( >=3Ddev-libs/gobject-introspection-0.10.1 )" + introspection? ( >=3Ddev-libs/gobject-introspection-1.32 )" DEPEND=3D"${COMMON_DEPEND} virtual/pkgconfig X? ( @@ -110,6 +110,11 @@ src_prepare() { # Apparently needed for new libxkbcommon headers; bug #408131 epatch "${FILESDIR}/${PN}-3.3.20-wayland-xkbcommon-headers.patch" =20 + # Work around https://bugzilla.gnome.org/show_bug.cgi?id=3D663991 + if [[ ${CHOST} =3D=3D *-solaris* ]]; then + sed -i -e '/_XOPEN_SOURCE/s/500/600/' gtk/gtksearchenginesimple.c || d= ie + fi + # 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"