diff options
Diffstat (limited to 'sysutils/gnomecontrolcenter2/files')
6 files changed, 48 insertions, 62 deletions
diff --git a/sysutils/gnomecontrolcenter2/files/patch-capplets_default-applications_gnome-default-applications-properies-structs.c b/sysutils/gnomecontrolcenter2/files/patch-capplets_default-applications_gnome-default-applications-properies-structs.c deleted file mode 100644 index c6b38bd4daa6..000000000000 --- a/sysutils/gnomecontrolcenter2/files/patch-capplets_default-applications_gnome-default-applications-properies-structs.c +++ /dev/null @@ -1,18 +0,0 @@ ---- capplets/default-applications/gnome-default-applications-properties-structs.c.orig Sun Feb 20 16:18:03 2005 -+++ capplets/default-applications/gnome-default-applications-properties-structs.c Mon Feb 21 15:52:04 2005 -@@ -12,6 +12,7 @@ - { N_("Firebird/FireFox"), "mozilla-firebird", "mozilla-firebird %s", FALSE, FALSE }, - { N_("Firebird/FireFox"), "mozilla-firefox", "mozilla-firebird %s", FALSE, FALSE }, - { N_("Firebird/FireFox"), "firefox", "mozilla-firefox %s", FALSE, FALSE }, -+ { N_("Firebird/FireFox"), "firefox", "firefox %s", FALSE, FALSE }, - { N_("Mozilla/Netscape 6"), "mozilla-1.6", "mozilla-1.6 %s", FALSE, FALSE }, - { N_("Mozilla/Netscape 6"), "mozilla", "mozilla %s", FALSE, FALSE }, - { N_("Netscape Communicator"), "netscape", "netscape %s", FALSE, FALSE }, -@@ -40,6 +41,7 @@ - { N_("Balsa"), "balsa", "balsa -m %s", FALSE, FALSE }, - { N_("KMail"), "kmail", "kmail %s", FALSE, FALSE }, - { N_("Mozilla Mail"), "mozilla", "mozilla -mail %s", FALSE, FALSE}, -+ { N_("Thunderbird"), "thunderbird", "thunderbird %s", FALSE, FALSE}, - { N_("Mutt") , "mutt", "mutt %s", TRUE, FALSE }, - - }; diff --git a/sysutils/gnomecontrolcenter2/files/patch-capplets_desktop-links_Makefile.in b/sysutils/gnomecontrolcenter2/files/patch-capplets_desktop-links_Makefile.in deleted file mode 100644 index 5a6b0ba8f2d6..000000000000 --- a/sysutils/gnomecontrolcenter2/files/patch-capplets_desktop-links_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- capplets/desktop-links/Makefile.in.orig Tue Dec 30 15:55:28 2003 -+++ capplets/desktop-links/Makefile.in Tue Dec 30 15:55:49 2003 -@@ -190,7 +190,7 @@ - - pixmaps_pre = $(capplets:=-capplet.png) - pixmaps_DATA = $(pixmaps_pre) accessibility-directory.png --pixmapsdir = $(datadir)/icons/gnome/48x48/apps -+pixmapsdir = $(prefix)/share/icons/gnome/48x48/apps - - desktop_files = $(capplets:=.desktop) - desktop_in_files = $(desktop_files:.desktop=.desktop.in) diff --git a/sysutils/gnomecontrolcenter2/files/patch-capplets_gnome-keyboard-properties-xkbot.c b/sysutils/gnomecontrolcenter2/files/patch-capplets_gnome-keyboard-properties-xkbot.c new file mode 100644 index 000000000000..02374b23ac45 --- /dev/null +++ b/sysutils/gnomecontrolcenter2/files/patch-capplets_gnome-keyboard-properties-xkbot.c @@ -0,0 +1,33 @@ +--- capplets/keyboard/gnome-keyboard-properties-xkbot.c.orig Wed Jan 19 18:16:13 2005 ++++ capplets/keyboard/gnome-keyboard-properties-xkbot.c Wed Feb 9 21:33:00 2005 +@@ -242,21 +242,25 @@ + Bool allowMultipleSelection, + GladeXML * dialog) + { ++ gchar *utfGroupName, *titlemarkup; ++ GtkWidget *expander; ++ GtkWidget *vbox; ++ GtkWidget *align; + GSList * expanders_list = g_object_get_data (G_OBJECT (dialog), EXPANDERS_PROP); + + current1stLevelId = configItem->name; + +- gchar *utfGroupName = xci_desc_to_utf8 (configItem); +- gchar *titlemarkup = g_strconcat ("<span>", utfGroupName, "</span>", NULL); ++ utfGroupName = xci_desc_to_utf8 (configItem); ++ titlemarkup = g_strconcat ("<span>", utfGroupName, "</span>", NULL); + +- GtkWidget *expander = gtk_expander_new (titlemarkup); ++ expander = gtk_expander_new (titlemarkup); + g_object_set_data_full (G_OBJECT (expander), "utfGroupName", utfGroupName, g_free); + + g_free (titlemarkup); + gtk_expander_set_use_markup (GTK_EXPANDER (expander), TRUE); +- GtkWidget *align = gtk_alignment_new (0, 0, 1, 1); ++ align = gtk_alignment_new (0, 0, 1, 1); + gtk_alignment_set_padding (GTK_ALIGNMENT (align), 6, 12, 12, 0); +- GtkWidget *vbox = gtk_vbox_new (TRUE, 6); ++ vbox = gtk_vbox_new (TRUE, 6); + gtk_container_add (GTK_CONTAINER (align), vbox); + gtk_container_add (GTK_CONTAINER (expander), align); + currentVbox = vbox; diff --git a/sysutils/gnomecontrolcenter2/files/patch-capplets_mouse_gnome-mouse-properties.c b/sysutils/gnomecontrolcenter2/files/patch-capplets_mouse_gnome-mouse-properties.c deleted file mode 100644 index 9c487d7b8e9d..000000000000 --- a/sysutils/gnomecontrolcenter2/files/patch-capplets_mouse_gnome-mouse-properties.c +++ /dev/null @@ -1,29 +0,0 @@ ---- 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/gnomecontrolcenter2/files/patch-configure b/sysutils/gnomecontrolcenter2/files/patch-configure index f97758e10ba0..d8e861724bd3 100644 --- a/sysutils/gnomecontrolcenter2/files/patch-configure +++ b/sysutils/gnomecontrolcenter2/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Mon Feb 21 15:53:01 2005 -+++ configure Mon Feb 21 15:53:01 2005 -@@ -21286,6 +21286,7 @@ +--- configure.orig Thu Jan 13 02:39:28 2005 ++++ configure Thu Jan 13 02:39:28 2005 +@@ -22221,6 +22221,7 @@ if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -8,7 +8,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -26646,7 +26647,7 @@ +@@ -27490,7 +27491,7 @@ cat >>confdefs.h <<_ACEOF diff --git a/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_actions_Makefile.in b/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_actions_Makefile.in new file mode 100644 index 000000000000..52a627fb20df --- /dev/null +++ b/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_actions_Makefile.in @@ -0,0 +1,11 @@ +--- gnome-settings-daemon/actions/Makefile.in.orig Mon Dec 20 19:19:31 2004 ++++ gnome-settings-daemon/actions/Makefile.in Mon Dec 20 19:20:45 2004 +@@ -296,7 +296,7 @@ + Datadir = $(datadir)/control-center-2.0/interfaces/ + Data_DATA = acme.glade + +-pixmapsdir = $(GNOMECC_PIXMAPS_DIR) ++pixmapsdir = $(prefix)/share/icons/gnome/48x48/apps + pixmaps_DATA = acme-brightness.png acme-eject.png gnome-speakernotes-muted.png gnome-speakernotes.png + + EXTRA_DIST = \ |