From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-507215-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id C7C30138010
for <garchives@archives.gentoo.org>; Fri, 21 Sep 2012 00:29:01 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 789BAE058E;
Fri, 21 Sep 2012 00:27:54 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id 36D3AE058E
for <gentoo-commits@lists.gentoo.org>; Fri, 21 Sep 2012 00:27:54 +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 79A2E33D710
for <gentoo-commits@lists.gentoo.org>; Fri, 21 Sep 2012 00:27:48 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by hornbill.gentoo.org (Postfix) with ESMTP id CC5EFE5456
for <gentoo-commits@lists.gentoo.org>; Fri, 21 Sep 2012 00:27:44 +0000 (UTC)
From: "Nirbheek Chauhan" <nirbheek@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Nirbheek Chauhan" <nirbheek@gentoo.org>
Message-ID: <1348186101.decb6469c9cfd7ba7305c4a7aee6a6e571c6af00.nirbheek@gentoo>
Subject: [gentoo-commits] proj/gnome:master 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.5.91-fix-printer-panel-build.patch gnome-base/gnome-control-center/gnome-control-center-3.5.91.ebuild gnome-base/gnome-control-center/gnome-control-center-3.5.92.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: nirbheek
X-VCS-Committer-Name: Nirbheek Chauhan
X-VCS-Revision: decb6469c9cfd7ba7305c4a7aee6a6e571c6af00
X-VCS-Branch: master
Date: Fri, 21 Sep 2012 00:27:44 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: b1fee106-8c29-4019-ac76-7bc7798cfe6d
X-Archives-Hash: b4c826295aae57f02d09bb2a3899dd22
commit: decb6469c9cfd7ba7305c4a7aee6a6e571c6af00
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 20 23:44:07 2012 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Fri Sep 21 00:08:21 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=decb6469
gnome-base/gnome-control-center: 3.5.91 → 3.5.92
---
...rol-center-3.5.91-fix-printer-panel-build.patch | 29 --------------------
...1.ebuild => gnome-control-center-3.5.92.ebuild} | 18 ++++--------
.../gnome-control-center-9999.ebuild | 20 +++++---------
3 files changed, 13 insertions(+), 54 deletions(-)
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.5.91-fix-printer-panel-build.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.5.91-fix-printer-panel-build.patch
deleted file mode 100644
index 8fd19ee..0000000
--- a/gnome-base/gnome-control-center/files/gnome-control-center-3.5.91-fix-printer-panel-build.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 49797e8ae2753bacc74b86cd28be250ff93a62cc Mon Sep 17 00:00:00 2001
-From: Stefano Facchini <stefano.facchini@gmail.com>
-Date: Wed, 05 Sep 2012 17:34:19 +0000
-Subject: printers: Add missing definition of HAVE_CUPS_1_6
-
-Commit 1532d7ef forgot to actually define HAVE_CUPS_1_6
-when building against CUPS 1.6
-
-https://bugzilla.gnome.org/show_bug.cgi?id=683441
----
-(limited to 'panels/printers/pp-maintenance-command.c')
-
-diff --git a/panels/printers/pp-maintenance-command.c b/panels/printers/pp-maintenance-command.c
-index e2a831b..0966945 100644
---- a/panels/printers/pp-maintenance-command.c
-+++ b/panels/printers/pp-maintenance-command.c
-@@ -25,6 +25,10 @@
-
- #include "pp-utils.h"
-
-+#if (CUPS_VERSION_MAJOR > 1) || (CUPS_VERSION_MINOR > 5)
-+#define HAVE_CUPS_1_6 1
-+#endif
-+
- #ifndef HAVE_CUPS_1_6
- #define ippGetCount(attr) attr->num_values
- #define ippGetValueTag(attr) attr->value_tag
---
-cgit v0.9.0.2
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.5.91.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.5.92.ebuild
similarity index 87%
rename from gnome-base/gnome-control-center/gnome-control-center-3.5.91.ebuild
rename to gnome-base/gnome-control-center/gnome-control-center-3.5.92.ebuild
index 395f6aa..53be9cb 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.5.91.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.5.92.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="http://www.gnome.org/"
LICENSE="GPL-2"
SLOT="2"
-IUSE="+bluetooth +cheese +colord +cups +gnome-online-accounts +i18n kerberos +networkmanager +socialweb systemd wacom"
+IUSE="+bluetooth +colord +cups +gnome-online-accounts +i18n kerberos +networkmanager +socialweb systemd v4l wacom"
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
@@ -33,7 +33,7 @@ COMMON_DEPEND="
>=x11-libs/gtk+-3.5.13:3
>=gnome-base/gsettings-desktop-schemas-3.5.91
>=gnome-base/gnome-desktop-3.5.91:3
- >=gnome-base/gnome-settings-daemon-3.5.2[colord?,policykit]
+ >=gnome-base/gnome-settings-daemon-3.5.90[colord?,policykit]
>=gnome-base/libgnomekbd-2.91.91
app-text/iso-codes
@@ -55,10 +55,10 @@ COMMON_DEPEND="
>=x11-libs/libXi-1.2
bluetooth? ( >=net-wireless/gnome-bluetooth-3.5.5 )
- cheese? (
- media-libs/gstreamer:0.10
+ v4l? (
+ media-libs/gstreamer:1.0
media-libs/clutter-gtk:1.0
- >=media-video/cheese-3.3.5 )
+ >=media-video/cheese-3.5.91 )
colord? ( >=x11-misc/colord-0.1.8 )
cups? ( >=net-print/cups-1.4[dbus] )
gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.5.90 )
@@ -69,7 +69,7 @@ COMMON_DEPEND="
>=net-misc/networkmanager-0.8.997 )
socialweb? ( net-libs/libsocialweb )
systemd? ( >=sys-apps/systemd-31 )
- wacom? ( >=dev-libs/libwacom-0.5
+ wacom? ( >=dev-libs/libwacom-0.6
>=x11-libs/libXi-1.2 )"
# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
RDEPEND="${COMMON_DEPEND}
@@ -134,17 +134,11 @@ pkg_setup() {
}
src_prepare() {
- # Temporary fix for https://bugzilla.gnome.org/show_bug.cgi?id=683696
- sed -e "s/\(typedef.*UserResponseCallback.*\)/#ifndef URC\n#define URC\n\1\n\#endif/" \
- -i "${S}"/panels/printers/pp-{ppd-selection,options,jobs}-dialog.h || die
-
# Make some panels optional; requires eautoreconf
epatch "${FILESDIR}/${PN}-3.5.91-optional-bt-colord-goa-wacom.patch"
epatch "${FILESDIR}/${PN}-3.5.91-optional-kerberos.patch"
# Fix some absolute paths to be appropriate for Gentoo
epatch "${FILESDIR}/${PN}-3.5.91-gentoo-paths.patch"
- # This will be in the next release
- epatch "${FILESDIR}/${P}-fix-printer-panel-build.patch"
[[ ${PV} != 9999 ]] && eautoreconf
gnome2_src_prepare
diff --git a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild b/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
index 5a3fc80..53be9cb 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
@@ -16,8 +16,7 @@ HOMEPAGE="http://www.gnome.org/"
LICENSE="GPL-2"
SLOT="2"
-# +kerberos because USE=-kerberos fails to compile; see pkg_setup()
-IUSE="+bluetooth +cheese +colord +cups +gnome-online-accounts +i18n +kerberos +networkmanager +socialweb systemd wacom"
+IUSE="+bluetooth +colord +cups +gnome-online-accounts +i18n kerberos +networkmanager +socialweb systemd v4l wacom"
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
@@ -34,7 +33,7 @@ COMMON_DEPEND="
>=x11-libs/gtk+-3.5.13:3
>=gnome-base/gsettings-desktop-schemas-3.5.91
>=gnome-base/gnome-desktop-3.5.91:3
- >=gnome-base/gnome-settings-daemon-3.5.2[colord?,policykit]
+ >=gnome-base/gnome-settings-daemon-3.5.90[colord?,policykit]
>=gnome-base/libgnomekbd-2.91.91
app-text/iso-codes
@@ -56,10 +55,10 @@ COMMON_DEPEND="
>=x11-libs/libXi-1.2
bluetooth? ( >=net-wireless/gnome-bluetooth-3.5.5 )
- cheese? (
- media-libs/gstreamer:0.10
+ v4l? (
+ media-libs/gstreamer:1.0
media-libs/clutter-gtk:1.0
- >=media-video/cheese-3.3.5 )
+ >=media-video/cheese-3.5.91 )
colord? ( >=x11-misc/colord-0.1.8 )
cups? ( >=net-print/cups-1.4[dbus] )
gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.5.90 )
@@ -70,7 +69,7 @@ COMMON_DEPEND="
>=net-misc/networkmanager-0.8.997 )
socialweb? ( net-libs/libsocialweb )
systemd? ( >=sys-apps/systemd-31 )
- wacom? ( >=dev-libs/libwacom-0.5
+ wacom? ( >=dev-libs/libwacom-0.6
>=x11-libs/libXi-1.2 )"
# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
RDEPEND="${COMMON_DEPEND}
@@ -135,16 +134,11 @@ pkg_setup() {
}
src_prepare() {
- # Temporary fix for https://bugzilla.gnome.org/show_bug.cgi?id=683696
- sed -e "s/\(typedef.*UserResponseCallback.*\)/#ifndef URC\n#define URC\n\1\n\#endif/" \
- -i "${S}"/panels/printers/pp-{ppd-selection,options,jobs}-dialog.h || die
-
# Make some panels optional; requires eautoreconf
epatch "${FILESDIR}/${PN}-3.5.91-optional-bt-colord-goa-wacom.patch"
+ epatch "${FILESDIR}/${PN}-3.5.91-optional-kerberos.patch"
# Fix some absolute paths to be appropriate for Gentoo
epatch "${FILESDIR}/${PN}-3.5.91-gentoo-paths.patch"
- # This will be in the next release
- epatch "${FILESDIR}/${P}-fix-printer-panel-build.patch"
[[ ${PV} != 9999 ]] && eautoreconf
gnome2_src_prepare