From 38b3ea79d83f3e163db26bce9c33e3e36a9985ca Mon Sep 17 00:00:00 2001 From: marcus Date: Sat, 26 Sep 2009 13:29:33 +0000 Subject: Update to 2.28.0, and hack out the mandatory bluetooth code. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@13037 df743ca5-7f9a-e211-a948-0013205c9059 --- www/gnome-user-share/files/patch-configure | 61 +++++++++++++++++++++++ www/gnome-user-share/files/patch-src_user_share.c | 48 ++++++++++++++++++ 2 files changed, 109 insertions(+) create mode 100644 www/gnome-user-share/files/patch-configure create mode 100644 www/gnome-user-share/files/patch-src_user_share.c (limited to 'www/gnome-user-share/files') diff --git a/www/gnome-user-share/files/patch-configure b/www/gnome-user-share/files/patch-configure new file mode 100644 index 000000000..8e9e0bd67 --- /dev/null +++ b/www/gnome-user-share/files/patch-configure @@ -0,0 +1,61 @@ +--- configure.orig 2009-09-26 09:08:14.000000000 -0400 ++++ configure 2009-09-26 09:09:08.000000000 -0400 +@@ -15208,12 +15208,12 @@ if test -n "$USER_SHARE_CFLAGS"; then + pkg_cv_USER_SHARE_CFLAGS="$USER_SHARE_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$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 \$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 $DBUS_MODULES gnome-bluetooth-1.0 >= 2.27.7.2") 2>&5 ++ { ($as_echo "$as_me:$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 \$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 $DBUS_MODULES") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; 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 $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 $DBUS_MODULES" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -15224,12 +15224,12 @@ if test -n "$USER_SHARE_LIBS"; then + pkg_cv_USER_SHARE_LIBS="$USER_SHARE_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$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 \$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 $DBUS_MODULES gnome-bluetooth-1.0 >= 2.27.7.2") 2>&5 ++ { ($as_echo "$as_me:$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 \$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 $DBUS_MODULES") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; 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 $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 $DBUS_MODULES" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -15247,14 +15247,14 @@ else + _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 $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 $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 $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 $DBUS_MODULES" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$USER_SHARE_PKG_ERRORS" >&5 + +- { { $as_echo "$as_me:$LINENO: 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 $DBUS_MODULES gnome-bluetooth-1.0 >= 2.27.7.2) were not met: ++ { { $as_echo "$as_me:$LINENO: 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 $DBUS_MODULES) were not met: + + $USER_SHARE_PKG_ERRORS + +@@ -15265,7 +15265,7 @@ Alternatively, you may set the environme + and USER_SHARE_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + " >&5 +-$as_echo "$as_me: 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 $DBUS_MODULES gnome-bluetooth-1.0 >= 2.27.7.2) were not met: ++$as_echo "$as_me: 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 $DBUS_MODULES) were not met: + + $USER_SHARE_PKG_ERRORS + diff --git a/www/gnome-user-share/files/patch-src_user_share.c b/www/gnome-user-share/files/patch-src_user_share.c new file mode 100644 index 000000000..4305314fb --- /dev/null +++ b/www/gnome-user-share/files/patch-src_user_share.c @@ -0,0 +1,48 @@ +--- 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 + #include + #include ++#ifndef __FreeBSD__ + #include ++#endif + #include + + #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 */ -- cgit v1.2.3