summaryrefslogtreecommitdiff
path: root/sysutils/gnome-control-center/files
diff options
context:
space:
mode:
Diffstat (limited to 'sysutils/gnome-control-center/files')
-rw-r--r--sysutils/gnome-control-center/files/patch-capplets_mouse_gnome-mouse-properties.c10
-rw-r--r--sysutils/gnome-control-center/files/patch-configure14
-rw-r--r--sysutils/gnome-control-center/files/patch-gnome-settings-daemon_Makefile.in11
-rw-r--r--sysutils/gnome-control-center/files/patch-libbackground_Makefile.in11
-rw-r--r--sysutils/gnome-control-center/files/patch-libwindow-settings_Makefile.in11
-rw-r--r--sysutils/gnome-control-center/files/patch-libwindow-settings_wm-list.c11
6 files changed, 56 insertions, 12 deletions
diff --git a/sysutils/gnome-control-center/files/patch-capplets_mouse_gnome-mouse-properties.c b/sysutils/gnome-control-center/files/patch-capplets_mouse_gnome-mouse-properties.c
index 0969a7707ffd..9c487d7b8e9d 100644
--- a/sysutils/gnome-control-center/files/patch-capplets_mouse_gnome-mouse-properties.c
+++ b/sysutils/gnome-control-center/files/patch-capplets_mouse_gnome-mouse-properties.c
@@ -1,6 +1,6 @@
---- capplets/mouse/gnome-mouse-properties.c.orig Wed May 29 00:14:19 2002
-+++ capplets/mouse/gnome-mouse-properties.c Tue Jun 25 21:51:30 2002
-@@ -570,7 +570,7 @@
+--- capplets/mouse/gnome-mouse-properties.c.orig Sat Nov 2 13:40:22 2002
++++ capplets/mouse/gnome-mouse-properties.c Sun Dec 22 16:33:36 2002
+@@ -591,7 +591,7 @@
filename = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_APP_PIXMAP, "mouse-cursor-white.png", TRUE, NULL);
pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
g_free (filename);
@@ -9,7 +9,7 @@
gtk_list_store_append (GTK_LIST_STORE (model), &iter);
if (cursor_font && ! strcmp (cursor_font, font_path)) {
-@@ -591,7 +591,7 @@
+@@ -612,7 +612,7 @@
filename = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_APP_PIXMAP, "mouse-cursor-normal-large.png", TRUE, NULL);
pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
g_free (filename);
@@ -18,7 +18,7 @@
gtk_list_store_append (GTK_LIST_STORE (model), &iter);
if (cursor_font && ! strcmp (cursor_font, font_path)) {
-@@ -612,7 +612,7 @@
+@@ -633,7 +633,7 @@
filename = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_APP_PIXMAP, "mouse-cursor-white-large.png", TRUE, NULL);
pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
g_free (filename);
diff --git a/sysutils/gnome-control-center/files/patch-configure b/sysutils/gnome-control-center/files/patch-configure
index f43c53c1ec2b..1f63c8a48e05 100644
--- a/sysutils/gnome-control-center/files/patch-configure
+++ b/sysutils/gnome-control-center/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig Tue Aug 6 01:33:52 2002
-+++ configure Wed Aug 7 01:22:14 2002
-@@ -5768,6 +5768,7 @@
+--- configure.orig Wed Dec 18 16:10:09 2002
++++ configure Sun Dec 22 16:36:03 2002
+@@ -8516,6 +8516,7 @@
# This can be used to rebuild libtool when needed
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -8,12 +8,12 @@
# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -9090,7 +9091,7 @@
- fi
+@@ -12607,7 +12608,7 @@
- cat >> confdefs.h <<EOF
+
+ cat >>confdefs.h <<_ACEOF
-#define GNOMECC_DATA_DIR "${real_prefix}/share/${GETTEXT_PACKAGE}"
+#define GNOMECC_DATA_DIR "${datadir}/${GETTEXT_PACKAGE}"
- EOF
+ _ACEOF
GNOMECC_ICONS_DIR='$(datadir)/'${GETTEXT_PACKAGE}'/icons'
diff --git a/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_Makefile.in b/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_Makefile.in
new file mode 100644
index 000000000000..49e81252a028
--- /dev/null
+++ b/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_Makefile.in
@@ -0,0 +1,11 @@
+--- gnome-settings-daemon/Makefile.in.orig Fri Jan 17 12:30:39 2003
++++ gnome-settings-daemon/Makefile.in Fri Jan 17 12:33:06 2003
+@@ -195,7 +195,7 @@
+ $(GNOME_SETTINGS_DAEMON_LIBS) \
+ $(top_builddir)/libbackground/libbackground.la \
+ $(top_builddir)/libsounds/libsounds.a \
+- -L$(top_builddir)/libwindow-settings/ -lgnome-window-settings \
++ -L$(top_builddir)/libwindow-settings/.libs -lgnome-window-settings \
+ $(XF86MISC_LIBS)
+
+
diff --git a/sysutils/gnome-control-center/files/patch-libbackground_Makefile.in b/sysutils/gnome-control-center/files/patch-libbackground_Makefile.in
new file mode 100644
index 000000000000..d8ece4b307ac
--- /dev/null
+++ b/sysutils/gnome-control-center/files/patch-libbackground_Makefile.in
@@ -0,0 +1,11 @@
+--- libbackground/Makefile.in.orig Fri Jan 17 12:33:42 2003
++++ libbackground/Makefile.in Fri Jan 17 12:34:13 2003
+@@ -151,7 +151,7 @@
+
+ INCLUDES = \
+ -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
+- -DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\" \
++ -DGNOME_ICONDIR=\""${datadir}/pixmaps"\" \
+ -DG_LOG_DOMAIN=\"capplet-common\" \
+ -I$(top_srcdir)/ \
+ @CAPPLET_CFLAGS@
diff --git a/sysutils/gnome-control-center/files/patch-libwindow-settings_Makefile.in b/sysutils/gnome-control-center/files/patch-libwindow-settings_Makefile.in
new file mode 100644
index 000000000000..c4d9211b70e2
--- /dev/null
+++ b/sysutils/gnome-control-center/files/patch-libwindow-settings_Makefile.in
@@ -0,0 +1,11 @@
+--- libwindow-settings/Makefile.in.orig Fri Jan 17 12:34:44 2003
++++ libwindow-settings/Makefile.in Fri Jan 17 12:35:43 2003
+@@ -151,7 +151,7 @@
+
+ INCLUDES = \
+ -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
+- -DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\" \
++ -DGNOME_ICONDIR=\""${datadir}/pixmaps"\" \
+ -DG_LOG_DOMAIN=\"capplet-common\" \
+ -DGNOME_WINDOW_MANAGER_MODULE_PATH=\""$(WM_MODULE_DIR)"\" \
+ -I$(top_srcdir)/ \
diff --git a/sysutils/gnome-control-center/files/patch-libwindow-settings_wm-list.c b/sysutils/gnome-control-center/files/patch-libwindow-settings_wm-list.c
new file mode 100644
index 000000000000..149d59a9b0c8
--- /dev/null
+++ b/sysutils/gnome-control-center/files/patch-libwindow-settings_wm-list.c
@@ -0,0 +1,11 @@
+--- libwindow-settings/wm-list.c.orig Tue Oct 8 17:43:12 2002
++++ libwindow-settings/wm-list.c Tue Oct 8 17:43:25 2002
+@@ -251,7 +251,7 @@
+ gchar *name;
+ GConfClient *client;
+
+- tempdir = gnome_unconditional_datadir_file ("gnome/wm-properties/");
++ tempdir = gnome_unconditional_datadir_file ("wm-properties/");
+ wm_list_read_dir (tempdir, FALSE);
+ g_free (tempdir);
+