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

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

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.2 - (show annotations) (download)
Sun Nov 10 08:59:08 2013 UTC (13 months, 1 week ago) by pacho
Branch: MAIN
CVS Tags: HEAD
Changes since 1.1: +0 -0 lines
FILE REMOVED
Version bump, drop old

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

1 Use Gentoo-appropriate absolute paths
2
3 Original author: Alexandre Rostovtsev <tetromino@gentoo.org>
4 ---
5 --- a/panels/common/Makefile.am
6 +++ b/panels/common/Makefile.am
7 @@ -9,7 +9,7 @@
8 $(LIBLANGUAGE_CFLAGS) \
9 -DDATADIR=\""$(datadir)"\" \
10 -DUIDIR=\""$(pkgdatadir)/ui"\" \
11 - -DLIBLOCALEDIR=\""$(prefix)/lib/locale"\" \
12 + -DLIBLOCALEDIR=\""$(libdir)/locale"\" \
13 -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
14 -DUM_PIXMAP_DIR=\""$(pkgdatadir)/pixmaps"\"
15
16 --- a/panels/datetime/Makefile.am
17 +++ b/panels/datetime/Makefile.am
18 @@ -72,6 +72,7 @@
19 -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
20 -DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
21 -DDATADIR="\"$(uidir)\"" \
22 + -DREALDATADIR="\"$(datadir)\"" \
23 $(NULL)
24
25 noinst_PROGRAMS = test-timezone-gfx test-endianess test-timezone
26 --- a/panels/datetime/test-endianess.c
27 +++ b/panels/datetime/test-endianess.c
28 @@ -38,11 +38,11 @@
29 return 0;
30 }
31
32 - dir = g_dir_open ("/usr/share/i18n/locales/", 0, NULL);
33 + dir = g_dir_open (REALDATADIR "/i18n/locales/", 0, NULL);
34 if (dir == NULL) {
35 /* Try with /usr/share/locale/
36 * https://bugzilla.gnome.org/show_bug.cgi?id=646780 */
37 - dir = g_dir_open ("/usr/share/locale/", 0, NULL);
38 + dir = g_dir_open (REALDATADIR "/locale/", 0, NULL);
39 if (dir == NULL) {
40 return 1;
41 }
42 --- a/panels/datetime/test-timezone.c
43 +++ b/panels/datetime/test-timezone.c
44 @@ -1,7 +1,7 @@
45 #include <gtk/gtk.h>
46 #include "cc-timezone-map.h"
47
48 -#define TZ_DIR "/usr/share/zoneinfo/"
49 +#define TZ_DIR REALDATADIR "/zoneinfo/"
50
51 static GList *
52 get_timezone_list (GList *tzs,
53 --- a/panels/datetime/tz.h
54 +++ b/panels/datetime/tz.h
55 @@ -29,9 +29,9 @@
56 #include <glib.h>
57
58 #ifndef __sun
59 -# define TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab"
60 +# define TZ_DATA_FILE REALDATADIR "/zoneinfo/zone.tab"
61 #else
62 -# define TZ_DATA_FILE "/usr/share/lib/zoneinfo/tab/zone_sun.tab"
63 +# define TZ_DATA_FILE REALDATADIR "/lib/zoneinfo/tab/zone_sun.tab"
64 #endif
65
66 typedef struct _TzDB TzDB;
67 --- a/panels/printers/Makefile.am
68 +++ b/panels/printers/Makefile.am
69 @@ -12,6 +12,9 @@
70 -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
71 -DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
72 -DDATADIR="\"$(uidir)\"" \
73 + -DREALDATADIR="\"$(datadir)\"" \
74 + -DPREFIX="\"$(prefix)\"" \
75 + -DLIBEXECDIR="\"$(libexecdir)\"" \
76 $(NULL)
77
78 ccpanelsdir = $(PANELS_DIR)
79 --- a/panels/printers/cc-printers-panel.c
80 +++ b/panels/printers/cc-printers-panel.c
81 @@ -2199,8 +2199,8 @@
82
83 if (printer_name)
84 {
85 - const gchar *const dirs[] = { "/usr/share/cups",
86 - "/usr/local/share/cups",
87 + const gchar *const dirs[] = { REALDATADIR "/cups",
88 + PREFIX "/local/share/cups",
89 NULL };
90 const gchar *testprint[] = { "%s/data/testprint",
91 "%s/data/testprint.ps",
92 --- a/panels/printers/pp-host.c
93 +++ b/panels/printers/pp-host.c
94 @@ -251,7 +251,7 @@
95 data->devices->devices = NULL;
96
97 argv = g_new0 (gchar *, 3);
98 - argv[0] = g_strdup ("/usr/lib/cups/backend/snmp");
99 + argv[0] = g_strdup (LIBEXECDIR "/cups/backend/snmp");
100 argv[1] = g_strdup (priv->hostname);
101
102 /* Use SNMP to get printer's informations */
103 --- a/panels/user-accounts/Makefile.am
104 +++ b/panels/user-accounts/Makefile.am
105 @@ -10,7 +10,7 @@
106 AM_CPPFLAGS = \
107 -DDATADIR=\""$(datadir)"\" \
108 -DUIDIR=\""$(pkgdatadir)/ui/user-accounts"\" \
109 - -DLIBLOCALEDIR=\""$(prefix)/lib/locale"\" \
110 + -DLIBLOCALEDIR=\""$(libdir)/locale"\" \
111 -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
112 -DUM_PIXMAP_DIR=\""$(pkgdatadir)/pixmaps"\" \
113 -I$(srcdir)/../common/ \
114 --
115 1.7.8.6

  ViewVC Help
Powered by ViewVC 1.1.20