From 24914dc29f32dbe8bb1e5cce8599d8bbec5af9cb Mon Sep 17 00:00:00 2001 From: adamw Date: Wed, 25 May 2005 17:42:37 +0000 Subject: Add at 2.11.0. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@4019 df743ca5-7f9a-e211-a948-0013205c9059 --- deskutils/gnome-utils/files/patch-ai | 11 ++++++++ deskutils/gnome-utils/files/patch-configure | 11 ++++++++ .../files/patch-gnome-screenshot_screenshot-save.c | 29 ++++++++++++++++++++++ .../files/patch-gsearchtool_gsearchtool-support.c | 10 ++++++++ .../gnome-utils/files/patch-logview_desc_db.c | 10 ++++++++ .../gnome-utils/files/patch-logview_logview.c | 29 ++++++++++++++++++++++ 6 files changed, 100 insertions(+) create mode 100644 deskutils/gnome-utils/files/patch-ai create mode 100644 deskutils/gnome-utils/files/patch-configure create mode 100644 deskutils/gnome-utils/files/patch-gnome-screenshot_screenshot-save.c create mode 100644 deskutils/gnome-utils/files/patch-gsearchtool_gsearchtool-support.c create mode 100644 deskutils/gnome-utils/files/patch-logview_desc_db.c create mode 100644 deskutils/gnome-utils/files/patch-logview_logview.c (limited to 'deskutils/gnome-utils/files') diff --git a/deskutils/gnome-utils/files/patch-ai b/deskutils/gnome-utils/files/patch-ai new file mode 100644 index 000000000..927a2b461 --- /dev/null +++ b/deskutils/gnome-utils/files/patch-ai @@ -0,0 +1,11 @@ +--- xmldocs.make.orig Thu Aug 7 09:56:16 2003 ++++ xmldocs.make Thu Aug 7 13:55:58 2003 +@@ -36,7 +36,7 @@ + # ********** Begin of section some packagers may need to modify ********** + # This variable (docdir) specifies where the documents should be installed. + # This default value should work for most packages. +-docdir = $(datadir)/gnome/help/$(docname)/$(lang) ++docdir = $(datadir)/help/$(docname)/$(lang) + + # ********** You should not have to edit below this line ********** + xml_files = $(entities) $(docname).xml diff --git a/deskutils/gnome-utils/files/patch-configure b/deskutils/gnome-utils/files/patch-configure new file mode 100644 index 000000000..d5d7d0e10 --- /dev/null +++ b/deskutils/gnome-utils/files/patch-configure @@ -0,0 +1,11 @@ +--- configure.orig Mon Nov 25 09:25:29 2002 ++++ configure Tue Nov 26 16:04:42 2002 +@@ -10347,7 +10347,7 @@ + + + cat >>confdefs.h <<_ACEOF +-#define GNOME_ICONDIR "${prefix}/share/pixmaps" ++#define GNOME_ICONDIR "${datadir}/pixmaps" + _ACEOF + + diff --git a/deskutils/gnome-utils/files/patch-gnome-screenshot_screenshot-save.c b/deskutils/gnome-utils/files/patch-gnome-screenshot_screenshot-save.c new file mode 100644 index 000000000..0cc89594e --- /dev/null +++ b/deskutils/gnome-utils/files/patch-gnome-screenshot_screenshot-save.c @@ -0,0 +1,29 @@ +--- gnome-screenshot/screenshot-save.c.orig Mon Nov 1 15:56:19 2004 ++++ gnome-screenshot/screenshot-save.c Fri Dec 17 23:11:51 2004 +@@ -94,16 +94,20 @@ + gchar *message = NULL; + gchar *error_message = NULL; + GtkWidget *dialog; ++ GIOStatus status; + +- g_io_channel_read_line (source, &error_message, NULL, NULL, NULL); +- message = g_strdup_printf ("Unable to save the screenshot to disk:\n\n%s", error_message); +- dialog = gtk_message_dialog_new (NULL, 0, ++ status = g_io_channel_read_line (source, &error_message, NULL, NULL, NULL); ++ if (status == G_IO_STATUS_NORMAL) ++ { ++ message = g_strdup_printf ("Unable to save the screenshot to disk:\n\n%s", error_message); ++ dialog = gtk_message_dialog_new (NULL, 0, + GTK_MESSAGE_ERROR, + GTK_BUTTONS_OK, + message); +- gtk_dialog_run (GTK_DIALOG (dialog)); +- gtk_widget_destroy (dialog); +- exit (1); ++ gtk_dialog_run (GTK_DIALOG (dialog)); ++ gtk_widget_destroy (dialog); ++ exit (1); ++ } + } + + (*save_callback) (save_user_data); diff --git a/deskutils/gnome-utils/files/patch-gsearchtool_gsearchtool-support.c b/deskutils/gnome-utils/files/patch-gsearchtool_gsearchtool-support.c new file mode 100644 index 000000000..03a974c23 --- /dev/null +++ b/deskutils/gnome-utils/files/patch-gsearchtool_gsearchtool-support.c @@ -0,0 +1,10 @@ +--- gsearchtool/gsearchtool-support.c.orig Thu Dec 23 19:13:28 2004 ++++ gsearchtool/gsearchtool-support.c Thu Dec 23 19:13:38 2004 +@@ -30,6 +30,7 @@ + #endif + + #include ++#include + #include + #include + #include diff --git a/deskutils/gnome-utils/files/patch-logview_desc_db.c b/deskutils/gnome-utils/files/patch-logview_desc_db.c new file mode 100644 index 000000000..5b687f492 --- /dev/null +++ b/deskutils/gnome-utils/files/patch-logview_desc_db.c @@ -0,0 +1,10 @@ +--- logview/desc_db.c.orig Wed Dec 1 16:45:13 2004 ++++ logview/desc_db.c Wed Dec 1 16:45:25 2004 +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + #include + #include "logview.h" + #include "desc_db.h" diff --git a/deskutils/gnome-utils/files/patch-logview_logview.c b/deskutils/gnome-utils/files/patch-logview_logview.c new file mode 100644 index 000000000..4ac243d34 --- /dev/null +++ b/deskutils/gnome-utils/files/patch-logview_logview.c @@ -0,0 +1,29 @@ +--- logview/logview.c.orig Tue Nov 30 00:29:01 2004 ++++ logview/logview.c Tue Nov 30 00:30:44 2004 +@@ -656,7 +656,7 @@ + + if ( ! found) { + g_snprintf (full_name, sizeof (full_name), +- "%s/share/gnome-system-log/gnome-system-log-regexp.db", LOGVIEWINSTALLPREFIX); ++ "%s/gnome-system-log/gnome-system-log-regexp.db", LOGVIEWINSTALLPREFIX); + if (access (full_name, R_OK) == 0) { + found = TRUE; + g_free (cfg->regexp_db_path); +@@ -678,7 +678,7 @@ + + if ( ! found) { + g_snprintf (full_name, sizeof (full_name), +- "%s/share/gnome-system-log/gnome-system-log-descript.db", LOGVIEWINSTALLPREFIX); ++ "%s/gnome-system-log/gnome-system-log-descript.db", LOGVIEWINSTALLPREFIX); + if (access (full_name, R_OK) == 0) { + found = TRUE; + g_free (cfg->descript_db_path); +@@ -709,7 +709,7 @@ + + if ( ! found) { + g_snprintf (full_name, sizeof (full_name), +- "%s/share/gnome-system-log/gnome-system-log-actions.db", LOGVIEWINSTALLPREFIX); ++ "%s/gnome-system-log/gnome-system-log-actions.db", LOGVIEWINSTALLPREFIX); + if (access (full_name, R_OK) == 0) { + found = TRUE; + g_free (cfg->action_db_path); -- cgit v1.2.3