/[gentoo-x86]/gnome-base/gnome-control-center/files/gnome-control-center-3.10.2-gentoo-paths.patch
Gentoo

Contents of /gnome-base/gnome-control-center/files/gnome-control-center-3.10.2-gentoo-paths.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1 - (show annotations) (download)
Tue Dec 24 17:55:10 2013 UTC (8 months, 3 weeks ago) by pacho
Branch: MAIN
CVS Tags: HEAD
Version bump for Gnome 3.10

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

1 From 6ce180eace2bb3b9954d0b9ca74c7108e772ad68 Mon Sep 17 00:00:00 2001
2 From: Alexandre Rostovtsev <tetromino@gentoo.org>
3 Date: Sun, 8 Dec 2013 23:44:56 +0100
4 Subject: [PATCH 2/2] Fix some absolute paths to be appropriate for Gentoo
5
6 ---
7 panels/datetime/Makefile.am | 1 +
8 panels/datetime/test-endianess.c | 4 ++--
9 panels/datetime/test-timezone.c | 2 +-
10 panels/datetime/tz.h | 4 ++--
11 panels/printers/Makefile.am | 3 +++
12 panels/printers/cc-printers-panel.c | 4 ++--
13 panels/printers/pp-host.c | 2 +-
14 7 files changed, 12 insertions(+), 8 deletions(-)
15
16 diff --git a/panels/datetime/Makefile.am b/panels/datetime/Makefile.am
17 index fc85592..133845f 100644
18 --- a/panels/datetime/Makefile.am
19 +++ b/panels/datetime/Makefile.am
20 @@ -24,6 +24,7 @@ AM_CPPFLAGS = \
21 $(DATETIME_PANEL_CFLAGS) \
22 -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
23 -DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
24 + -DREALDATADIR="\"$(datadir)\"" \
25 $(NULL)
26
27 noinst_PROGRAMS = test-timezone-gfx test-endianess test-timezone
28 diff --git a/panels/datetime/test-endianess.c b/panels/datetime/test-endianess.c
29 index 490df17..b43fc87 100644
30 --- a/panels/datetime/test-endianess.c
31 +++ b/panels/datetime/test-endianess.c
32 @@ -38,11 +38,11 @@ int main (int argc, char **argv)
33 return 0;
34 }
35
36 - dir = g_dir_open ("/usr/share/i18n/locales/", 0, NULL);
37 + dir = g_dir_open (REALDATADIR "/i18n/locales/", 0, NULL);
38 if (dir == NULL) {
39 /* Try with /usr/share/locale/
40 * https://bugzilla.gnome.org/show_bug.cgi?id=646780 */
41 - dir = g_dir_open ("/usr/share/locale/", 0, NULL);
42 + dir = g_dir_open (REALDATADIR "/locale/", 0, NULL);
43 if (dir == NULL) {
44 return 1;
45 }
46 diff --git a/panels/datetime/test-timezone.c b/panels/datetime/test-timezone.c
47 index 5667657..8483b87 100644
48 --- a/panels/datetime/test-timezone.c
49 +++ b/panels/datetime/test-timezone.c
50 @@ -1,7 +1,7 @@
51 #include <gtk/gtk.h>
52 #include "cc-timezone-map.h"
53
54 -#define TZ_DIR "/usr/share/zoneinfo/"
55 +#define TZ_DIR REALDATADIR "/zoneinfo/"
56
57 static GList *
58 get_timezone_list (GList *tzs,
59 diff --git a/panels/datetime/tz.h b/panels/datetime/tz.h
60 index 71c1c23..ca4b3c4 100644
61 --- a/panels/datetime/tz.h
62 +++ b/panels/datetime/tz.h
63 @@ -29,9 +29,9 @@
64 #include <glib.h>
65
66 #ifndef __sun
67 -# define TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab"
68 +# define TZ_DATA_FILE REALDATADIR "/zoneinfo/zone.tab"
69 #else
70 -# define TZ_DATA_FILE "/usr/share/lib/zoneinfo/tab/zone_sun.tab"
71 +# define TZ_DATA_FILE REALDATADIR "/lib/zoneinfo/tab/zone_sun.tab"
72 #endif
73
74 typedef struct _TzDB TzDB;
75 diff --git a/panels/printers/Makefile.am b/panels/printers/Makefile.am
76 index 63a33b4..12e2e45 100644
77 --- a/panels/printers/Makefile.am
78 +++ b/panels/printers/Makefile.am
79 @@ -7,6 +7,9 @@ INCLUDES = \
80 $(SMBCLIENT_CFLAGS) \
81 -I$(top_srcdir)/shell/ \
82 -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
83 + -DREALDATADIR="\"$(datadir)\"" \
84 + -DPREFIX="\"$(prefix)\"" \
85 + -DLIBEXECDIR="\"$(libexecdir)\"" \
86 $(NULL)
87
88 noinst_LTLIBRARIES = libprinters.la
89 diff --git a/panels/printers/cc-printers-panel.c b/panels/printers/cc-printers-panel.c
90 index 29b8173..24bcdf8 100644
91 --- a/panels/printers/cc-printers-panel.c
92 +++ b/panels/printers/cc-printers-panel.c
93 @@ -2428,8 +2428,8 @@ test_page_cb (GtkButton *button,
94
95 if (printer_name)
96 {
97 - const gchar *const dirs[] = { "/usr/share/cups",
98 - "/usr/local/share/cups",
99 + const gchar *const dirs[] = { REALDATADIR "/cups",
100 + PREFIX "/local/share/cups",
101 NULL };
102 const gchar *testprint[] = { "%s/data/testprint",
103 "%s/data/testprint.ps",
104 diff --git a/panels/printers/pp-host.c b/panels/printers/pp-host.c
105 index a994a61..51efe50 100644
106 --- a/panels/printers/pp-host.c
107 +++ b/panels/printers/pp-host.c
108 @@ -251,7 +251,7 @@ _pp_host_get_snmp_devices_thread (GSimpleAsyncResult *res,
109 data->devices->devices = NULL;
110
111 argv = g_new0 (gchar *, 3);
112 - argv[0] = g_strdup ("/usr/lib/cups/backend/snmp");
113 + argv[0] = g_strdup (LIBEXECDIR "/cups/backend/snmp");
114 argv[1] = g_strdup (priv->hostname);
115
116 /* Use SNMP to get printer's informations */
117 --
118 1.8.3.2

  ViewVC Help
Powered by ViewVC 1.1.20