* [gentoo-commits] proj/gnome:gnome-next commit in: gnome-base/gnome-control-center/, gnome-base/gnome-control-center/files/
@ 2011-07-07 9:24 Alexandre Restovtsev
0 siblings, 0 replies; 3+ messages in thread
From: Alexandre Restovtsev @ 2011-07-07 9:24 UTC (permalink / raw
To: gentoo-commits
commit: a6cf987d50abc03f3bfd48ea044377b50ff630c9
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Thu Jul 7 09:21:06 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Thu Jul 7 09:21:06 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=a6cf987d
gnome-base/gnome-control-center: 3.0.2 → 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-control-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-cups-ppd.h.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 246dfbcca4906db9c2ef01990ad482270324309e Mon Sep 17 00:00:00 2001
-From: Marek Kasik <mkasik@redhat.com>
-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" != x"no" ; then
- CUPS_API_MAJOR=`echo $ECHO_N $CUPS_API_VERSION | cut -d . -f 1`
- CUPS_API_MINOR=`echo $ECHO_N $CUPS_API_VERSION | cut -d . -f 2`
-
-- 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 support requested]))
-
- if ! test $CUPS_API_MAJOR -gt 1 -o \
-diff --git a/panels/printers/pp-new-printer-dialog.c b/panels/printers/pp-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 <gtk/gtk.h>
-
- #include <cups/cups.h>
-+#include <cups/ppd.h>
-
- #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 <glib/gstdio.h>
- #include <gtk/gtk.h>
- #include <cups/cups.h>
-+#include <cups/ppd.h>
- #include <dbus/dbus-glib.h>
-
- #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-control-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-https-handler.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 6a6a8583803464d4b56870c7faf4db035b97e12d Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gmail.com>
-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,
- }
-
- /* 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/https", &error) == FALSE)
- {
---
-1.7.5.3
-
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.0.2-r1.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.ebuild
+++ /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="3"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
-
-inherit gnome2
-if [[ ${PV} = 9999 ]]; then
- inherit gnome2-live
-fi
-
-DESCRIPTION="GNOME Desktop Configuration Tool"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="2"
-IUSE="+cheese +cups +networkmanager +socialweb"
-if [[ ${PV} = 9999 ]]; then
- KEYWORDS=""
-else
- KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~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 at login
-# Latest gsettings-desktop-schemas is needed for commit 73f9bffb
-COMMON_DEPEND="
- >=dev-libs/glib-2.25.11:2
- >=x11-libs/gdk-pixbuf-2.23.0:2
- >=x11-libs/gtk+-3.0.2:3
- >=gnome-base/gsettings-desktop-schemas-2.91.92
- >=gnome-base/gconf-2.0:2
- >=dev-libs/dbus-glib-0.73
- >=gnome-base/gnome-desktop-2.91.5:3
- >=gnome-base/gnome-settings-daemon-2.91.94
- >=gnome-base/libgnomekbd-2.91.91
-
- app-text/iso-codes
- dev-libs/libxml2:2
- gnome-base/gnome-menus
- gnome-base/libgtop:2
- media-libs/fontconfig
-
- >=media-libs/libcanberra-0.13[gtk3]
- >=media-sound/pulseaudio-0.9.16[glib]
- >=sys-auth/polkit-0.97
- >=sys-power/upower-0.9.1
-
- x11-apps/xmodmap
- x11-libs/libX11
- x11-libs/libXxf86misc
- >=x11-libs/libxklavier-5.1
- >=x11-libs/libXi-1.2
-
- cheese? (
- media-libs/gstreamer:0.10
- >=media-video/cheese-2.91.91.1 )
- cups? ( >=net-print/cups-1.4[dbus] )
- networkmanager? ( >=net-misc/networkmanager-0.8.997 )
- socialweb? ( net-libs/libsocialweb )"
-RDEPEND="${COMMON_DEPEND}
- sys-apps/accountsservice
- cups? ( net-print/cups-pk-helper )
-
- !gnome-extra/gnome-media[pulseaudio]
- !<gnome-extra/gnome-media-2.32.0-r300
- !<gnome-base/gdm-2.91.94"
-# PDEPEND to avoid circular dependency
-PDEPEND=">=gnome-base/gnome-session-2.91.6-r1"
-DEPEND="${COMMON_DEPEND}
- x11-proto/xproto
- x11-proto/xf86miscproto
- x11-proto/kbproto
-
- >=sys-devel/gettext-0.17
- >=dev-util/intltool-0.40.1
- >=dev-util/pkgconfig-0.19
-
- app-text/scrollkeeper
- >=app-text/gnome-doc-utils-0.10.1
-
- cups? ( sys-apps/sed )"
-# Needed for autoreconf
-# gnome-base/gnome-common
-
-pkg_setup() {
- G2CONF="${G2CONF}
- --disable-update-mimedb
- --disable-static
- --disable-maintainer-mode
- $(use_with cheese)
- $(use_enable cups)
- $(use_with socialweb libsocialweb)"
- DOCS="AUTHORS ChangeLog NEWS README TODO"
-}
-
-src_prepare() {
- # https://bugzilla.gnome.org/show_bug.cgi?id=651162
- # 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=653211
- epatch "${FILESDIR}/${PN}-3.0.2-https-handler.patch"
-
- 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 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 $
-EAPI="3"
+EAPI="4"
GCONF_DEBUG="yes"
GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
@@ -31,17 +31,18 @@ fi
COMMON_DEPEND="
>=dev-libs/glib-2.25.11:2
>=x11-libs/gdk-pixbuf-2.23.0:2
- >=x11-libs/gtk+-3.0.2:3
- >=gnome-base/gsettings-desktop-schemas-2.91.92
+ >=x11-libs/gtk+-3.1.3:3
+ >=gnome-base/gsettings-desktop-schemas-3.0.2
>=gnome-base/gconf-2.0:2
>=dev-libs/dbus-glib-0.73
- >=gnome-base/gnome-desktop-2.91.5:3
+ >=gnome-base/gnome-desktop-3.1.0:3
>=gnome-base/gnome-settings-daemon-2.91.94
>=gnome-base/libgnomekbd-2.91.91
app-text/iso-codes
dev-libs/libxml2:2
gnome-base/gnome-menus
+ gnome-base/gnome-online-accounts
gnome-base/libgtop:2
media-libs/fontconfig
@@ -49,6 +50,7 @@ COMMON_DEPEND="
>=media-sound/pulseaudio-0.9.16[glib]
>=sys-auth/polkit-0.97
>=sys-power/upower-0.9.1
+ >=x11-misc/colord-0.1.8
x11-apps/xmodmap
x11-libs/libX11
@@ -91,6 +93,7 @@ pkg_setup() {
G2CONF="${G2CONF}
--disable-update-mimedb
--disable-static
+ --disable-maintainer-mode
$(use_with cheese)
$(use_enable cups)
$(use_with socialweb libsocialweb)"
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/gnome:gnome-next commit in: gnome-base/gnome-control-center/, gnome-base/gnome-control-center/files/
@ 2011-09-02 8:05 Alexandre Restovtsev
0 siblings, 0 replies; 3+ messages in thread
From: Alexandre Restovtsev @ 2011-09-02 8:05 UTC (permalink / raw
To: gentoo-commits
commit: 6c8d370a1d14e4139686bbb3cdd4183e9ca77e38
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Fri Sep 2 05:40:27 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Fri Sep 2 07:11:07 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=6c8d370a
gnome-base/gnome-control-center: 3.1.5 → 3.1.90
Version bump with numerous improvements, including a new wacom tablet
configuration panel. Add a patch to prevent the system info panel from
crashing when systemd's hostnamed is not running.
---
...me-control-center-3.1.90-hostnamed-assert.patch | 53 ++++++++++++++++++++
...5.ebuild => gnome-control-center-3.1.90.ebuild} | 9 +++-
.../gnome-control-center-9999.ebuild | 9 +++-
3 files changed, 69 insertions(+), 2 deletions(-)
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.1.90-hostnamed-assert.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.1.90-hostnamed-assert.patch
new file mode 100644
index 0000000..bd65970
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.1.90-hostnamed-assert.patch
@@ -0,0 +1,53 @@
+From afbe67f102551917b5c6edbf00ea442ac103ecf0 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gmail.com>
+Date: Fri, 2 Sep 2011 02:08:05 -0400
+Subject: [PATCH] Do not assert if hostnamed is not running
+
+Most Gentoo users do not use systemd; asserting if systemd's hostnamed
+is not running is crazy.
+---
+ panels/info/cc-info-panel.c | 21 +++++++++++----------
+ 1 files changed, 11 insertions(+), 10 deletions(-)
+
+diff --git a/panels/info/cc-info-panel.c b/panels/info/cc-info-panel.c
+index 9e72e2a..0cb9342 100644
+--- a/panels/info/cc-info-panel.c
++++ b/panels/info/cc-info-panel.c
+@@ -1118,14 +1118,6 @@ info_panel_setup_hostname (CcInfoPanel *self,
+ char *str;
+ GtkWidget *entry;
+
+- entry = WID ("name_entry");
+-
+- gtk_widget_show (WID ("label4"));
+- gtk_widget_show (entry);
+-
+- if (g_permission_get_allowed (permission) != FALSE)
+- gtk_widget_set_sensitive (entry, TRUE);
+-
+ self->priv->hostnamed_proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
+ G_DBUS_PROXY_FLAGS_NONE,
+ NULL,
+@@ -1136,8 +1128,17 @@ info_panel_setup_hostname (CcInfoPanel *self,
+ NULL);
+
+ /* This could only happen if the policy file was installed
+- * but not hostnamed, which points to a system bug */
+- g_assert (self->priv->hostnamed_proxy);
++ * but not hostnamed */
++ if (!self->priv->hostnamed_proxy)
++ return;
++
++ entry = WID ("name_entry");
++
++ gtk_widget_show (WID ("label4"));
++ gtk_widget_show (entry);
++
++ if (g_permission_get_allowed (permission) != FALSE)
++ gtk_widget_set_sensitive (entry, TRUE);
+
+ str = info_panel_get_hostname (self);
+ gtk_entry_set_text (GTK_ENTRY (entry), str);
+--
+1.7.6.1
+
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.1.5.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.1.90.ebuild
similarity index 91%
rename from gnome-base/gnome-control-center/gnome-control-center-3.1.5.ebuild
rename to gnome-base/gnome-control-center/gnome-control-center-3.1.90.ebuild
index 4d8264d..ab2784f 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.1.5.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.1.90.ebuild
@@ -6,7 +6,7 @@ EAPI="4"
GCONF_DEBUG="yes"
GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
-inherit gnome2
+inherit eutils gnome2
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
@@ -103,3 +103,10 @@ pkg_setup() {
$(use_with socialweb libsocialweb)"
DOCS="AUTHORS ChangeLog NEWS README TODO"
}
+
+src_prepare() {
+ gnome2_src_prepare
+ # Do not assert & die when systemd's hostnamed is not running.
+ # Whatever upstream thinks, Gnome on Gentoo should not depend on systemd.
+ epatch "${FILESDIR}/${PN}-3.1.90-hostnamed-assert.patch"
+}
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 4d8264d..ab2784f 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
@@ -6,7 +6,7 @@ EAPI="4"
GCONF_DEBUG="yes"
GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
-inherit gnome2
+inherit eutils gnome2
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
@@ -103,3 +103,10 @@ pkg_setup() {
$(use_with socialweb libsocialweb)"
DOCS="AUTHORS ChangeLog NEWS README TODO"
}
+
+src_prepare() {
+ gnome2_src_prepare
+ # Do not assert & die when systemd's hostnamed is not running.
+ # Whatever upstream thinks, Gnome on Gentoo should not depend on systemd.
+ epatch "${FILESDIR}/${PN}-3.1.90-hostnamed-assert.patch"
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/gnome:gnome-next commit in: gnome-base/gnome-control-center/, gnome-base/gnome-control-center/files/
@ 2011-09-26 17:44 Alexandre Restovtsev
0 siblings, 0 replies; 3+ messages in thread
From: Alexandre Restovtsev @ 2011-09-26 17:44 UTC (permalink / raw
To: gentoo-commits
commit: eb7d27fb0679fed5c52469b90b66817a58cf50ef
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Mon Sep 26 10:37:09 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Mon Sep 26 17:43:55 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=eb7d27fb
gnome-base/gnome-control-center: 3.1.91 → 3.2.0
Version bump with numerous bugfixes. The hostnamed assert issue was
finally fixed upstream.
---
...me-control-center-3.1.90-hostnamed-assert.patch | 53 --------------------
...91.ebuild => gnome-control-center-3.2.0.ebuild} | 12 +----
.../gnome-control-center-9999.ebuild | 12 +----
3 files changed, 4 insertions(+), 73 deletions(-)
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.1.90-hostnamed-assert.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.1.90-hostnamed-assert.patch
deleted file mode 100644
index bd65970..0000000
--- a/gnome-base/gnome-control-center/files/gnome-control-center-3.1.90-hostnamed-assert.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From afbe67f102551917b5c6edbf00ea442ac103ecf0 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gmail.com>
-Date: Fri, 2 Sep 2011 02:08:05 -0400
-Subject: [PATCH] Do not assert if hostnamed is not running
-
-Most Gentoo users do not use systemd; asserting if systemd's hostnamed
-is not running is crazy.
----
- panels/info/cc-info-panel.c | 21 +++++++++++----------
- 1 files changed, 11 insertions(+), 10 deletions(-)
-
-diff --git a/panels/info/cc-info-panel.c b/panels/info/cc-info-panel.c
-index 9e72e2a..0cb9342 100644
---- a/panels/info/cc-info-panel.c
-+++ b/panels/info/cc-info-panel.c
-@@ -1118,14 +1118,6 @@ info_panel_setup_hostname (CcInfoPanel *self,
- char *str;
- GtkWidget *entry;
-
-- entry = WID ("name_entry");
--
-- gtk_widget_show (WID ("label4"));
-- gtk_widget_show (entry);
--
-- if (g_permission_get_allowed (permission) != FALSE)
-- gtk_widget_set_sensitive (entry, TRUE);
--
- self->priv->hostnamed_proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
- G_DBUS_PROXY_FLAGS_NONE,
- NULL,
-@@ -1136,8 +1128,17 @@ info_panel_setup_hostname (CcInfoPanel *self,
- NULL);
-
- /* This could only happen if the policy file was installed
-- * but not hostnamed, which points to a system bug */
-- g_assert (self->priv->hostnamed_proxy);
-+ * but not hostnamed */
-+ if (!self->priv->hostnamed_proxy)
-+ return;
-+
-+ entry = WID ("name_entry");
-+
-+ gtk_widget_show (WID ("label4"));
-+ gtk_widget_show (entry);
-+
-+ if (g_permission_get_allowed (permission) != FALSE)
-+ gtk_widget_set_sensitive (entry, TRUE);
-
- str = info_panel_get_hostname (self);
- gtk_entry_set_text (GTK_ENTRY (entry), str);
---
-1.7.6.1
-
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.1.91.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.2.0.ebuild
similarity index 90%
rename from gnome-base/gnome-control-center/gnome-control-center-3.1.91.ebuild
rename to gnome-base/gnome-control-center/gnome-control-center-3.2.0.ebuild
index ab2784f..26505cf 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.1.91.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.2.0.ebuild
@@ -6,7 +6,7 @@ EAPI="4"
GCONF_DEBUG="yes"
GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
-inherit eutils gnome2
+inherit gnome2
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
@@ -32,7 +32,7 @@ fi
COMMON_DEPEND="
>=dev-libs/glib-2.29.14:2
>=x11-libs/gdk-pixbuf-2.23.0:2
- >=x11-libs/gtk+-3.1.3:3
+ >=x11-libs/gtk+-3.1.19:3
>=gnome-base/gsettings-desktop-schemas-3.0.2
>=gnome-base/gconf-2.0:2
>=dev-libs/dbus-glib-0.73
@@ -97,16 +97,8 @@ pkg_setup() {
G2CONF="${G2CONF}
--disable-update-mimedb
--disable-static
- --disable-maintainer-mode
$(use_with cheese)
$(use_enable cups)
$(use_with socialweb libsocialweb)"
DOCS="AUTHORS ChangeLog NEWS README TODO"
}
-
-src_prepare() {
- gnome2_src_prepare
- # Do not assert & die when systemd's hostnamed is not running.
- # Whatever upstream thinks, Gnome on Gentoo should not depend on systemd.
- epatch "${FILESDIR}/${PN}-3.1.90-hostnamed-assert.patch"
-}
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 ab2784f..26505cf 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
@@ -6,7 +6,7 @@ EAPI="4"
GCONF_DEBUG="yes"
GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
-inherit eutils gnome2
+inherit gnome2
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
@@ -32,7 +32,7 @@ fi
COMMON_DEPEND="
>=dev-libs/glib-2.29.14:2
>=x11-libs/gdk-pixbuf-2.23.0:2
- >=x11-libs/gtk+-3.1.3:3
+ >=x11-libs/gtk+-3.1.19:3
>=gnome-base/gsettings-desktop-schemas-3.0.2
>=gnome-base/gconf-2.0:2
>=dev-libs/dbus-glib-0.73
@@ -97,16 +97,8 @@ pkg_setup() {
G2CONF="${G2CONF}
--disable-update-mimedb
--disable-static
- --disable-maintainer-mode
$(use_with cheese)
$(use_enable cups)
$(use_with socialweb libsocialweb)"
DOCS="AUTHORS ChangeLog NEWS README TODO"
}
-
-src_prepare() {
- gnome2_src_prepare
- # Do not assert & die when systemd's hostnamed is not running.
- # Whatever upstream thinks, Gnome on Gentoo should not depend on systemd.
- epatch "${FILESDIR}/${PN}-3.1.90-hostnamed-assert.patch"
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-09-26 17:45 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-09-02 8:05 [gentoo-commits] proj/gnome:gnome-next commit in: gnome-base/gnome-control-center/, gnome-base/gnome-control-center/files/ Alexandre Restovtsev
-- strict thread matches above, loose matches on Subject: below --
2011-09-26 17:44 Alexandre Restovtsev
2011-07-07 9:24 Alexandre Restovtsev
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox