commit: 72663fd4382c7827a5663adeb1379dab5a3ef887
Author: Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
AuthorDate: Sun May 10 16:54:30 2015 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun May 10 17:19:47 2015 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=72663fd4
gnome-base/gnome-control-center: 3.14.5 → 3.16.1
...ntrol-center-3.16.0-make-wayland-optional.patch | 44 ++++++++++++++++
...9.ebuild => gnome-control-center-3.16.1.ebuild} | 59 +++++++---------------
.../gnome-control-center-9999.ebuild | 48 ++++++------------
3 files changed, 76 insertions(+), 75 deletions(-)
diff --git
a/gnome-base/gnome-control-center/files/gnome-control-center-3.16.0-make-wayland-optional.patch
b/gnome-base/gnome-control-center/files/gnome-control-center-3.16.0-make-wayland-optional.patch
new file mode 100644
index 0000000..38d4ccd
--- /dev/null
+++
b/gnome-base/gnome-control-center/files/gnome-control-center-3.16.0-make-wayland-optional.patch
@@ -0,0 +1,44 @@
+From 95420469407223898564425b7622ac66e7ed70d5 Mon Sep 17 00:00:00 2001
+From: Ole Reifschneider <tranquil...@gentoo.org>
+Date: Sat, 25 Apr 2015 22:22:09 +0200
+Subject: [PATCH] Make wayland support optional
+
+---
+ configure.ac | 21 +++++++++++++++------
+ 1 file changed, 15 insertions(+), 6 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 9713256..6b34962 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -231,12 +231,21 @@ if test "x$have_udev" = xyes ; then
+ fi
+ AM_CONDITIONAL(HAVE_UDEV, [test "x$have_udev" = "xyes"])
+
+-PKG_CHECK_MODULES(WAYLAND, gdk-wayland-3.0, have_wayland=yes, have_wayland=no)
+-if test "x$have_wayland" = xyes ; then
+- if test "x$have_udev" != xyes ; then
+- AC_MSG_ERROR([udev is required for Wayland support])
+- fi
+-fi
++AC_ARG_ENABLE(
++ [wayland],
++ AS_HELP_STRING([--disable-wayland], [disable wayland support]),
++ [],
++ enable_wayland=auto
++)
++
++AS_IF([test "$enable_wayland" != "no"],
++ [
++ AS_IF([test "x$have_udev" = xno],
++ [AC_MSG_ERROR([udev is required for Wayland support])],
++ [AC_DEFINE(HAVE_UDEV, 1, [System has udev])])
++
++ PKG_CHECK_MODULES(WAYLAND, gdk-wayland-3.0)
++])
+
+ PKG_CHECK_MODULES(NETWORK_MANAGER, NetworkManager >=
$NETWORK_MANAGER_REQUIRED_VERSION
+ libnm-glib >= $NETWORK_MANAGER_REQUIRED_VERSION
+--
+2.0.5
+
diff --git a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
b/gnome-base/gnome-control-center/gnome-control-center-3.16.1.ebuild
similarity index 70%
copy from gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
copy to gnome-base/gnome-control-center/gnome-control-center-3.16.1.ebuild
index 944a1e7..2ea4abf 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.16.1.ebuild
@@ -1,15 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="5"
GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
+GNOME2_LA_PUNT="yes"
inherit autotools bash-completion-r1 eutils gnome2
-if [[ ${PV} = 9999 ]]; then
- inherit gnome2-live
-fi
DESCRIPTION="GNOME's main interface to configure various aspects of the
desktop"
HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/";
@@ -17,31 +14,24 @@
HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/";
LICENSE="GPL-2+"
SLOT="2"
IUSE="+bluetooth +colord +cups +gnome-online-accounts +i18n
input_devices_wacom kerberos v4l"
-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
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
# False positives caused by nested configure scripts
QA_CONFIGURE_OPTIONS=".*"
# gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login
# g-s-d[policykit] needed for bug #403527
-#
-# gnome-shell/gnome-control-center/mutter/gnome-settings-daemon better to be
in sync for 3.8.3
-# https://mail.gnome.org/archives/gnome-announce-list/2013-June/msg00005.html
-#
+
# kerberos unfortunately means mit-krb5; build fails with heimdal
# FIXME: modemmanager is not optional
# networkmanager is not optional
COMMON_DEPEND="
- >=dev-libs/glib-2.39.91:2
+ >=dev-libs/glib-2.39.91:2[dbus]
>=x11-libs/gdk-pixbuf-2.23.0:2
- >=x11-libs/gtk+-3.13:3
- >=gnome-base/gsettings-desktop-schemas-3.13.91
+ >=x11-libs/gtk+-3.15:3
+ >=gnome-base/gsettings-desktop-schemas-3.15.4
>=gnome-base/gnome-desktop-3.11.3:3=
>=gnome-base/gnome-settings-daemon-3.8.3[colord?,policykit]
@@ -60,6 +50,7 @@ COMMON_DEPEND="
>=net-misc/networkmanager-0.9.8[modemmanager]
>=net-misc/modemmanager-0.7.990
+ virtual/libgudev
virtual/opengl
x11-apps/xmodmap
x11-libs/cairo
@@ -94,7 +85,7 @@ COMMON_DEPEND="
# libgnomekbd needed only for gkbd-keyboard-display tool
RDEPEND="${COMMON_DEPEND}
|| ( ( app-admin/openrc-settingsd sys-auth/consolekit )
>=sys-apps/systemd-31 )
- >=sys-apps/accountsservice-0.6.30
+ >=sys-apps/accountsservice-0.6.39
x11-themes/gnome-icon-theme-symbolic
colord? ( >=gnome-extra/gnome-color-manager-3 )
cups? (
@@ -123,45 +114,25 @@ DEPEND="${COMMON_DEPEND}
>=sys-devel/gettext-0.17
virtual/pkgconfig
- cups? ( sys-apps/sed )
-
gnome-base/gnome-common
"
# Needed for autoreconf
# gnome-base/gnome-common
src_prepare() {
- # Gentoo handles completions in a different directory, bugs #465094 and
#477390
- sed -i "s|^completiondir =.*|completiondir = $(get_bashcompdir)|" \
- shell/Makefile.am || die "sed completiondir failed"
-
# Make some panels and dependencies optional; requires eautoreconf
# https://bugzilla.gnome.org/686840, 697478, 700145
epatch "${FILESDIR}"/${PN}-3.14.0-optional.patch
+ # Make wayland support optional
+ epatch "${FILESDIR}"/${PN}-3.16.0-make-wayland-optional.patch
+
# Fix some absolute paths to be appropriate for Gentoo
epatch "${FILESDIR}"/${PN}-3.10.2-gentoo-paths.patch
epatch_user
- # top-level configure.ac does not use AC_CONFIG_SUBDIRS, so we need
this to
- # avoid libtoolize "We've already been run in this tree" warning, bug
#484988
- local d
- for d in . egg-list-box; do
- pushd "${d}" > /dev/null
- AT_NOELIBTOOLIZE=yes eautoreconf
- popd > /dev/null
- done
- elibtoolize --force
-
- # panels/datetime/Makefile.am gets touched by "gentoo-paths" patch.
- # We need to touch timedated{c,h} to prevent them from being
- # regenerated (bug #415901)
- # Upstream think they should be removed, preventing compilation errors
too
- # (https://bugzilla.gnome.org/704822)
- [[ -f panels/datetime/timedated.h ]] && rm -f
panels/datetime/timedated.h
- [[ -f panels/datetime/timedated.c ]] && rm -f
panels/datetime/timedated.c
-
+ eautoreconf
gnome2_src_prepare
}
@@ -179,3 +150,7 @@ src_configure() {
$(use_with v4l cheese) \
$(use_enable input_devices_wacom wacom)
}
+
+src_install() {
+ gnome2_src_install completiondir="$(get_bashcompdir)"
+}
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 944a1e7..d3950c4 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -28,20 +28,17 @@ QA_CONFIGURE_OPTIONS=".*"
# gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login
# g-s-d[policykit] needed for bug #403527
-#
-# gnome-shell/gnome-control-center/mutter/gnome-settings-daemon better to be
in sync for 3.8.3
-# https://mail.gnome.org/archives/gnome-announce-list/2013-June/msg00005.html
-#
+
# kerberos unfortunately means mit-krb5; build fails with heimdal
# FIXME: modemmanager is not optional
# networkmanager is not optional
COMMON_DEPEND="
- >=dev-libs/glib-2.39.91:2
+ >=dev-libs/glib-2.39.91:2[dbus]
>=x11-libs/gdk-pixbuf-2.23.0:2
- >=x11-libs/gtk+-3.13:3
- >=gnome-base/gsettings-desktop-schemas-3.13.91
+ >=x11-libs/gtk+-3.15:3
+ >=gnome-base/gsettings-desktop-schemas-3.15.4
>=gnome-base/gnome-desktop-3.11.3:3=
>=gnome-base/gnome-settings-daemon-3.8.3[colord?,policykit]
@@ -60,6 +57,7 @@ COMMON_DEPEND="
>=net-misc/networkmanager-0.9.8[modemmanager]
>=net-misc/modemmanager-0.7.990
+ virtual/libgudev
virtual/opengl
x11-apps/xmodmap
x11-libs/cairo
@@ -94,7 +92,7 @@ COMMON_DEPEND="
# libgnomekbd needed only for gkbd-keyboard-display tool
RDEPEND="${COMMON_DEPEND}
|| ( ( app-admin/openrc-settingsd sys-auth/consolekit )
>=sys-apps/systemd-31 )
- >=sys-apps/accountsservice-0.6.30
+ >=sys-apps/accountsservice-0.6.39
x11-themes/gnome-icon-theme-symbolic
colord? ( >=gnome-extra/gnome-color-manager-3 )
cups? (
@@ -123,45 +121,25 @@ DEPEND="${COMMON_DEPEND}
>=sys-devel/gettext-0.17
virtual/pkgconfig
- cups? ( sys-apps/sed )
-
gnome-base/gnome-common
"
# Needed for autoreconf
# gnome-base/gnome-common
src_prepare() {
- # Gentoo handles completions in a different directory, bugs #465094 and
#477390
- sed -i "s|^completiondir =.*|completiondir = $(get_bashcompdir)|" \
- shell/Makefile.am || die "sed completiondir failed"
-
# Make some panels and dependencies optional; requires eautoreconf
# https://bugzilla.gnome.org/686840, 697478, 700145
epatch "${FILESDIR}"/${PN}-3.14.0-optional.patch
+ # Make wayland support optional
+ epatch "${FILESDIR}"/${PN}-3.16.0-make-wayland-optional.patch
+
# Fix some absolute paths to be appropriate for Gentoo
epatch "${FILESDIR}"/${PN}-3.10.2-gentoo-paths.patch
epatch_user
- # top-level configure.ac does not use AC_CONFIG_SUBDIRS, so we need
this to
- # avoid libtoolize "We've already been run in this tree" warning, bug
#484988
- local d
- for d in . egg-list-box; do
- pushd "${d}" > /dev/null
- AT_NOELIBTOOLIZE=yes eautoreconf
- popd > /dev/null
- done
- elibtoolize --force
-
- # panels/datetime/Makefile.am gets touched by "gentoo-paths" patch.
- # We need to touch timedated{c,h} to prevent them from being
- # regenerated (bug #415901)
- # Upstream think they should be removed, preventing compilation errors
too
- # (https://bugzilla.gnome.org/704822)
- [[ -f panels/datetime/timedated.h ]] && rm -f
panels/datetime/timedated.h
- [[ -f panels/datetime/timedated.c ]] && rm -f
panels/datetime/timedated.c
-
+ eautoreconf
gnome2_src_prepare
}
@@ -179,3 +157,7 @@ src_configure() {
$(use_with v4l cheese) \
$(use_enable input_devices_wacom wacom)
}
+
+src_install() {
+ gnome2_src_install completiondir="$(get_bashcompdir)"
+}
