diff options
Diffstat (limited to 'www/gnome-user-share/files')
-rw-r--r-- | www/gnome-user-share/files/patch-configure | 52 | ||||
-rw-r--r-- | www/gnome-user-share/files/patch-src_obexpush.c | 15 | ||||
-rw-r--r-- | www/gnome-user-share/files/patch-src_user_share.c | 48 |
3 files changed, 0 insertions, 115 deletions
diff --git a/www/gnome-user-share/files/patch-configure b/www/gnome-user-share/files/patch-configure deleted file mode 100644 index 7c2899da0..000000000 --- a/www/gnome-user-share/files/patch-configure +++ /dev/null @@ -1,52 +0,0 @@ ---- configure.orig 2010-09-28 10:42:29.000000000 +0000 -+++ configure 2010-09-28 10:43:25.000000000 +0000 -@@ -13411,12 +13411,12 @@ - pkg_cv_USER_SHARE_CFLAGS="$USER_SHARE_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk \$DBUS_MODULES gnome-bluetooth-1.0 >= 2.27.7.2\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES gnome-bluetooth-1.0 >= 2.27.7.2") 2>&5 -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk \$DBUS_MODULES\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then -- pkg_cv_USER_SHARE_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES gnome-bluetooth-1.0 >= 2.27.7.2" 2>/dev/null` -+ pkg_cv_USER_SHARE_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -13427,12 +13427,12 @@ - pkg_cv_USER_SHARE_LIBS="$USER_SHARE_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk \$DBUS_MODULES gnome-bluetooth-1.0 >= 2.27.7.2\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES gnome-bluetooth-1.0 >= 2.27.7.2") 2>&5 -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk \$DBUS_MODULES\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then -- pkg_cv_USER_SHARE_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES gnome-bluetooth-1.0 >= 2.27.7.2" 2>/dev/null` -+ pkg_cv_USER_SHARE_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -13452,14 +13452,14 @@ - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- USER_SHARE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES gnome-bluetooth-1.0 >= 2.27.7.2" 2>&1` -+ USER_SHARE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES" 2>&1` - else -- USER_SHARE_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES gnome-bluetooth-1.0 >= 2.27.7.2" 2>&1` -+ USER_SHARE_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$USER_SHARE_PKG_ERRORS" >&5 - -- as_fn_error $? "Package requirements (glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES gnome-bluetooth-1.0 >= 2.27.7.2) were not met: -+ as_fn_error $? "Package requirements (glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES) were not met: - - $USER_SHARE_PKG_ERRORS - diff --git a/www/gnome-user-share/files/patch-src_obexpush.c b/www/gnome-user-share/files/patch-src_obexpush.c deleted file mode 100644 index 7b71c8d8e..000000000 --- a/www/gnome-user-share/files/patch-src_obexpush.c +++ /dev/null @@ -1,15 +0,0 @@ ---- src/obexpush.c.orig 2011-03-07 20:11:04.000000000 +0100 -+++ src/obexpush.c 2011-03-07 20:11:34.000000000 +0100 -@@ -139,10 +139,9 @@ - /* Translators: %s is the name of the filename received */ - notification_text = g_strdup_printf(_("You received \"%s\" via Bluetooth"), display); - g_free (display); -- notification = notify_notification_new_with_status_icon (_("You received a file"), -+ notification = notify_notification_new (_("You received a file"), - notification_text, -- "dialog-information", -- GTK_STATUS_ICON (statusicon)); -+ "dialog-information"); - - notify_notification_set_timeout (notification, NOTIFY_EXPIRES_DEFAULT); - diff --git a/www/gnome-user-share/files/patch-src_user_share.c b/www/gnome-user-share/files/patch-src_user_share.c deleted file mode 100644 index 4305314fb..000000000 --- a/www/gnome-user-share/files/patch-src_user_share.c +++ /dev/null @@ -1,48 +0,0 @@ ---- src/user_share.c.orig 2009-09-26 09:10:16.000000000 -0400 -+++ src/user_share.c 2009-09-26 09:13:52.000000000 -0400 -@@ -26,7 +26,9 @@ - #include <gdk/gdkx.h> - #include <gtk/gtk.h> - #include <glib/gi18n.h> -+#ifndef __FreeBSD__ - #include <bluetooth-client.h> -+#endif - #include <X11/Xlib.h> - - #include "user_share.h" -@@ -58,7 +60,9 @@ - static guint disabled_timeout_tag = 0; - static gboolean has_console = TRUE; - -+#ifndef __FreeBSD__ - static BluetoothClient *client = NULL; -+#endif - static gboolean bluetoothd_enabled = FALSE; - - #define OBEX_ENABLED (bluetoothd_enabled && has_console) -@@ -224,6 +228,7 @@ consolekit_init (void) - dbus_g_connection_unref (dbus_connection); - } - -+#ifndef __FreeBSD__ - static void - default_adapter_changed (GObject *gobject, - GParamSpec *pspec, -@@ -261,6 +266,7 @@ bluez_init (void) - g_signal_connect (G_OBJECT (client), "notify::default-adapter-powered", - G_CALLBACK (default_adapter_changed), NULL); - } -+#endif - - char * - lookup_public_dir (void) -@@ -590,7 +596,9 @@ main (int argc, char **argv) - - g_object_unref (client); - -+#ifndef __FreeBSD__ - bluez_init (); -+#endif - consolekit_init (); - - /* Initial setting */ |