diff options
Diffstat (limited to 'sysutils/gnome-control-center/files')
8 files changed, 122 insertions, 0 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 new file mode 100644 index 000000000..9c487d7b8 --- /dev/null +++ b/sysutils/gnome-control-center/files/patch-capplets_mouse_gnome-mouse-properties.c @@ -0,0 +1,29 @@ +--- 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); +- font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "gnome/cursor-fonts/cursor-white.pcf", FALSE, NULL); ++ font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "cursor-fonts/cursor-white.pcf", FALSE, NULL); + + gtk_list_store_append (GTK_LIST_STORE (model), &iter); + if (cursor_font && ! strcmp (cursor_font, font_path)) { +@@ -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); +- font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "gnome/cursor-fonts/cursor-large.pcf", FALSE, NULL); ++ font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "cursor-fonts/cursor-large.pcf", FALSE, NULL); + + gtk_list_store_append (GTK_LIST_STORE (model), &iter); + if (cursor_font && ! strcmp (cursor_font, font_path)) { +@@ -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); +- font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "gnome/cursor-fonts/cursor-large-white.pcf", FALSE, NULL); ++ font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "cursor-fonts/cursor-large-white.pcf", FALSE, NULL); + + gtk_list_store_append (GTK_LIST_STORE (model), &iter); + if (cursor_font && ! strcmp (cursor_font, font_path)) { diff --git a/sysutils/gnome-control-center/files/patch-configure b/sysutils/gnome-control-center/files/patch-configure new file mode 100644 index 000000000..1f63c8a48 --- /dev/null +++ b/sysutils/gnome-control-center/files/patch-configure @@ -0,0 +1,19 @@ +--- 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" ++$ac_aux_dir/ltconfig $LIBTOOL_DEPS + + # Always use our own libtool. + LIBTOOL='$(SHELL) $(top_builddir)/libtool' +@@ -12607,7 +12608,7 @@ + + + cat >>confdefs.h <<_ACEOF +-#define GNOMECC_DATA_DIR "${real_prefix}/share/${GETTEXT_PACKAGE}" ++#define GNOMECC_DATA_DIR "${datadir}/${GETTEXT_PACKAGE}" + _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 000000000..e8984e700 --- /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 May 9 11:57:23 2003 ++++ gnome-settings-daemon/Makefile.in Fri May 9 11:57:49 2003 +@@ -160,7 +160,7 @@ + + # $(AccessX_files) + +-gnome_settings_daemon_LDADD = $(GNOME_SETTINGS_DAEMON_LIBS) $(top_builddir)/libbackground/libbackground.la $(top_builddir)/libsounds/libsounds.a -L$(top_builddir)/libwindow-settings/ -lgnome-window-settings $(XF86MISC_LIBS) ++gnome_settings_daemon_LDADD = $(GNOME_SETTINGS_DAEMON_LIBS) $(top_builddir)/libbackground/libbackground.la $(top_builddir)/libsounds/libsounds.a -L$(top_builddir)/libwindow-settings/.libs -lgnome-window-settings $(XF86MISC_LIBS) + + + #AccessX_files = \ diff --git a/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_gnome-settings-xrdb.c b/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_gnome-settings-xrdb.c new file mode 100644 index 000000000..169ae0cbf --- /dev/null +++ b/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_gnome-settings-xrdb.c @@ -0,0 +1,19 @@ +--- gnome-settings-daemon/gnome-settings-xrdb.c.orig Fri May 9 11:55:44 2003 ++++ gnome-settings-daemon/gnome-settings-xrdb.c Fri May 9 11:55:58 2003 +@@ -251,6 +251,7 @@ + append_xresources (GString *string, GError **error) + { + const char* home_path; ++ char *xresources; + + g_return_if_fail (string != NULL); + +@@ -259,7 +260,7 @@ + g_warning (_("Cannot determine user's home directory")); + return; + } +- char *xresources = g_build_filename (home_path, USER_X_RESOURCES, NULL); ++ xresources = g_build_filename (home_path, USER_X_RESOURCES, NULL); + if (g_file_test (xresources, G_FILE_TEST_EXISTS)) { + append_file (xresources, string, error); + if (*error) { 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 000000000..3431fb5d4 --- /dev/null +++ b/sysutils/gnome-control-center/files/patch-libbackground_Makefile.in @@ -0,0 +1,11 @@ +--- libbackground/Makefile.in.orig Fri May 9 11:05:19 2003 ++++ libbackground/Makefile.in Fri May 9 11:05:45 2003 +@@ -151,7 +151,7 @@ + + EXTRA_DIST = ChangeLog + +-INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" -DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\" -DG_LOG_DOMAIN=\"capplet-common\" -I$(top_srcdir)/ @CAPPLET_CFLAGS@ ++INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" -DGNOME_ICONDIR=\""${datadir}/pixmaps"\" -DG_LOG_DOMAIN=\"capplet-common\" -I$(top_srcdir)/ @CAPPLET_CFLAGS@ + + + noinst_LTLIBRARIES = libbackground.la 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 000000000..97ce0db1a --- /dev/null +++ b/sysutils/gnome-control-center/files/patch-libwindow-settings_Makefile.in @@ -0,0 +1,11 @@ +--- libwindow-settings/Makefile.in.orig Fri May 9 11:06:25 2003 ++++ libwindow-settings/Makefile.in Fri May 9 11:07:00 2003 +@@ -151,7 +151,7 @@ + + WM_MODULE_DIR = $(libdir)/window-manager-settings + +-INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" -DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\" -DG_LOG_DOMAIN=\"capplet-common\" -DGNOME_WINDOW_MANAGER_MODULE_PATH=\""$(WM_MODULE_DIR)"\" -I$(top_srcdir)/ @CAPPLET_CFLAGS@ -DMETACITY_THEME_DIR=\""$(datadir)/themes"\" ++INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" -DGNOME_ICONDIR=\""${datadir}/pixmaps"\" -DG_LOG_DOMAIN=\"capplet-common\" -DGNOME_WINDOW_MANAGER_MODULE_PATH=\""$(WM_MODULE_DIR)"\" -I$(top_srcdir)/ @CAPPLET_CFLAGS@ -DMETACITY_THEME_DIR=\""$(datadir)/themes"\" + + + lib_LTLIBRARIES = libgnome-window-settings.la diff --git a/sysutils/gnome-control-center/files/patch-libwindow-settings_gnome-wm-manager.c b/sysutils/gnome-control-center/files/patch-libwindow-settings_gnome-wm-manager.c new file mode 100644 index 000000000..95bbf2ea4 --- /dev/null +++ b/sysutils/gnome-control-center/files/patch-libwindow-settings_gnome-wm-manager.c @@ -0,0 +1,11 @@ +--- libwindow-settings/gnome-wm-manager.c.orig Mon Nov 11 00:42:08 2002 ++++ libwindow-settings/gnome-wm-manager.c Mon Nov 11 00:43:26 2002 +@@ -227,7 +227,7 @@ + + done_scan = TRUE; + +- tempdir = gnome_unconditional_datadir_file ("gnome/wm-properties/"); ++ tempdir = gnome_unconditional_datadir_file ("wm-properties/"); + scan_wm_directory (tempdir, FALSE); + g_free (tempdir); + 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 000000000..149d59a9b --- /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); + |