[152852] users/devans/GNOME-3/stable/dports/devel/gvfs
devans at macports.org
devans at macports.org
Mon Sep 19 13:55:00 PDT 2016
Revision: 152852
https://trac.macports.org/changeset/152852
Author: devans at macports.org
Date: 2016-09-19 13:55:00 -0700 (Mon, 19 Sep 2016)
Log Message:
-----------
GNOME-3/stable: gvfs, merge unstable to stable and update to stable version 1.30.0, dependencies, configuration, no longer uses intltool.
Modified Paths:
--------------
users/devans/GNOME-3/stable/dports/devel/gvfs/Portfile
users/devans/GNOME-3/stable/dports/devel/gvfs/files/patch-test-gvfs-test.diff
Removed Paths:
-------------
users/devans/GNOME-3/stable/dports/devel/gvfs/files/autogen.sh
users/devans/GNOME-3/stable/dports/devel/gvfs/files/patch-gconf-gapplookupgconf.h.diff
Property Changed:
----------------
users/devans/GNOME-3/stable/dports/devel/gvfs/
Property changes on: users/devans/GNOME-3/stable/dports/devel/gvfs
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/dports/devel/gvfs:116280-150560
/users/devans/GNOME-3/unstable/dports/devel/gvfs:118152-120100,123992-125723,128305-134374,143561-147065
+ /trunk/dports/devel/gvfs:116280-150560
/users/devans/GNOME-3/unstable/dports/devel/gvfs:118152-120100,123992-125723,128305-134374,143561-147065,148131-152851
Modified: users/devans/GNOME-3/stable/dports/devel/gvfs/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/devel/gvfs/Portfile 2016-09-19 20:38:08 UTC (rev 152851)
+++ users/devans/GNOME-3/stable/dports/devel/gvfs/Portfile 2016-09-19 20:55:00 UTC (rev 152852)
@@ -5,11 +5,10 @@
name gvfs
epoch 1
-version 1.28.3
+version 1.30.0
set branch [join [lrange [split ${version} .] 0 1] .]
maintainers devans openmaintainer
categories devel
-# trashlib code used in the daemon is GPL
license {LGPL GPL-3}
platforms darwin
description The Gnome Virtual File System.
@@ -35,15 +34,11 @@
use_xz yes
-checksums rmd160 b5667f5c4217568cd03b743d46623c28d0371a2c \
- sha256 458c4cb68570f6ef4a9e152995c62d0057c3e0a07ed64d84c7200cdd22f0bd17
+checksums rmd160 2775a20329fd90a755c05d9e15250d00119d7386 \
+ sha256 2285d387213eef528f09df4b113d9d2e54ce7108c50587355d07f2a885840da4
depends_build port:pkgconfig \
- port:intltool \
port:gtk-doc \
- port:autoconf \
- port:automake \
- port:libtool \
port:pidof \
port:gsed
@@ -62,14 +57,6 @@
patchfiles patch-test-run-in-tree.sh.diff \
patch-test-gvfs-test.diff
-post-patch {
- xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath}
-}
-
-# reconfigure using upstream autogen.sh for intltool 0.51 compatibility
-
-configure.cmd ./autogen.sh
-
configure.args --disable-avahi \
--disable-fuse \
--disable-hal \
@@ -80,6 +67,7 @@
--disable-gdu \
--disable-udisks2 \
--disable-libsystemd-login \
+ --disable-admin \
--disable-gudev \
--disable-afc \
--disable-bluray \
Deleted: users/devans/GNOME-3/stable/dports/devel/gvfs/files/autogen.sh
===================================================================
--- users/devans/GNOME-3/stable/dports/devel/gvfs/files/autogen.sh 2016-09-19 20:38:08 UTC (rev 152851)
+++ users/devans/GNOME-3/stable/dports/devel/gvfs/files/autogen.sh 2016-09-19 20:55:00 UTC (rev 152852)
@@ -1,126 +0,0 @@
-#!/bin/sh
-# Run this to generate all the initial makefiles, etc.
-
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-ORIGDIR=`pwd`
-cd $srcdir
-PROJECT=GVfs
-TEST_TYPE=-f
-FILE=client/gdaemonvfs.h
-
-DIE=0
-
-have_libtool=false
-if glibtoolize --version < /dev/null > /dev/null 2>&1 ; then
- libtool_version=`glibtoolize --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'`
- case $libtool_version in
- 1.4*|1.5*|2.2*|2.4*)
- have_libtool=true
- ;;
- esac
-fi
-if $have_libtool ; then : ; else
- echo
- echo "You must have libtool 1.4 installed to compile $PROJECT."
- echo "Install the appropriate package for your distribution,"
- echo "or get the source tarball at http://ftp.gnu.org/gnu/libtool/"
- DIE=1
-fi
-
-(intltoolize --version) < /dev/null > /dev/null 2>&1 || {
- echo
- echo "You must have intltool installed to compile $PROJECT."
- echo "Install the appropriate package for your distribution,"
- echo "or get the source tarball at http://ftp.gnome.org/pub/GNOME/sources/intltool"
- DIE=1
-}
-
-(gtkdocize --version) < /dev/null > /dev/null 2>&1 || {
- echo
- echo "You must have gtk-doc installed to compile $PROJECT."
- echo "Install the appropriate package for your distribution,"
- echo "or get the source tarball at http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/"
- DIE=1
-}
-
-(autoconf --version) < /dev/null > /dev/null 2>&1 || {
- echo
- echo "You must have autoconf installed to compile $PROJECT."
- echo "Install the appropriate package for your distribution,"
- echo "or get the source tarball at http://ftp.gnu.org/gnu/autoconf/"
- DIE=1
-}
-
-if automake --version < /dev/null > /dev/null 2>&1 ; then
- AUTOMAKE=automake
- ACLOCAL=aclocal
-else
- echo
- echo "You must have automake 1.7.x installed to compile $PROJECT."
- echo "Install the appropriate package for your distribution,"
- echo "or get the source tarball at http://ftp.gnu.org/gnu/automake/"
- DIE=1
-fi
-
-if test "$DIE" -eq 1; then
- exit 1
-fi
-
-test $TEST_TYPE $FILE || {
- echo "You must run this script in the top-level $PROJECT directory"
- exit 1
-}
-
-if test -z "$AUTOGEN_SUBDIR_MODE"; then
- if test -z "$*"; then
- echo "I am going to run ./configure with no arguments - if you wish "
- echo "to pass any to it, please specify them on the $0 command line."
- fi
-fi
-
-if test -z "$ACLOCAL_FLAGS"; then
-
- acdir=`$ACLOCAL --print-ac-dir`
- m4list="glib-2.0.m4 glib-gettext.m4"
-
- for file in $m4list
- do
- if [ ! -f "$acdir/$file" ]; then
- echo "WARNING: aclocal's directory is $acdir, but..."
- echo " no file $acdir/$file"
- echo " You may see fatal macro warnings below."
- echo " If these files are installed in /some/dir, set the ACLOCAL_FLAGS "
- echo " environment variable to \"-I /some/dir\", or install"
- echo " $acdir/$file."
- echo ""
- fi
- done
-fi
-
-rm -rf autom4te.cache
-
-# README and INSTALL are required by automake, but may be deleted by clean
-# up rules. to get automake to work, simply touch these here, they will be
-# regenerated from their corresponding *.in files by ./configure anyway.
-touch README INSTALL
-
-glibtoolize --force --copy || exit $?
-intltoolize --force --copy --automake || exit $?
-gtkdocize --copy || exit $?
-
-$ACLOCAL $ACLOCAL_FLAGS || exit $?
-
-autoheader || exit $?
-
-$AUTOMAKE --add-missing || exit $?
-autoconf || exit $?
-cd $ORIGDIR || exit $?
-
-if test -z "$AUTOGEN_SUBDIR_MODE" && test -z "$NOCONFIGURE"; then
- $srcdir/configure $AUTOGEN_CONFIGURE_ARGS "$@" || exit $?
-
- echo
- echo "Now type 'make' to compile $PROJECT."
-fi
Deleted: users/devans/GNOME-3/stable/dports/devel/gvfs/files/patch-gconf-gapplookupgconf.h.diff
===================================================================
--- users/devans/GNOME-3/stable/dports/devel/gvfs/files/patch-gconf-gapplookupgconf.h.diff 2016-09-19 20:38:08 UTC (rev 152851)
+++ users/devans/GNOME-3/stable/dports/devel/gvfs/files/patch-gconf-gapplookupgconf.h.diff 2016-09-19 20:55:00 UTC (rev 152852)
@@ -1,18 +0,0 @@
---- gconf/gapplookupgconf.h.bak 2011-01-06 18:18:29.009000135 +0800
-+++ gconf/gapplookupgconf.h 2011-01-06 18:21:15.074000177 +0800
-@@ -25,8 +25,14 @@
-
- #include <glib-object.h>
- #include <gio/gio.h>
--#include <gio/gdesktopappinfo.h>
-
-+#ifdef G_DISABLE_DEPRECATED
-+#undef G_DISABLE_DEPRECATED
-+#include <gio/gdesktopappinfo.h>
-+#define G_DISABLE_DEPRECATED
-+#else
-+#include <gio/gdesktopappinfo.h>
-+#endif
-
- G_BEGIN_DECLS
-
Modified: users/devans/GNOME-3/stable/dports/devel/gvfs/files/patch-test-gvfs-test.diff
===================================================================
--- users/devans/GNOME-3/stable/dports/devel/gvfs/files/patch-test-gvfs-test.diff 2016-09-19 20:38:08 UTC (rev 152851)
+++ users/devans/GNOME-3/stable/dports/devel/gvfs/files/patch-test-gvfs-test.diff 2016-09-19 20:55:00 UTC (rev 152852)
@@ -1,6 +1,6 @@
--- test/gvfs-test.orig 2016-02-18 11:43:03.000000000 -0800
+++ test/gvfs-test 2016-02-18 11:44:43.000000000 -0800
-@@ -62,7 +62,7 @@
+@@ -68,7 +68,7 @@
have_httpd = httpd_cmd is not None
sshd_path = subprocess.check_output(['which', 'sshd'], universal_newlines=True).strip()
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160919/e726f43c/attachment.html>
More information about the macports-changes
mailing list