cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to gnome-user-share-3.8.3.

Browse Source
This commit is contained in:
ajacoutot 2013-07-16 06:39:42 +00:00
parent a70d4e364a
commit d940830f3a
5 changed files with 29 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
x11/gnome/user-share/Makefile
View File

@ -1,12 +1,11 @@
# $OpenBSD: Makefile,v 1.8 2013/05/31 15:35:11 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.9 2013/07/16 06:39:42 ajacoutot Exp $
SHARED_ONLY= Yes
COMMENT= personal file-sharing service for GNOME
GNOME_PROJECT= gnome-user-share
GNOME_VERSION= 3.8.0
REVISION= 6
GNOME_VERSION= 3.8.3
CATEGORIES= www sysutils
@ -18,10 +17,10 @@ WANTLIB += Xinerama Xrandr Xrender atk-1.0 atk-bridge-2.0 atspi
WANTLIB += c cairo cairo-gobject canberra canberra-gtk3 dbus-1
WANTLIB += dbus-glib-1 expat ffi fontconfig freetype gdk-3 gdk_pixbuf-2.0
WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 graphite2
WANTLIB += gthread-2.0 gtk-3 harfbuzz ltdl
WANTLIB += m nautilus-extension notify ogg pango-1.0 pangocairo-1.0
WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread pthread-stubs
WANTLIB += vorbis vorbisfile xcb xcb-render xcb-shm z
WANTLIB += gthread-2.0 gtk-3 harfbuzz ltdl m nautilus-extension
WANTLIB += notify ogg pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre
WANTLIB += pixman-1 png pthread pthread-stubs vorbis vorbisfile
WANTLIB += xcb xcb-render xcb-shm z
MODULES= devel/dconf \
devel/gettext \

4
x11/gnome/user-share/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (gnome/gnome-user-share-3.8.0.tar.xz) = rgY4okzzBrZhVjmocGybSOiWGuJtf4tdZesmlVykzD8=
SIZE (gnome/gnome-user-share-3.8.0.tar.xz) = 1082796
SHA256 (gnome/gnome-user-share-3.8.3.tar.xz) = 5vNur2b6+tL27JWbossUO2D/AOualKZbGBQRs2byom8=
SIZE (gnome/gnome-user-share-3.8.3.tar.xz) = 1086060

18
x11/gnome/user-share/patches/patch-src_http_c
View File

