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 1QsJxh-00044X-2n for garchives@archives.gentoo.org; Sat, 13 Aug 2011 19:33:37 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4EC3921C076; Sat, 13 Aug 2011 19:33:29 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 0AC4F21C076 for ; Sat, 13 Aug 2011 19:33:28 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 602F31B4024 for ; Sat, 13 Aug 2011 19:33:28 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id B2E6D80043 for ; Sat, 13 Aug 2011 19:33:27 +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: <2504725431a463e159013d7e1136a08b1d0c71d2.tetromino@gentoo> Subject: [gentoo-commits] proj/gnome:gnome-next commit in: x11-libs/gtk+/files/, x11-libs/gtk+/ X-VCS-Repository: proj/gnome X-VCS-Files: x11-libs/gtk+/files/settings.ini x11-libs/gtk+/gtk+-3.1.10.ebuild x11-libs/gtk+/gtk+-9999.ebuild X-VCS-Directories: x11-libs/gtk+/files/ x11-libs/gtk+/ X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Restovtsev X-VCS-Revision: 2504725431a463e159013d7e1136a08b1d0c71d2 Date: Sat, 13 Aug 2011 19:33:27 +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: X-Archives-Hash: 6281916bb99fad7c48c8c970d08119b8 commit: 2504725431a463e159013d7e1136a08b1d0c71d2 Author: Alexandre Rostovtsev gmail com> AuthorDate: Sat Aug 13 19:22:11 2011 +0000 Commit: Alexandre Restovtsev gmail com> CommitDate: Sat Aug 13 19:22:11 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D25047254 x11-libs/gtk+: sync with gx86 Sync with changes in gx86; no revision bump since there should be very little user-visible impact. Also, update gdk-pixbuf dependency for the live ebuild. --- x11-libs/gtk+/files/settings.ini | 4 ++++ x11-libs/gtk+/gtk+-3.1.10.ebuild | 23 ++++++----------------- x11-libs/gtk+/gtk+-9999.ebuild | 27 ++++++++------------------- 3 files changed, 18 insertions(+), 36 deletions(-) diff --git a/x11-libs/gtk+/files/settings.ini b/x11-libs/gtk+/files/setti= ngs.ini new file mode 100644 index 0000000..a65c0a8 --- /dev/null +++ b/x11-libs/gtk+/files/settings.ini @@ -0,0 +1,4 @@ +[Settings] +gtk-theme-name =3D Adwaita +gtk-icon-theme-name =3D gnome +gtk-cursor-theme-name =3D Adwaita diff --git a/x11-libs/gtk+/gtk+-3.1.10.ebuild b/x11-libs/gtk+/gtk+-3.1.10= .ebuild index 908a1f1..eea39c5 100644 --- a/x11-libs/gtk+/gtk+-3.1.10.ebuild +++ b/x11-libs/gtk+/gtk+-3.1.10.ebuild @@ -14,11 +14,11 @@ HOMEPAGE=3D"http://www.gtk.org/" =20 LICENSE=3D"LGPL-2" SLOT=3D"3" -# NOTE: *-macos support is BROKEN. See `quartz-backend` etc in configure # 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/msg0009= 9.html -# NOTE: Lots of aqua stuff in this ebuild is probably very broken +# I tried this and got it all compiling, but the end result is unusable = as it +# horribly mixes up the backends -- grobian IUSE=3D"aqua colord cups debug doc examples +introspection packagekit te= st vim-syntax xinerama" if [[ ${PV} =3D 9999 ]]; then KEYWORDS=3D"" @@ -66,9 +66,6 @@ DEPEND=3D"${COMMON_DEPEND} x11-proto/inputproto x11-proto/damageproto ) - x86-interix? ( - sys-libs/itx-bind - ) xinerama? ( x11-proto/xineramaproto ) >=3Ddev-util/gtk-doc-am-1.11 doc? ( @@ -102,12 +99,6 @@ src_prepare() { sed '\%/recent-manager/add%,/recent_manager_purge/ d' \ -i gtk/tests/recentmanager.c || die "sed 2 failed" =20 - if use x86-interix; then - # activate the itx-bind package... - append-flags "-I${EPREFIX}/usr/include/bind" - append-ldflags "-L${EPREFIX}/usr/lib/bind" - fi - if ! use test; then # don't waste time building tests strip_builddir SRC_SUBDIRS tests Makefile.am @@ -158,14 +149,12 @@ src_test() { } =20 src_install() { - emake DESTDIR=3D"${D}" install || die "Installation failed" + emake DESTDIR=3D"${D}" install =20 - # see bug #133241 - echo 'gtk-fallback-icon-theme =3D "gnome"' > "${T}/gtkrc" insinto /etc/gtk-3.0 - doins "${T}"/gtkrc || die "doins gtkrc failed" + doins "${FILESDIR}"/settings.ini =20 - dodoc AUTHORS ChangeLog* HACKING NEWS* README* || die "dodoc failed" + dodoc AUTHORS ChangeLog* HACKING NEWS* README* =20 # Remove unneeded *.la files find "${ED}" -name "*.la" -delete @@ -190,7 +179,7 @@ pkg_postinst() { 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." + elog "add it to your settings.ini file." fi } =20 diff --git a/x11-libs/gtk+/gtk+-9999.ebuild b/x11-libs/gtk+/gtk+-9999.ebu= ild index 908a1f1..24226ab 100644 --- a/x11-libs/gtk+/gtk+-9999.ebuild +++ b/x11-libs/gtk+/gtk+-9999.ebuild @@ -14,11 +14,11 @@ HOMEPAGE=3D"http://www.gtk.org/" =20 LICENSE=3D"LGPL-2" SLOT=3D"3" -# NOTE: *-macos support is BROKEN. See `quartz-backend` etc in configure # 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/msg0009= 9.html -# NOTE: Lots of aqua stuff in this ebuild is probably very broken +# I tried this and got it all compiling, but the end result is unusable = as it +# horribly mixes up the backends -- grobian IUSE=3D"aqua colord cups debug doc examples +introspection packagekit te= st vim-syntax xinerama" if [[ ${PV} =3D 9999 ]]; then KEYWORDS=3D"" @@ -42,11 +42,11 @@ COMMON_DEPEND=3D"!aqua? ( x11-libs/libXcomposite x11-libs/libXdamage >=3Dx11-libs/cairo-1.10.0[X,svg] - >=3Dx11-libs/gdk-pixbuf-2.22.0:2[X,introspection?] + >=3Dx11-libs/gdk-pixbuf-2.23.5:2[X,introspection?] ) aqua? ( >=3Dx11-libs/cairo-1.10.0[aqua,svg] - >=3Dx11-libs/gdk-pixbuf-2.22.0:2[introspection?] + >=3Dx11-libs/gdk-pixbuf-2.23.5:2[introspection?] ) xinerama? ( x11-libs/libXinerama ) >=3Ddev-libs/glib-2.29.14 @@ -66,9 +66,6 @@ DEPEND=3D"${COMMON_DEPEND} x11-proto/inputproto x11-proto/damageproto ) - x86-interix? ( - sys-libs/itx-bind - ) xinerama? ( x11-proto/xineramaproto ) >=3Ddev-util/gtk-doc-am-1.11 doc? ( @@ -102,12 +99,6 @@ src_prepare() { sed '\%/recent-manager/add%,/recent_manager_purge/ d' \ -i gtk/tests/recentmanager.c || die "sed 2 failed" =20 - if use x86-interix; then - # activate the itx-bind package... - append-flags "-I${EPREFIX}/usr/include/bind" - append-ldflags "-L${EPREFIX}/usr/lib/bind" - fi - if ! use test; then # don't waste time building tests strip_builddir SRC_SUBDIRS tests Makefile.am @@ -158,14 +149,12 @@ src_test() { } =20 src_install() { - emake DESTDIR=3D"${D}" install || die "Installation failed" + emake DESTDIR=3D"${D}" install =20 - # see bug #133241 - echo 'gtk-fallback-icon-theme =3D "gnome"' > "${T}/gtkrc" insinto /etc/gtk-3.0 - doins "${T}"/gtkrc || die "doins gtkrc failed" + doins "${FILESDIR}"/settings.ini =20 - dodoc AUTHORS ChangeLog* HACKING NEWS* README* || die "dodoc failed" + dodoc AUTHORS ChangeLog* HACKING NEWS* README* =20 # Remove unneeded *.la files find "${ED}" -name "*.la" -delete @@ -190,7 +179,7 @@ pkg_postinst() { 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." + elog "add it to your settings.ini file." fi } =20