| 1 |
pacho 11/04/03 11:37:27 |
| 2 |
|
| 3 |
Added: gnome-disk-utility-2.32.1-optional-avahi.patch |
| 4 |
gnome-disk-utility-2.32.1-non-utf8-crash.patch |
| 5 |
Removed: gnome-disk-utility-2.28.1-fix-potfiles_skip.patch |
| 6 |
Log: |
| 7 |
Revision bump to fix optional avahi patch (bug #361183 by Fab) and apply Mandriva patch (also used in Arch) to prevent major problems like freezes and crashes on systems without UTF8 locale (upstream bug #616198). Remove old. |
| 8 |
|
| 9 |
(Portage version: 2.1.9.45/cvs/Linux x86_64) |
| 10 |
|
| 11 |
Revision Changes Path |
| 12 |
1.1 sys-apps/gnome-disk-utility/files/gnome-disk-utility-2.32.1-optional-avahi.patch |
| 13 |
|
| 14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/gnome-disk-utility/files/gnome-disk-utility-2.32.1-optional-avahi.patch?rev=1.1&view=markup |
| 15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/gnome-disk-utility/files/gnome-disk-utility-2.32.1-optional-avahi.patch?rev=1.1&content-type=text/plain |
| 16 |
|
| 17 |
Index: gnome-disk-utility-2.32.1-optional-avahi.patch |
| 18 |
=================================================================== |
| 19 |
From 674d9284bd09a9378f99ff19b2d2ffb8032ce8ea Mon Sep 17 00:00:00 2001 |
| 20 |
From: Nirbheek Chauhan <nirbheek.chauhan@×××××.com> |
| 21 |
Date: Tue, 16 Mar 2010 10:58:55 +0530 |
| 22 |
Subject: [PATCH] Make avahi support build-time configureable |
| 23 |
|
| 24 |
--- |
| 25 |
configure.ac | 21 ++++++++++++++++++++- |
| 26 |
src/gdu-gtk/gdu-connect-to-server-dialog.c | 7 +++++++ |
| 27 |
2 files changed, 27 insertions(+), 1 deletions(-) |
| 28 |
|
| 29 |
diff --git a/configure.ac b/configure.ac |
| 30 |
index 01be5f0..95f2087 100644 |
| 31 |
--- a/configure.ac |
| 32 |
+++ b/configure.ac |
| 33 |
@@ -150,7 +150,26 @@ PKG_CHECK_MODULES(LIBNOTIFY, [libnotify >= $LIBNOTIFY_REQUIRED]) |
| 34 |
PKG_CHECK_MODULES(UDISKS, [udisks >= $UDISKS_REQUIRED udisks < $UDISKS_NEXT_ABI_INCOMPATIBLE_VERSION]) |
| 35 |
PKG_CHECK_MODULES(X11, [x11]) |
| 36 |
PKG_CHECK_MODULES(LIBATASMART, [libatasmart >= 0.14]) |
| 37 |
-PKG_CHECK_MODULES(AVAHI_UI, [avahi-ui >= $AVAHI_UI_REQUIRED]) |
| 38 |
+ |
| 39 |
+# ************* |
| 40 |
+# Avahi |
| 41 |
+# ************* |
| 42 |
+ |
| 43 |
+have_avahi_ui=no |
| 44 |
+AC_ARG_ENABLE(avahi-ui, AS_HELP_STRING([--disable-avahi-ui], [disable use of Avahi for server searching])) |
| 45 |
+ |
| 46 |
+if test "x$enable_avahi_ui" != "xno"; then |
| 47 |
+ PKG_CHECK_MODULES(AVAHI_UI, avahi-ui >= $AVAHI_UI_REQUIRED, |
| 48 |
+ [AC_DEFINE(HAVE_AVAHI_UI, 1, [Define if avahi-ui is available]) |
| 49 |
+ have_avahi_ui=yes], have_avahi_ui=no) |
| 50 |
+ if test "x$have_avahi_ui" = xno -a "x$enable_avahi_ui" = xyes; then |
| 51 |
+ AC_MSG_ERROR([avahi-ui support requested but libraries not found]) |
| 52 |
+ fi |
| 53 |
+fi |
| 54 |
+ |
| 55 |
+AC_SUBST(AVAHI_UI_LIBS) |
| 56 |
+AC_SUBST(AVAHI_UI_CFLAGS) |
| 57 |
+AM_CONDITIONAL(ENABLE_AVAHI_UI, [test "$have_avahi_ui" = "yes"]) |
| 58 |
|
| 59 |
# ************* |
| 60 |
# Remote Access |
| 61 |
diff --git a/src/gdu-gtk/gdu-connect-to-server-dialog.c b/src/gdu-gtk/gdu-connect-to-server-dialog.c |
| 62 |
index 9ecf08c..5ad47bb 100644 |
| 63 |
--- a/src/gdu-gtk/gdu-connect-to-server-dialog.c |
| 64 |
+++ b/src/gdu-gtk/gdu-connect-to-server-dialog.c |
| 65 |
@@ -24,7 +24,10 @@ |
| 66 |
|
| 67 |
#include "config.h" |
| 68 |
#include <glib/gi18n-lib.h> |
| 69 |
+ |
| 70 |
+#ifdef HAVE_AVAHI_UI |
| 71 |
#include <avahi-ui/avahi-ui.h> |
| 72 |
+#endif |
| 73 |
|
| 74 |
#include "gdu-connect-to-server-dialog.h" |
| 75 |
|
| 76 |
@@ -143,6 +146,7 @@ gdu_connect_to_server_dialog_get_address (GduConnectToServerDialog *dialog) |
| 77 |
|
| 78 |
/* ---------------------------------------------------------------------------------------------------- */ |
| 79 |
|
| 80 |
+#ifdef HAVE_AVAHI_UI |
| 81 |
static void |
| 82 |
on_dns_sd_clicked (GtkButton *button, |
| 83 |
gpointer user_data) |
| 84 |
@@ -171,6 +175,7 @@ on_dns_sd_clicked (GtkButton *button, |
| 85 |
|
| 86 |
gtk_widget_destroy (service_dialog); |
| 87 |
} |
| 88 |
+#endif |
| 89 |
|
| 90 |
/* ---------------------------------------------------------------------------------------------------- */ |
| 91 |
|
| 92 |
@@ -218,6 +223,7 @@ gdu_connect_to_server_dialog_constructed (GObject *object) |
| 93 |
GTK_STOCK_CONNECT, |
| 94 |
GTK_RESPONSE_OK); |
| 95 |
|
| 96 |
+#ifdef HAVE_AVAHI_UI |
| 97 |
button = gtk_button_new_with_mnemonic (_("_Browse...")); |
| 98 |
image = gtk_image_new_from_stock (GTK_STOCK_NETWORK, GTK_ICON_SIZE_BUTTON); |
| 99 |
gtk_button_set_image (GTK_BUTTON (button), image); |
| 100 |
@@ -235,6 +241,7 @@ gdu_connect_to_server_dialog_constructed (GObject *object) |
| 101 |
"clicked", |
| 102 |
G_CALLBACK (on_dns_sd_clicked), |
| 103 |
dialog); |
| 104 |
+#endif |
| 105 |
|
| 106 |
content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); |
| 107 |
|
| 108 |
-- |
| 109 |
1.6.4.4 |
| 110 |
|
| 111 |
|
| 112 |
|
| 113 |
|
| 114 |
1.1 sys-apps/gnome-disk-utility/files/gnome-disk-utility-2.32.1-non-utf8-crash.patch |
| 115 |
|
| 116 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/gnome-disk-utility/files/gnome-disk-utility-2.32.1-non-utf8-crash.patch?rev=1.1&view=markup |
| 117 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/gnome-disk-utility/files/gnome-disk-utility-2.32.1-non-utf8-crash.patch?rev=1.1&content-type=text/plain |
| 118 |
|
| 119 |
Index: gnome-disk-utility-2.32.1-non-utf8-crash.patch |
| 120 |
=================================================================== |
| 121 |
From 82489b51443e1280dfb9fb251ea2693df1809aec Mon Sep 17 00:00:00 2001 |
| 122 |
From: Pascal Terjan <pterjan@××××××××.com> |
| 123 |
Date: Mon, 3 May 2010 14:01:22 +0200 |
| 124 |
Subject: [PATCH] Force GduPresentable ids to be UTF-8 (#616198) |
| 125 |
|
| 126 |
GduPresentable created in gdu pool include intheir id some strings |
| 127 |
in local encoding like _("Peripheral Devices"). This patch |
| 128 |
enforces them to be UTF-8. |
| 129 |
|
| 130 |
This fixes a crash of gvfs-gdu-volume-monitor when USB devices are |
| 131 |
available on a non UTF-8 system. |
| 132 |
--- |
| 133 |
src/gdu/gdu-pool.c | 3 +++ |
| 134 |
1 files changed, 3 insertions(+), 0 deletions(-) |
| 135 |
|
| 136 |
diff --git a/src/gdu/gdu-pool.c b/src/gdu/gdu-pool.c |
| 137 |
index bd5eccf..cf6be53 100644 |
| 138 |
--- a/src/gdu/gdu-pool.c |
| 139 |
+++ b/src/gdu/gdu-pool.c |
| 140 |
@@ -473,6 +473,9 @@ gdu_pool_class_init (GduPoolClass *klass) |
| 141 |
g_cclosure_marshal_VOID__OBJECT, |
| 142 |
G_TYPE_NONE, 1, |
| 143 |
GDU_TYPE_PRESENTABLE); |
| 144 |
+#ifdef HAVE_BIND_TEXTDOMAIN_CODESET |
| 145 |
+ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); |
| 146 |
+#endif |
| 147 |
} |
| 148 |
|
| 149 |
static void |
| 150 |
-- |
| 151 |
1.7.1 |
Archives