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

Split the sharing schema so that we don't install the bluetooth keys

Browse Source 
which we don't support.
This commit is contained in:
ajacoutot 2013-04-10 09:40:02 +00:00
parent 1767b62d53
commit f8627731c2
6 changed files with 143 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.2 2013/04/08 09:05:42 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.3 2013/04/10 09:40:02 ajacoutot Exp $
SHARED_ONLY= Yes
@ -6,7 +6,7 @@ COMMENT= personal file-sharing service for GNOME
GNOME_PROJECT= gnome-user-share
GNOME_VERSION= 3.8.0
REVISION= 0
REVISION= 1
CATEGORIES= www sysutils
@ -44,10 +44,20 @@ CONFIGURE_ARGS= --disable-static \
--with-httpd=${LOCALBASE}/sbin/httpd2 \
--with-modules-path=${LOCALBASE}/lib/apache2
### https://bugzilla.gnome.org/show_bug.cgi?id=697537
AUTOCONF_VERSION= 2.69
CONFIGURE_STYLE= autoconf
AUTOMAKE_VERSION= 1.13
BUILD_DEPENDS += ${MODGNU_AUTOCONF_DEPENDS} \
${MODGNU_AUTOMAKE_DEPENDS} \
devel/libtool
pre-configure:
cd ${WRKSRC} && \
AUTOCONF_VERSION=${AUTOCONF_VERSION} \
AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
autoreconf -i
###
perl -pi -e 's,/usr/share,${TRUEPREFIX}/share,g' \
${WRKSRC}/data/dav_user_2.*.conf