@ -1,18 +0,0 @@
$OpenBSD: patch-src_http_c,v 1.1.1.1 2013/04/06 08:18:31 ajacoutot Exp $
From 4f946c9f4699ece54f290fab22bb0f965bf2c47f Mon Sep 17 00:00:00 2001
From: Antoine Jacoutot <ajacoutot@gnome.org>
Date: Sat, 06 Apr 2013 08:12:53 +0000
Subject: OpenBSD suffers from the same httpd race condition as the other BSDs.
--- src/http.c.orig Fri Apr 5 18:06:22 2013
+++ src/http.c Fri Apr 5 18:07:57 2013
@@ -84,7 +84,7 @@ get_port (void)
return -1;
}
-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__)
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__) || defined(__OpenBSD__)
/* XXX This exposes a potential race condition, but without this,
* httpd will not start on the above listed platforms due to the fact
* that SO_REUSEADDR is also needed when Apache binds to the listening

32
x11/gnome/user-share/patches/patch-src_user_share_c
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-src_user_share_c,v 1.6 2013/05/07 10:48:24 ajacoutot Exp $
$OpenBSD: patch-src_user_share_c,v 1.7 2013/07/16 06:39:42 ajacoutot Exp $
https://bugzilla.gnome.org/show_bug.cgi?id=601890
--- src/user_share.c.orig Thu Feb 21 09:18:06 2013
+++ src/user_share.c Tue May 7 12:34:38 2013
--- src/user_share.c.orig Mon Jul 15 15:59:28 2013
+++ src/user_share.c Tue Jul 16 08:21:22 2013
@@ -27,7 +27,6 @@
#include <gtk/gtk.h>
#include <glib/gi18n.h>
@ -12,24 +12,20 @@ https://bugzilla.gnome.org/show_bug.cgi?id=601890
#include <gio/gio.h>
#include <X11/Xlib.h>
@@ -35,11 +34,16 @@
@@ -35,8 +34,12 @@
#include "user_share-private.h"
#include "user_share-common.h"
#include "http.h"
+
+#ifdef HAVE_BLUETOOTH
+#include <bluetooth-client.h>
+
#include "obexftp.h"
#include "obexpush.h"
#include <dbus/dbus.h>
#include <dbus/dbus-glib.h>
+#endif /* HAVE_BLUETOOTH */
#include <stdarg.h>
#include <string.h>
@@ -56,6 +60,8 @@
@@ -53,6 +56,8 @@
static GSettings *settings = NULL;
static guint disabled_timeout_tag = 0;
@ -38,7 +34,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=601890
static GDBusProxy *session_proxy = NULL;
static gboolean has_console = TRUE;
@@ -185,6 +191,7 @@ bluez_init (void)
@@ -182,6 +187,7 @@ bluez_init (void)
g_signal_connect (G_OBJECT (client), "notify::default-adapter-powered",
G_CALLBACK (default_adapter_changed), NULL);
}
@ -46,7 +42,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=601890
static void
migrate_old_configuration (void)
@@ -216,9 +223,13 @@ disabled_timeout_callback (void)
@@ -213,9 +219,13 @@ disabled_timeout_callback (void)
{
http_down ();
@ -60,7 +56,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=601890
return FALSE;
}
@@ -246,6 +257,7 @@ file_sharing_enabled_changed (void)
@@ -243,6 +253,7 @@ file_sharing_enabled_changed (void)
}
}
@ -68,7 +64,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=601890
static void
file_sharing_bluetooth_allow_write_changed (void)
{
@@ -312,6 +324,7 @@ file_sharing_bluetooth_obexpush_notify_changed (void)
@@ -309,6 +320,7 @@ file_sharing_bluetooth_obexpush_notify_changed (void)
{
obexpush_set_notify (g_settings_get_boolean (settings, FILE_SHARING_BLUETOOTH_OBEXPUSH_NOTIFY));
}
@ -76,7 +72,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=601890
static void
setttings_changed (GSettings *settings,
@@ -324,6 +337,7 @@ setttings_changed (GSettings *settings,
@@ -321,6 +333,7 @@ setttings_changed (GSettings *settings,
else if (g_strcmp0 (FILE_SHARING_REQUIRE_PASSWORD, path) == 0)
require_password_changed ();
@ -84,7 +80,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=601890
else if (g_strcmp0 (FILE_SHARING_BLUETOOTH_ENABLED, path) == 0)
file_sharing_bluetooth_enabled_changed ();
@@ -341,14 +355,17 @@ setttings_changed (GSettings *settings,
@@ -338,14 +351,17 @@ setttings_changed (GSettings *settings,
else if (g_strcmp0 (FILE_SHARING_BLUETOOTH_OBEXPUSH_NOTIFY, path) == 0)
file_sharing_bluetooth_obexpush_notify_changed ();
@ -102,7 +98,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=601890
_exit (2);
}
@@ -356,7 +373,9 @@ static int
@@ -353,7 +369,9 @@ static int
x_io_error_handler (Display *xdisplay)
{
http_down ();
@ -112,7 +108,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=601890
_exit (2);
}
@@ -411,10 +430,14 @@ main (int argc, char **argv)
@@ -408,10 +426,14 @@ main (int argc, char **argv)
migrate_old_configuration ();
@ -127,7 +123,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=601890
return 1;
x_fd = ConnectionNumber (xdisplay);
@@ -422,22 +445,28 @@ main (int argc, char **argv)
@@ -419,22 +441,28 @@ main (int argc, char **argv)
if (http_init () == FALSE)
return 1;

10
x11/gnome/user-share/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2013/04/06 08:18:31 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.2 2013/07/16 06:39:42 ajacoutot Exp $
lib/nautilus/extensions-3.0/libnautilus-share-extension.so
@bin libexec/gnome-user-share
share/GConf/gsettings/gnome-user-share.convert
@ -7,8 +7,12 @@ share/examples/gnome-user-share/xdg/
@sample ${SYSCONFDIR}/xdg/
share/examples/gnome-user-share/xdg/autostart/
@sample ${SYSCONFDIR}/xdg/autostart/
share/examples/gnome-user-share/xdg/autostart/gnome-user-share.desktop
@sample ${SYSCONFDIR}/xdg/autostart/gnome-user-share.desktop
share/examples/gnome-user-share/xdg/autostart/gnome-user-share-obexftp.desktop
@sample ${SYSCONFDIR}/xdg/autostart/gnome-user-share-obexftp.desktop
share/examples/gnome-user-share/xdg/autostart/gnome-user-share-obexpush.desktop
@sample ${SYSCONFDIR}/xdg/autostart/gnome-user-share-obexpush.desktop
share/examples/gnome-user-share/xdg/autostart/gnome-user-share-webdav.desktop
@sample ${SYSCONFDIR}/xdg/autostart/gnome-user-share-webdav.desktop
share/glib-2.0/schemas/org.gnome.desktop.file-sharing.gschema.xml
share/gnome-user-share/
share/gnome-user-share/dav_groupfile