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

Update to gvfs-1.20.1.

Browse Source
This commit is contained in:
ajacoutot 2014-04-11 14:47:25 +00:00
parent 0f3b2e6321
commit 955f2f6065
5 changed files with 41 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
x11/gnome/gvfs/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.123 2014/04/02 09:36:13 jasper Exp $
# $OpenBSD: Makefile,v 1.124 2014/04/11 14:47:25 ajacoutot Exp $
SHARED_ONLY= Yes
@ -7,16 +7,12 @@ COMMENT-smb= GVFS mount module for samba
COMMENT-goa= GVFS volume monitor for gnome-online-account
GNOME_PROJECT= gvfs
GNOME_VERSION= 1.20.0
GNOME_VERSION= 1.20.1
PKGNAME-main= ${DISTNAME}
PKGNAME-smb= ${GNOME_PROJECT}-smb-${GNOME_VERSION}
PKGNAME-goa= ${GNOME_PROJECT}-goa-${GNOME_VERSION}
REVISION-main= 4
REVISION-smb= 3
REVISION-goa= 3
# LGPLv2
PERMIT_PACKAGE_CDROM= Yes
@ -45,7 +41,8 @@ WANTLIB-smb += gcrypt gpg-error secret-1
WANTLIB-goa += ${WANTLIB}
WANTLIB-goa += goa-1.0
MODGNOME_TOOLS += desktop-file-utils docbook
MODGNOME_TOOLS= desktop-file-utils docbook
LIB_DEPENDS-main= ${LIB_DEPENDS} \
archivers/libarchive \
devel/libsoup \
@ -91,10 +88,6 @@ CONFIGURE_ARGS += --disable-goa
# test_polkitd.py, gvfs-test
TEST_DEPENDS= devel/py-gobject3
# patch-common_gvfsmountinfo_c, patch-configure_ac
CONFIGURE_STYLE= autoconf
AUTOCONF_VERSION= 2.69
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/applications/
rm ${PREFIX}/lib/gio/modules/*.{a,la}

4
x11/gnome/gvfs/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (gnome/gvfs-1.20.0.tar.xz) = Uyp1/hBZUKTaRJ0GtP73P7LxfteV9zHbN4XIPjYOfkE=
SIZE (gnome/gvfs-1.20.0.tar.xz) = 1557888
SHA256 (gnome/gvfs-1.20.1.tar.xz) = c/axBM+T03byyPFk6nJ92BPxTKCqn1o6nY06GeNKWwo=
SIZE (gnome/gvfs-1.20.1.tar.xz) = 1558868

30
x11/gnome/gvfs/patches/patch-common_gvfsmountinfo_c
View File

@ -1,30 +0,0 @@
$OpenBSD: patch-common_gvfsmountinfo_c,v 1.1 2014/04/01 16:48:39 ajacoutot Exp $
From a77cdbac08ca1ff17aeba2323a610a61101387db Mon Sep 17 00:00:00 2001
From: Ondrej Holy <oholy@redhat.com>
Date: Thu, 20 Mar 2014 16:44:44 +0100
Subject: common: use nl_langinfo constants conditionally
--- common/gvfsmountinfo.c.orig Fri Mar 21 15:54:40 2014
+++ common/gvfsmountinfo.c Tue Apr 1 18:40:53 2014
@@ -429,15 +429,19 @@ GIcon *g_vfs_mount_info_query_xdg_volume_info_finish (
static const char *
get_iso_639_3_for_locale (void)
{
- const char *lang;
+ const char *lang = NULL;
+#ifdef HAVE_NL_ADDRESS_LANG_TERM
lang = nl_langinfo (_NL_ADDRESS_LANG_TERM);
if (lang == NULL || *lang == '\0')
{
+#ifdef HAVE_NL_ADDRESS_COUNTRY_AB3
lang = nl_langinfo (_NL_ADDRESS_COUNTRY_AB3);
if (lang == NULL || *lang == '\0')
+#endif
return NULL;
}
+#endif
return lang;
}

26
x11/gnome/gvfs/patches/patch-configure_ac
View File

@ -1,26 +0,0 @@
$OpenBSD: patch-configure_ac,v 1.9 2014/04/01 16:48:39 ajacoutot Exp $
From a77cdbac08ca1ff17aeba2323a610a61101387db Mon Sep 17 00:00:00 2001
From: Ondrej Holy <oholy@redhat.com>
Date: Thu, 20 Mar 2014 16:44:44 +0100
Subject: common: use nl_langinfo constants conditionally
--- configure.ac.orig Fri Mar 21 15:55:51 2014
+++ configure.ac Tue Apr 1 18:40:53 2014
@@ -735,6 +735,16 @@ if test "x$enable_afp" != "xno"; then
fi
AM_CONDITIONAL(USE_AFP, test "x$enable_afp" != "xno")
+dnl ***************************************
+dnl *** Check for nl_langinfo constants ***
+dnl ***************************************
+AC_CHECK_DECL(_NL_ADDRESS_LANG_TERM,
+ AC_DEFINE(HAVE_NL_ADDRESS_LANG_TERM, 1, Define to 1 if _NL_ADDRESS_LANG_TERM is declared),,
+ [#include <langinfo.h>])
+AC_CHECK_DECL(_NL_ADDRESS_COUNTRY_AB3,
+ AC_DEFINE(HAVE_NL_ADDRESS_COUNTRY_AB3, 1, Define to 1 if _NL_ADDRESS_COUNTRY_AB3 is declared),,
+ [#include <langinfo.h>])
+
dnl Install bash-completion file?
AC_ARG_ENABLE([bash-completion],
AS_HELP_STRING([--disable-bash-completion],

17
x11/gnome/gvfs/patches/patch-programs_gvfs-tree_c
View File

@ -1,17 +0,0 @@
$OpenBSD: patch-programs_gvfs-tree_c,v 1.2 2014/04/02 06:33:29 ajacoutot Exp $
From 1d944bcd1fcd1e4a8afb26758c98fa3b72786798 Mon Sep 17 00:00:00 2001
From: Ross Lagerwall <rosslagerwall@gmail.com>
Date: Tue, 1 Apr 2014 23:23:16 +0100
Subject: gvfs-tree: End GOptionEntry array with NULL
--- programs/gvfs-tree.c.orig Fri Dec 13 15:59:13 2013
+++ programs/gvfs-tree.c Wed Apr 2 08:05:44 2014
@@ -35,6 +35,7 @@ static GOptionEntry entries[] =
{
{ "hidden", 'h', 0, G_OPTION_ARG_NONE, &show_hidden, N_("Show hidden files"), NULL },
{ "follow-symlinks", 'l', 0, G_OPTION_ARG_NONE, &follow_symlinks, N_("Follow symbolic links, mounts and shortcuts"), NULL },
+ { NULL }
};
static gint