* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/files/
@ 2015-05-11 23:28 Gilles Dartiguelongue
0 siblings, 0 replies; 2+ messages in thread
From: Gilles Dartiguelongue @ 2015-05-11 23:28 UTC (permalink / raw
To: gentoo-commits
commit: 9a3f1891e76bf0adbde66fd46a1a76bb6efa2abd
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon May 11 23:28:12 2015 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Mon May 11 23:28:20 2015 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=9a3f1891
gnome-base/gnome-control-center: re-add mistakenly removed patch
.../gnome-control-center-3.10.2-gentoo-paths.patch | 119 +++++++++++++++++++++
1 file changed, 119 insertions(+)
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.10.2-gentoo-paths.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.10.2-gentoo-paths.patch
new file mode 100644
index 0000000..8ef4033
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.10.2-gentoo-paths.patch
@@ -0,0 +1,119 @@
+From 6ce180eace2bb3b9954d0b9ca74c7108e772ad68 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Sun, 8 Dec 2013 23:44:56 +0100
+Subject: [PATCH 2/2] Fix some absolute paths to be appropriate for Gentoo
+
+---
+ panels/datetime/Makefile.am | 1 +
+ panels/datetime/test-endianess.c | 4 ++--
+ panels/datetime/test-timezone.c | 2 +-
+ panels/datetime/tz.h | 4 ++--
+ panels/printers/Makefile.am | 3 +++
+ panels/printers/cc-printers-panel.c | 4 ++--
+ panels/printers/pp-host.c | 2 +-
+ 7 files changed, 12 insertions(+), 8 deletions(-)
+
+diff --git a/panels/datetime/Makefile.am b/panels/datetime/Makefile.am
+index fc85592..133845f 100644
+--- a/panels/datetime/Makefile.am
++++ b/panels/datetime/Makefile.am
+@@ -24,6 +24,7 @@ AM_CPPFLAGS = \
+ $(DATETIME_PANEL_CFLAGS) \
+ -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
+ -DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
++ -DREALDATADIR="\"$(datadir)\"" \
+ $(NULL)
+
+ noinst_PROGRAMS = test-timezone-gfx test-endianess test-timezone
+diff --git a/panels/datetime/test-endianess.c b/panels/datetime/test-endianess.c
+index 490df17..b43fc87 100644
+--- a/panels/datetime/test-endianess.c
++++ b/panels/datetime/test-endianess.c
+@@ -38,11 +38,11 @@ int main (int argc, char **argv)
+ return 0;
+ }
+
+- dir = g_dir_open ("/usr/share/i18n/locales/", 0, NULL);
++ dir = g_dir_open (REALDATADIR "/i18n/locales/", 0, NULL);
+ if (dir == NULL) {
+ /* Try with /usr/share/locale/
+ * https://bugzilla.gnome.org/show_bug.cgi?id=646780 */
+- dir = g_dir_open ("/usr/share/locale/", 0, NULL);
++ dir = g_dir_open (REALDATADIR "/locale/", 0, NULL);
+ if (dir == NULL) {
+ return 1;
+ }
+diff --git a/panels/datetime/test-timezone.c b/panels/datetime/test-timezone.c
+index 5667657..8483b87 100644
+--- a/panels/datetime/test-timezone.c
++++ b/panels/datetime/test-timezone.c
+@@ -1,7 +1,7 @@
+ #include <gtk/gtk.h>
+ #include "cc-timezone-map.h"
+
+-#define TZ_DIR "/usr/share/zoneinfo/"
++#define TZ_DIR REALDATADIR "/zoneinfo/"
+
+ static GList *
+ get_timezone_list (GList *tzs,
+diff --git a/panels/datetime/tz.h b/panels/datetime/tz.h
+index 71c1c23..ca4b3c4 100644
+--- a/panels/datetime/tz.h
++++ b/panels/datetime/tz.h
+@@ -29,9 +29,9 @@
+ #include <glib.h>
+
+ #ifndef __sun
+-# define TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab"
++# define TZ_DATA_FILE REALDATADIR "/zoneinfo/zone.tab"
+ #else
+-# define TZ_DATA_FILE "/usr/share/lib/zoneinfo/tab/zone_sun.tab"
++# define TZ_DATA_FILE REALDATADIR "/lib/zoneinfo/tab/zone_sun.tab"
+ #endif
+
+ typedef struct _TzDB TzDB;
+diff --git a/panels/printers/Makefile.am b/panels/printers/Makefile.am
+index 63a33b4..12e2e45 100644
+--- a/panels/printers/Makefile.am
++++ b/panels/printers/Makefile.am
+@@ -7,6 +7,9 @@ INCLUDES = \
+ $(SMBCLIENT_CFLAGS) \
+ -I$(top_srcdir)/shell/ \
+ -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
++ -DREALDATADIR="\"$(datadir)\"" \
++ -DPREFIX="\"$(prefix)\"" \
++ -DLIBEXECDIR="\"$(libexecdir)\"" \
+ $(NULL)
+
+ noinst_LTLIBRARIES = libprinters.la
+diff --git a/panels/printers/cc-printers-panel.c b/panels/printers/cc-printers-panel.c
+index 29b8173..24bcdf8 100644
+--- a/panels/printers/cc-printers-panel.c
++++ b/panels/printers/cc-printers-panel.c
+@@ -2428,8 +2428,8 @@ test_page_cb (GtkButton *button,
+
+ if (printer_name)
+ {
+- const gchar *const dirs[] = { "/usr/share/cups",
+- "/usr/local/share/cups",
++ const gchar *const dirs[] = { REALDATADIR "/cups",
++ PREFIX "/local/share/cups",
+ NULL };
+ const gchar *testprint[] = { "%s/data/testprint",
+ "%s/data/testprint.ps",
+diff --git a/panels/printers/pp-host.c b/panels/printers/pp-host.c
+index a994a61..51efe50 100644
+--- a/panels/printers/pp-host.c
++++ b/panels/printers/pp-host.c
+@@ -251,7 +251,7 @@ _pp_host_get_snmp_devices_thread (GSimpleAsyncResult *res,
+ data->devices->devices = NULL;
+
+ argv = g_new0 (gchar *, 3);
+- argv[0] = g_strdup ("/usr/lib/cups/backend/snmp");
++ argv[0] = g_strdup (LIBEXECDIR "/cups/backend/snmp");
+ argv[1] = g_strdup (priv->hostname);
+
+ /* Use SNMP to get printer's informations */
+--
+1.8.3.2
+
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/files/
@ 2016-04-01 17:58 Ole Reifschneider
0 siblings, 0 replies; 2+ messages in thread
From: Ole Reifschneider @ 2016-04-01 17:58 UTC (permalink / raw
To: gentoo-commits
commit: 445a5d1892ac1f46d5ef740bc7c98ed789f3f2c4
Author: Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 1 17:57:54 2016 +0000
Commit: Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
CommitDate: Fri Apr 1 17:57:54 2016 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=445a5d18
gnome-base/gnome-control-center: Fix optional patch
Some dependencies were not properly removed.
Package-Manager: portage-2.2.28
Manifest-Sign-Key: 0xE9E568677E8B4D42
.../gnome-control-center-3.20.0-optional.patch | 27 +++++++++++-----------
1 file changed, 13 insertions(+), 14 deletions(-)
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.20.0-optional.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.20.0-optional.patch
index 0e7639d..59379a5 100644
--- a/gnome-base/gnome-control-center/files/gnome-control-center-3.20.0-optional.patch
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.20.0-optional.patch
@@ -1,4 +1,4 @@
-From d3a9941031fc69d343fb011af52f2462de269bff Mon Sep 17 00:00:00 2001
+From dc62978815a12d0d0fbd97e975a612a13aff0cdc Mon Sep 17 00:00:00 2001
From: Alexandre Rostovtsev <tetromino@gentoo.org>
Date: Fri, 25 Apr 2014 22:17:24 +0200
Subject: [PATCH] Make bluetooth/colord/goa/kerberos/wacom optional
@@ -11,17 +11,17 @@ https://bugzilla.gnome.org/show_bug.cgi?id=700145
Signed-Off: Ole Reifschneider <tranquility@gentoo.org>
---
- configure.ac | 157 ++++++++++++++++++++++++++------
+ configure.ac | 156 ++++++++++++++++++++++++++------
panels/Makefile.am | 10 +-
panels/background/Makefile.am | 8 +-
panels/background/bg-pictures-source.c | 20 ++++
panels/user-accounts/um-realm-manager.c | 9 ++
shell/Makefile.am | 10 +-
shell/cc-panel-loader.c | 8 ++
- 7 files changed, 187 insertions(+), 35 deletions(-)
+ 7 files changed, 186 insertions(+), 35 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 0c2a779..0fd0025 100644
+index 0c2a779..4dfff18 100644
--- a/configure.ac
+++ b/configure.ac
@@ -119,10 +119,6 @@ LIBGD_INIT([_view-common notification static])
@@ -35,7 +35,7 @@ index 0c2a779..0fd0025 100644
PKG_CHECK_MODULES(DATETIME_PANEL, $COMMON_MODULES
gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
-@@ -140,14 +136,66 @@ PKG_CHECK_MODULES(MOUSE_PANEL, $COMMON_MODULES xi >= 1.2
+@@ -140,14 +136,65 @@ PKG_CHECK_MODULES(MOUSE_PANEL, $COMMON_MODULES xi >= 1.2
PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES gmodule-2.0
polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
PKG_CHECK_MODULES(NOTIFICATIONS_PANEL, $COMMON_MODULES)
@@ -56,7 +56,7 @@ index 0c2a779..0fd0025 100644
+if test x$WANT_ONLINE_ACCOUNTS = xyes; then
+ PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION)
+ build_online_accounts=true
-+ background_online_accounts="goa-1.0 >= $GOA_REQUIRED_VERSION grilo-0.2 >= $GRILO_REQUIRED_VERSION"
++ background_online_accounts="goa-1.0 >= $GOA_REQUIRED_VERSION grilo-0.3 >= $GRILO_REQUIRED_VERSION"
+fi
+if test "x$build_online_accounts" = xtrue ; then
+ AC_DEFINE(BUILD_ONLINE_ACCOUNTS, 1, [Define to 1 to build the Online Accounts panel])
@@ -67,8 +67,7 @@ index 0c2a779..0fd0025 100644
+
+PKG_CHECK_MODULES(BACKGROUND_PANEL, $COMMON_MODULES cairo-gobject libxml-2.0 gnome-desktop-3.0
+ gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION
-+ goa-1.0 >= $GOA_REQUIRED_VERSION
-+ grilo-0.3 >= $GRILO_REQUIRED_VERSION)
++ $background_online_accounts)
+
PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.99.0
gnome-settings-daemon >= $GSD_REQUIRED_VERSION)
@@ -108,7 +107,7 @@ index 0c2a779..0fd0025 100644
PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES
polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
PKG_CHECK_MODULES(PRIVACY_PANEL, $COMMON_MODULES)
-@@ -221,8 +269,25 @@ fi
+@@ -221,8 +268,25 @@ fi
AM_CONDITIONAL(HAVE_NM_UNSTABLE, [test x$nm_unstable = xyes])
# Check for gnome-bluetooth
@@ -136,7 +135,7 @@ index 0c2a779..0fd0025 100644
if test "x$have_bluetooth" = xyes ; then
AC_DEFINE(BUILD_BLUETOOTH, 1, [Define to 1 to build the Bluetooth panel])
fi
-@@ -307,15 +372,27 @@ case $host_os in
+@@ -307,15 +371,27 @@ case $host_os in
if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then
have_wacom=no
else
@@ -173,7 +172,7 @@ index 0c2a779..0fd0025 100644
fi
;;
*)
-@@ -325,15 +402,22 @@ esac
+@@ -325,15 +401,22 @@ esac
AM_CONDITIONAL(BUILD_WACOM, [test x${have_wacom} = xyes])
# Kerberos kerberos support
@@ -204,7 +203,7 @@ index 0c2a779..0fd0025 100644
AC_SUBST(KRB5_CFLAGS)
AC_SUBST(KRB5_LIBS)
-@@ -569,6 +653,11 @@ if test "x$have_bluetooth" = "xyes"; then
+@@ -569,6 +652,11 @@ if test "x$have_bluetooth" = "xyes"; then
else
AC_MSG_NOTICE([ Bluetooth panel disabled])
fi
@@ -216,7 +215,7 @@ index 0c2a779..0fd0025 100644
if test "x$enable_cups" = "xyes"; then
AC_MSG_NOTICE([** CUPS (Printers panel)])
else
-@@ -579,6 +668,16 @@ if test "x$have_cheese" = "xyes"; then
+@@ -579,6 +667,16 @@ if test "x$have_cheese" = "xyes"; then
else
AC_MSG_NOTICE([ Users panel webcam support disabled])
fi
@@ -530,5 +529,5 @@ index de9c5df..17503fe 100644
#ifdef BUILD_PRINTERS
PANEL_TYPE("printers", cc_printers_panel_get_type ),
--
-2.7.2
+2.7.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-04-01 17:58 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-05-11 23:28 [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/files/ Gilles Dartiguelongue
-- strict thread matches above, loose matches on Subject: below --
2016-04-01 17:58 Ole Reifschneider
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox