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 1Qekpm-0008Fl-BC for garchives@archives.gentoo.org; Thu, 07 Jul 2011 09:25:22 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B028421C097; Thu, 7 Jul 2011 09:24:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 6F0CE21C08C for ; Thu, 7 Jul 2011 09:24:55 +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 D70352AC081 for ; Thu, 7 Jul 2011 09:24:54 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 2ECA380052 for ; Thu, 7 Jul 2011 09:24:54 +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: Subject: [gentoo-commits] proj/gnome:gnome-next commit in: gnome-base/gnome-control-center/, gnome-base/gnome-control-center/files/ X-VCS-Repository: proj/gnome X-VCS-Files: gnome-base/gnome-control-center/files/gnome-control-center-3.0.2-cups-ppd.h.patch gnome-base/gnome-control-center/files/gnome-control-center-3.0.2-https-handler.patch gnome-base/gnome-control-center/gnome-control-center-3.0.2-r1.ebuild gnome-base/gnome-control-center/gnome-control-center-9999.ebuild X-VCS-Directories: gnome-base/gnome-control-center/ gnome-base/gnome-control-center/files/ X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Restovtsev X-VCS-Revision: a6cf987d50abc03f3bfd48ea044377b50ff630c9 Date: Thu, 7 Jul 2011 09:24:54 +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: 28c29c3b39e024dcc69d3e4b37c9df26 commit: a6cf987d50abc03f3bfd48ea044377b50ff630c9 Author: Alexandre Rostovtsev gmail com> AuthorDate: Thu Jul 7 09:21:06 2011 +0000 Commit: Alexandre Restovtsev gmail com> CommitDate: Thu Jul 7 09:21:06 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3Da6cf987d gnome-base/gnome-control-center: 3.0.2 =E2=86=92 3.1.3 Bump to gnome-3.1.x version, update dependencies. Patches have been applied upstream. --- .../gnome-control-center-3.0.2-cups-ppd.h.patch | 46 -------- .../gnome-control-center-3.0.2-https-handler.patch | 28 ----- .../gnome-control-center-3.0.2-r1.ebuild | 114 --------------= ------ .../gnome-control-center-9999.ebuild | 11 ++- 4 files changed, 7 insertions(+), 192 deletions(-) diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3= .0.2-cups-ppd.h.patch b/gnome-base/gnome-control-center/files/gnome-contr= ol-center-3.0.2-cups-ppd.h.patch deleted file mode 100644 index ce2a75d..0000000 --- a/gnome-base/gnome-control-center/files/gnome-control-center-3.0.2-cu= ps-ppd.h.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 246dfbcca4906db9c2ef01990ad482270324309e Mon Sep 17 00:00:00 2001 -From: Marek Kasik -Date: Mon, 20 Jun 2011 15:04:25 +0000 -Subject: Printers: Include cups/ppd.h explicitly - -cups/ppd.h is not included by cups/cups.h since CUPS 1.5. ---- -diff --git a/configure.ac b/configure.ac -index b26fb7c..b7e6259 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -145,7 +145,7 @@ if test x"$enable_cups" !=3D x"no" ; then - CUPS_API_MAJOR=3D`echo $ECHO_N $CUPS_API_VERSION | cut -d . -f 1` - CUPS_API_MINOR=3D`echo $ECHO_N $CUPS_API_VERSION | cut -d . -f 2` -=20 -- AC_CHECK_HEADERS([cups/cups.h cups/http.h cups/ipp.h],, -+ AC_CHECK_HEADERS([cups/cups.h cups/http.h cups/ipp.h cups/ppd.h],, - AC_MSG_ERROR([CUPS headers not found but CUPS suppor= t requested])) -=20 - if ! test $CUPS_API_MAJOR -gt 1 -o \ -diff --git a/panels/printers/pp-new-printer-dialog.c b/panels/printers/p= p-new-printer-dialog.c -index 0b9ece9..69372c2 100644 ---- a/panels/printers/pp-new-printer-dialog.c -+++ b/panels/printers/pp-new-printer-dialog.c -@@ -31,6 +31,7 @@ - #include -=20 - #include -+#include -=20 - #include "pp-new-printer-dialog.h" - #include "pp-utils.h" -diff --git a/panels/printers/pp-utils.c b/panels/printers/pp-utils.c -index 8dbe04f..cb7c29f 100644 ---- a/panels/printers/pp-utils.c -+++ b/panels/printers/pp-utils.c -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - #include -=20 - #include "pp-utils.h" --- -cgit v0.9 diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3= .0.2-https-handler.patch b/gnome-base/gnome-control-center/files/gnome-co= ntrol-center-3.0.2-https-handler.patch deleted file mode 100644 index 45e3e50..0000000 --- a/gnome-base/gnome-control-center/files/gnome-control-center-3.0.2-ht= tps-handler.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 6a6a8583803464d4b56870c7faf4db035b97e12d Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev -Date: Thu, 23 Jun 2011 00:05:34 -0400 -Subject: [PATCH] Fix https scheme handler app setting (bug #653211) - -default_app_changed() contains a typo: we need to set the https -handler app when the user changes the http app chooser, not the -(non-existent) https app chooser. ---- - panels/info/cc-info-panel.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/panels/info/cc-info-panel.c b/panels/info/cc-info-panel.c -index 2283896..f4dba1b 100644 ---- a/panels/info/cc-info-panel.c -+++ b/panels/info/cc-info-panel.c -@@ -922,7 +922,7 @@ default_app_changed (GtkAppChooserButton *button, - } -=20 - /* Set https support for the browser as well */ -- if (g_str_equal (content_type, "x-scheme-handler/https")) -+ if (g_str_equal (content_type, "x-scheme-handler/http")) - { - if (g_app_info_set_as_default_for_type (info, "x-scheme-handler/h= ttps", &error) =3D=3D FALSE) - { ---=20 -1.7.5.3 - diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.0.2-r= 1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.0.2-r1.= ebuild deleted file mode 100644 index 69e422b..0000000 --- a/gnome-base/gnome-control-center/gnome-control-center-3.0.2-r1.ebuil= d +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome= -control-center-2.32.1.ebuild,v 1.1 2010/12/04 00:46:57 pacho Exp $ - -EAPI=3D"3" -GCONF_DEBUG=3D"yes" -GNOME2_LA_PUNT=3D"yes" # gmodule is used, which uses dlopen - -inherit gnome2 -if [[ ${PV} =3D 9999 ]]; then - inherit gnome2-live -fi - -DESCRIPTION=3D"GNOME Desktop Configuration Tool" -HOMEPAGE=3D"http://www.gnome.org/" - -LICENSE=3D"GPL-2" -SLOT=3D"2" -IUSE=3D"+cheese +cups +networkmanager +socialweb" -if [[ ${PV} =3D 9999 ]]; then - KEYWORDS=3D"" -else - KEYWORDS=3D"~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-f= bsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" -fi - -# XXX: gnome-desktop-2.91.5 is needed for upstream commit c67f7efb -# XXX: NetworkManager-0.9 support is automagic, make hard-dep once it's = released -# -# gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run a= t login -# Latest gsettings-desktop-schemas is needed for commit 73f9bffb -COMMON_DEPEND=3D" - >=3Ddev-libs/glib-2.25.11:2 - >=3Dx11-libs/gdk-pixbuf-2.23.0:2 - >=3Dx11-libs/gtk+-3.0.2:3 - >=3Dgnome-base/gsettings-desktop-schemas-2.91.92 - >=3Dgnome-base/gconf-2.0:2 - >=3Ddev-libs/dbus-glib-0.73 - >=3Dgnome-base/gnome-desktop-2.91.5:3 - >=3Dgnome-base/gnome-settings-daemon-2.91.94 - >=3Dgnome-base/libgnomekbd-2.91.91 - - app-text/iso-codes - dev-libs/libxml2:2 - gnome-base/gnome-menus - gnome-base/libgtop:2 - media-libs/fontconfig - - >=3Dmedia-libs/libcanberra-0.13[gtk3] - >=3Dmedia-sound/pulseaudio-0.9.16[glib] - >=3Dsys-auth/polkit-0.97 - >=3Dsys-power/upower-0.9.1 - - x11-apps/xmodmap - x11-libs/libX11 - x11-libs/libXxf86misc - >=3Dx11-libs/libxklavier-5.1 - >=3Dx11-libs/libXi-1.2 - - cheese? ( - media-libs/gstreamer:0.10 - >=3Dmedia-video/cheese-2.91.91.1 ) - cups? ( >=3Dnet-print/cups-1.4[dbus] ) - networkmanager? ( >=3Dnet-misc/networkmanager-0.8.997 ) - socialweb? ( net-libs/libsocialweb )" -RDEPEND=3D"${COMMON_DEPEND} - sys-apps/accountsservice - cups? ( net-print/cups-pk-helper ) - - !gnome-extra/gnome-media[pulseaudio] - !=3Dgnome-base/gnome-session-2.91.6-r1" -DEPEND=3D"${COMMON_DEPEND} - x11-proto/xproto - x11-proto/xf86miscproto - x11-proto/kbproto - - >=3Dsys-devel/gettext-0.17 - >=3Ddev-util/intltool-0.40.1 - >=3Ddev-util/pkgconfig-0.19 - - app-text/scrollkeeper - >=3Dapp-text/gnome-doc-utils-0.10.1 - - cups? ( sys-apps/sed )" -# Needed for autoreconf -# gnome-base/gnome-common - -pkg_setup() { - G2CONF=3D"${G2CONF} - --disable-update-mimedb - --disable-static - --disable-maintainer-mode - $(use_with cheese) - $(use_enable cups) - $(use_with socialweb libsocialweb)" - DOCS=3D"AUTHORS ChangeLog NEWS README TODO" -} - -src_prepare() { - # https://bugzilla.gnome.org/show_bug.cgi?id=3D651162 - # XXX: remove for next release - sed -e 's:no-undefined:-no-undefined:' \ - -i libgnome-control-center/Makefile.* || die "sed failed" - - # cups-1.5 compatibility; will be in next release - epatch "${FILESDIR}/${P}-cups-ppd.h.patch" - - # https://bugzilla.gnome.org/show_bug.cgi?id=3D653211 - epatch "${FILESDIR}/${PN}-3.0.2-https-handler.patch" - - gnome2_src_prepare -} diff --git a/gnome-base/gnome-control-center/gnome-control-center-9999.eb= uild b/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild index d3f4688..671b89a 100644 --- a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild +++ b/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome= -control-center-2.32.1.ebuild,v 1.1 2010/12/04 00:46:57 pacho Exp $ =20 -EAPI=3D"3" +EAPI=3D"4" GCONF_DEBUG=3D"yes" GNOME2_LA_PUNT=3D"yes" # gmodule is used, which uses dlopen =20 @@ -31,17 +31,18 @@ fi COMMON_DEPEND=3D" >=3Ddev-libs/glib-2.25.11:2 >=3Dx11-libs/gdk-pixbuf-2.23.0:2 - >=3Dx11-libs/gtk+-3.0.2:3 - >=3Dgnome-base/gsettings-desktop-schemas-2.91.92 + >=3Dx11-libs/gtk+-3.1.3:3 + >=3Dgnome-base/gsettings-desktop-schemas-3.0.2 >=3Dgnome-base/gconf-2.0:2 >=3Ddev-libs/dbus-glib-0.73 - >=3Dgnome-base/gnome-desktop-2.91.5:3 + >=3Dgnome-base/gnome-desktop-3.1.0:3 >=3Dgnome-base/gnome-settings-daemon-2.91.94 >=3Dgnome-base/libgnomekbd-2.91.91 =20 app-text/iso-codes dev-libs/libxml2:2 gnome-base/gnome-menus + gnome-base/gnome-online-accounts gnome-base/libgtop:2 media-libs/fontconfig =20 @@ -49,6 +50,7 @@ COMMON_DEPEND=3D" >=3Dmedia-sound/pulseaudio-0.9.16[glib] >=3Dsys-auth/polkit-0.97 >=3Dsys-power/upower-0.9.1 + >=3Dx11-misc/colord-0.1.8 =20 x11-apps/xmodmap x11-libs/libX11 @@ -91,6 +93,7 @@ pkg_setup() { G2CONF=3D"${G2CONF} --disable-update-mimedb --disable-static + --disable-maintainer-mode $(use_with cheese) $(use_enable cups) $(use_with socialweb libsocialweb)"