19
x11/gnome/user-share/patches/patch-configure_ac
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-configure_ac,v 1.1 2013/04/08 09:05:42 ajacoutot Exp $
$OpenBSD: patch-configure_ac,v 1.2 2013/04/10 09:40:02 ajacoutot Exp $
https://bugzilla.gnome.org/show_bug.cgi?id=697537
--- configure.ac.orig Mon Mar 25 12:33:35 2013
+++ configure.ac Mon Apr 8 10:45:42 2013
+++ configure.ac Wed Apr 10 10:20:02 2013
@@ -54,7 +54,7 @@ fi
AC_SUBST(HTTPD)
@ -13,7 +13,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=697537
AC_SUBST(USER_SHARE_CFLAGS)
AC_SUBST(USER_SHARE_LIBS)
@@ -116,6 +116,25 @@ MODULES_PATH=$with_modules_path
@@ -116,6 +116,24 @@ MODULES_PATH=$with_modules_path
AC_SUBST(MODULES_PATH)
dnl===========================================================================
@ -32,14 +32,13 @@ https://bugzilla.gnome.org/show_bug.cgi?id=697537
+if test "x$have_bluetooth" = xyes ; then
+ AC_DEFINE(HAVE_BLUETOOTH, 1, [Define to 1 if bluetooth support is available])
+fi
+
+dnl ==========================================================================
+AM_CONDITIONAL(HAVE_BLUETOOTH, [test x"$have_bluetooth" = x"yes"])
+
+dnl===========================================================================
dnl Check for nautilus for the share bar
AC_ARG_WITH(nautilusdir,
@@ -124,7 +143,7 @@ AC_ARG_WITH(nautilusdir,
@@ -124,7 +142,7 @@ AC_ARG_WITH(nautilusdir,
[ac_with_nautilusdir=""])
PKG_CHECK_MODULES(EXTENSION,
@ -48,3 +47,11 @@ https://bugzilla.gnome.org/show_bug.cgi?id=697537
if test "${ac_with_nautilusdir}" = ""; then
ac_with_nautilusdir=`pkg-config --variable=extensiondir libnautilus-extension`
fi
@@ -186,6 +204,7 @@ data/icons/32x32/Makefile
data/icons/48x48/Makefile
data/gnome-user-share.desktop.in
data/org.gnome.desktop.file-sharing.gschema.xml.in
+data/org.gnome.desktop.file-sharing-bluetooth.gschema.xml.in
po/Makefile.in
src/Makefile
help/Makefile

17
x11/gnome/user-share/patches/patch-data_Makefile_am Normal file
View File

@ -0,0 +1,17 @@
$OpenBSD: patch-data_Makefile_am,v 1.1 2013/04/10 09:40:02 ajacoutot Exp $
https://bugzilla.gnome.org/show_bug.cgi?id=697537
--- data/Makefile.am.orig Mon Mar 4 15:45:32 2013
+++ data/Makefile.am Wed Apr 10 10:09:55 2013
@@ -14,6 +14,10 @@ gsettings_DATA = $(gsettings_in_files:.xml.in=.xml)
@INTLTOOL_XML_NOMERGE_RULE@
@GSETTINGS_RULES@
+if HAVE_BLUETOOTH
+gsettings_in_files += org.gnome.desktop.file-sharing-bluetooth.gschema.xml.in
+endif
+
convertdir = $(datadir)/GConf/gsettings
convert_DATA = gnome-user-share.convert

47
x11/gnome/user-share/patches/patch-data_org_gnome_desktop_file-sharing-bluetooth_gschema_xml_in_in Normal file
View File

@ -0,0 +1,47 @@
$OpenBSD: patch-data_org_gnome_desktop_file-sharing-bluetooth_gschema_xml_in_in,v 1.1 2013/04/10 09:40:02 ajacoutot Exp $
https://bugzilla.gnome.org/show_bug.cgi?id=697537
--- data/org.gnome.desktop.file-sharing-bluetooth.gschema.xml.in.in.orig Wed Apr 10 10:04:18 2013
+++ data/org.gnome.desktop.file-sharing-bluetooth.gschema.xml.in.in Wed Apr 10 10:04:18 2013
@@ -0,0 +1,40 @@
+<schemalist>
+<schema gettext-domain="gnome-user-share" id="org.gnome.desktop.file-sharing-bluetooth" path="/org/gnome/desktop/file-sharing/">
+ <key name="bluetooth-enabled" type="b">
+ <default>false</default>
+ <_summary>Share Public directory over Bluetooth</_summary>
+ <_description>If this is true, the Public directory in the users home directory will be shared over Bluetooth when the user is logged in.</_description>
+ </key>
+
+ <key name="bluetooth-allow-write" type="b">
+ <default>false</default>
+ <_summary>Whether to allow Bluetooth clients to write files.</_summary>
+ <_description>Whether to allow Bluetooth clients to write files, or share the files read-only.</_description>
+ </key>
+
+ <key name="bluetooth-require-pairing" type="b">
+ <default>true</default>
+ <_summary>Whether Bluetooth clients need to pair with the computer to send files.</_summary>
+ <_description>Whether Bluetooth clients need to pair with the computer to send files.</_description>
+ </key>
+
+ <key name="bluetooth-obexpush-enabled" type="b">
+ <default>false</default>
+ <_summary>Whether Bluetooth clients can send files using ObexPush.</_summary>
+ <_description>If this is true, Bluetooth devices can send files to the user's Downloads directory when logged in.</_description>
+ </key>
+
+ <key name="bluetooth-accept-files" type="s">
+ <default>'bonded'</default>
+ <_summary>When to accept files sent over Bluetooth</_summary>
+ <_description>When to accept files sent over Bluetooth. Possible values are "always", "bonded" and "ask".</_description>
+ </key>
+
+ <key name="bluetooth-notify" type="b">
+ <default>false</default>
+ <_summary>Whether to notify about newly received files.</_summary>
+ <_description>Whether to notify about newly received files.</_description>
+ </key>
+</schema>
+</schemalist>
+

49
x11/gnome/user-share/patches/patch-data_org_gnome_desktop_file-sharing_gschema_xml_in_in Normal file
View File

@ -0,0 +1,49 @@
$OpenBSD: patch-data_org_gnome_desktop_file-sharing_gschema_xml_in_in,v 1.1 2013/04/10 09:40:02 ajacoutot Exp $
https://bugzilla.gnome.org/show_bug.cgi?id=697537
--- data/org.gnome.desktop.file-sharing.gschema.xml.in.in.orig Wed Apr 10 09:44:17 2013
+++ data/org.gnome.desktop.file-sharing.gschema.xml.in.in Wed Apr 10 09:44:38 2013
@@ -11,42 +11,6 @@
<_summary>When to require passwords</_summary>
<_description>When to ask for passwords. Possible values are "never", "on_write", and "always".</_description>
</key>
-
- <key name="bluetooth-enabled" type="b">
- <default>false</default>
- <_summary>Share Public directory over Bluetooth</_summary>
- <_description>If this is true, the Public directory in the users home directory will be shared over Bluetooth when the user is logged in.</_description>
- </key>
-
- <key name="bluetooth-allow-write" type="b">
- <default>false</default>
- <_summary>Whether to allow Bluetooth clients to write files.</_summary>
- <_description>Whether to allow Bluetooth clients to write files, or share the files read-only.</_description>
- </key>
-
- <key name="bluetooth-require-pairing" type="b">
- <default>true</default>
- <_summary>Whether Bluetooth clients need to pair with the computer to send files.</_summary>
- <_description>Whether Bluetooth clients need to pair with the computer to send files.</_description>
- </key>
-
- <key name="bluetooth-obexpush-enabled" type="b">
- <default>false</default>
- <_summary>Whether Bluetooth clients can send files using ObexPush.</_summary>
- <_description>If this is true, Bluetooth devices can send files to the user's Downloads directory when logged in.</_description>
- </key>
-
- <key name="bluetooth-accept-files" type="s">
- <default>'bonded'</default>
- <_summary>When to accept files sent over Bluetooth</_summary>
- <_description>When to accept files sent over Bluetooth. Possible values are "always", "bonded" and "ask".</_description>
- </key>
-
- <key name="bluetooth-notify" type="b">
- <default>false</default>
- <_summary>Whether to notify about newly received files.</_summary>
- <_description>Whether to notify about newly received files.</_description>
- </key>
</schema>
</schemalist>

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

@ -1,9 +1,9 @@
$OpenBSD: patch-src_user_share_c,v 1.2 2013/04/08 09:05:42 ajacoutot Exp $
$OpenBSD: patch-src_user_share_c,v 1.3 2013/04/10 09:40:02 ajacoutot Exp $
https://bugzilla.gnome.org/show_bug.cgi?id=697537
--- src/user_share.c.orig Thu Feb 21 09:18:06 2013
+++ src/user_share.c Mon Apr 8 10:21:15 2013
+++ src/user_share.c Mon Apr 8 11:57:10 2013
@@ -27,7 +27,9 @@
#include <gtk/gtk.h>
#include <glib/gi18n.h>
@ -24,23 +24,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=697537
static gboolean bluetoothd_enabled = FALSE;
#define OBEX_ENABLED (bluetoothd_enabled && has_console)
@@ -67,6 +71,7 @@ static gboolean bluetoothd_enabled = FALSE;
static void
obex_services_start (void)
{
+#ifdef HAVE_BLUETOOTH
if (bluetoothd_enabled == FALSE ||
has_console == FALSE)
return;
@@ -77,6 +82,7 @@ obex_services_start (void)
if (g_settings_get_boolean (settings, FILE_SHARING_BLUETOOTH_ENABLED) == TRUE) {
obexftp_up ();
}
+#endif
}
static void
@@ -153,6 +159,7 @@ default_adapter_changed (GObject *gobject,
@@ -153,6 +157,7 @@ default_adapter_changed (GObject *gobject,
GParamSpec *pspec,
gpointer user_data)
{
@ -48,7 +32,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=697537
char *adapter;
gboolean adapter_powered;
@@ -173,17 +180,20 @@ default_adapter_changed (GObject *gobject,
@@ -173,17 +178,20 @@ default_adapter_changed (GObject *gobject,
else
obex_services_shutdown ();
}
@ -68,34 +52,4 @@ https://bugzilla.gnome.org/show_bug.cgi?id=697537
+#endif
}
static void
@@ -267,6 +277,7 @@ file_sharing_bluetooth_require_pairing_changed (void)
static void
file_sharing_bluetooth_enabled_changed (void)
{
+#ifdef HAVE_BLUETOOTH
if (g_settings_get_boolean (settings,
FILE_SHARING_BLUETOOTH_ENABLED) == FALSE) {
obexftp_down ();
@@ -277,11 +288,13 @@ file_sharing_bluetooth_enabled_changed (void)
} else if (OBEX_ENABLED) {
obexftp_up ();
}
+#endif
}
static void
file_sharing_bluetooth_obexpush_enabled_changed (void)
{
+#ifdef HAVE_BLUETOOTH
if (g_settings_get_boolean (settings,
FILE_SHARING_BLUETOOTH_OBEXPUSH_ENABLED) == FALSE) {
obexpush_down ();
@@ -292,6 +305,7 @@ file_sharing_bluetooth_obexpush_enabled_changed (void)
} else if (OBEX_ENABLED) {
obexpush_up ();
}
+#endif
}
static void