February 2014 - macports-changes - lists.macosforge.org

[117420] trunk/dports
by rmstonecipher＠macports.org 25 Feb '14

25 Feb '14

Revision: 117420 https://trac.macports.org/changeset/117420 Author: rmstonecipher(a)macports.org Date: 2014-02-25 15:10:17 -0800 (Tue, 25 Feb 2014) Log Message: ----------- audio/wavpack upgraded version from 4.60.1 to 4.70.0, incremented revision of (5) dependent ports due to changes to libwavpack dylib file names Modified Paths: -------------- trunk/dports/audio/easytag/Portfile trunk/dports/audio/sox/Portfile trunk/dports/audio/wavpack/Portfile trunk/dports/audio/xmms2/Portfile trunk/dports/gnome/gstreamer010-gst-plugins-good/Portfile trunk/dports/gnome/gstreamer1-gst-plugins-good/Portfile Modified: trunk/dports/audio/easytag/Portfile =================================================================== --- trunk/dports/audio/easytag/Portfile 2014-02-25 23:02:47 UTC (rev 117419) +++ trunk/dports/audio/easytag/Portfile 2014-02-25 23:10:17 UTC (rev 117420) @@ -5,6 +5,7 @@ name easytag version 2.1.9 +revision 1 set branch [join [lrange [split ${version} .] 0 1] .] categories audio gnome platforms darwin Modified: trunk/dports/audio/sox/Portfile =================================================================== --- trunk/dports/audio/sox/Portfile 2014-02-25 23:02:47 UTC (rev 117419) +++ trunk/dports/audio/sox/Portfile 2014-02-25 23:10:17 UTC (rev 117420) @@ -6,7 +6,7 @@ name sox conflicts play version 14.4.1 -revision 1 +revision 2 categories audio platforms darwin maintainers stare.cz:hans Modified: trunk/dports/audio/wavpack/Portfile =================================================================== --- trunk/dports/audio/wavpack/Portfile 2014-02-25 23:02:47 UTC (rev 117419) +++ trunk/dports/audio/wavpack/Portfile 2014-02-25 23:10:17 UTC (rev 117420) @@ -4,7 +4,7 @@ PortSystem 1.0 name wavpack -version 4.60.1 +version 4.70.0 categories audio license BSD maintainers rmstonecipher openmaintainer @@ -18,9 +18,8 @@ homepage http://www.wavpack.com/ platforms darwin master_sites ${homepage} -checksums md5 7bb1528f910e4d0003426c02db856063 \ - sha1 003c65cb4e29c55011cf8e7b10d69120df5e7f30 \ - rmd160 66107e91f61a79c406b164b679e1f29078939ce4 +checksums rmd160 53ef85ba97c4113f105f22f11b9b54ee1e7c65f1 \ + sha256 2cade379b0aba99fbc4e442ccc6dac6c609f6212e46516a083e24c8c364430a4 use_bzip2 yes livecheck.type regex Modified: trunk/dports/audio/xmms2/Portfile =================================================================== --- trunk/dports/audio/xmms2/Portfile 2014-02-25 23:02:47 UTC (rev 117419) +++ trunk/dports/audio/xmms2/Portfile 2014-02-25 23:10:17 UTC (rev 117420) @@ -6,7 +6,7 @@ name xmms2 version 0.8DrO_o -revision 7 +revision 8 categories audio # Mostly LGPL, some plugins and clients are GPL license LGPL-2.1+ GPL-2+ GPL-2 Modified: trunk/dports/gnome/gstreamer010-gst-plugins-good/Portfile =================================================================== --- trunk/dports/gnome/gstreamer010-gst-plugins-good/Portfile 2014-02-25 23:02:47 UTC (rev 117419) +++ trunk/dports/gnome/gstreamer010-gst-plugins-good/Portfile 2014-02-25 23:10:17 UTC (rev 117420) @@ -10,7 +10,7 @@ name gstreamer010-gst-plugins-good set my_name gst-plugins-good version 0.10.31 -revision 4 +revision 5 description \ A set of good-quality plug-ins for GStreamer under GStreamer's preferred \ license, LGPL. Modified: trunk/dports/gnome/gstreamer1-gst-plugins-good/Portfile =================================================================== --- trunk/dports/gnome/gstreamer1-gst-plugins-good/Portfile 2014-02-25 23:02:47 UTC (rev 117419) +++ trunk/dports/gnome/gstreamer1-gst-plugins-good/Portfile 2014-02-25 23:10:17 UTC (rev 117420) @@ -10,6 +10,7 @@ name gstreamer1-gst-plugins-good set my_name gst-plugins-good version 1.2.3 +revision 1 set branch [join [lrange [split ${version} .] 0 1] .] description \ A set of good-quality plug-ins for GStreamer under GStreamer's preferred \

1 0

[117419] trunk/dports/gnome/libwnck3/Portfile
by devans＠macports.org 25 Feb '14

25 Feb '14

Revision: 117419 https://trac.macports.org/changeset/117419 Author: devans(a)macports.org Date: 2014-02-25 15:02:47 -0800 (Tue, 25 Feb 2014) Log Message: ----------- libwnck3: replace in-tree intltool.m4 with our version, autoreconf to correct intltool configuration, build deps. Modified Paths: -------------- trunk/dports/gnome/libwnck3/Portfile Modified: trunk/dports/gnome/libwnck3/Portfile =================================================================== --- trunk/dports/gnome/libwnck3/Portfile 2014-02-25 22:31:53 UTC (rev 117418) +++ trunk/dports/gnome/libwnck3/Portfile 2014-02-25 23:02:47 UTC (rev 117419) @@ -31,7 +31,8 @@ sha256 d48ac9c7f50c0d563097f63d07bcc83744c7d92a1b4ef65e5faeab32b5ccb723 depends_build port:pkgconfig \ - port:intltool + port:intltool \ + port:gnome-common depends_lib port:startup-notification \ port:gobject-introspection \ @@ -41,6 +42,15 @@ require_active_variants gtk3 x11 +# update m4/intltool.m4 and autoreconf + +pre-configure { + copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4 +} + +use_autoreconf yes +autoreconf.args -fvi + configure.args --x-includes=${prefix}/include \ --x-libraries=${prefix}/lib \ --enable-introspection \

1 0

[117418] trunk/dports/gnome/libsoup/Portfile
by devans＠macports.org 25 Feb '14

25 Feb '14

Revision: 117418 https://trac.macports.org/changeset/117418 Author: devans(a)macports.org Date: 2014-02-25 14:31:53 -0800 (Tue, 25 Feb 2014) Log Message: ----------- libsoup: replace in-tree intltool.m4 with our version before autoreconf to correct intltool configuration. Modified Paths: -------------- trunk/dports/gnome/libsoup/Portfile Modified: trunk/dports/gnome/libsoup/Portfile =================================================================== --- trunk/dports/gnome/libsoup/Portfile 2014-02-25 22:12:00 UTC (rev 117417) +++ trunk/dports/gnome/libsoup/Portfile 2014-02-25 22:31:53 UTC (rev 117418) @@ -48,7 +48,12 @@ --without-gnome \ --enable-introspection -# Don't do intltool's INTLTOOL_PERL dance +# update m4/intltool.m4 and autoreconf + +pre-configure { + copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4 +} + use_autoreconf yes autoreconf.args -fvi

1 0

[117417] trunk/dports/gnome/libsecret/Portfile
by devans＠macports.org 25 Feb '14

25 Feb '14

Revision: 117417 https://trac.macports.org/changeset/117417 Author: devans(a)macports.org Date: 2014-02-25 14:12:00 -0800 (Tue, 25 Feb 2014) Log Message: ----------- libsecret: replace in-tree intltool.m4 with our version, autoreconf to correct intltool configuration, build deps. Modified Paths: -------------- trunk/dports/gnome/libsecret/Portfile Modified: trunk/dports/gnome/libsecret/Portfile =================================================================== --- trunk/dports/gnome/libsecret/Portfile 2014-02-25 21:43:04 UTC (rev 117416) +++ trunk/dports/gnome/libsecret/Portfile 2014-02-25 22:12:00 UTC (rev 117417) @@ -26,6 +26,7 @@ depends_build port:intltool \ port:pkgconfig \ + port:libxslt \ port:gtk-doc depends_lib path:lib/pkgconfig/glib-2.0.pc:glib2 \ @@ -33,6 +34,17 @@ port:vala \ port:libgcrypt +# update build/m4/intltool.m4 and autoreconf + +pre-configure { + copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/build/m4 +} + +use_autoreconf yes +autoreconf.args -fvi + +configure.args --disable-silent-rules + platform darwin 8 { # The rules enabled by gobject-introspection require GNU make 3.81+ depends_build-append port:gmake

1 0

[117416] trunk/dports/gnome/gnome-system-log
by devans＠macports.org 25 Feb '14

25 Feb '14

Revision: 117416 https://trac.macports.org/changeset/117416 Author: devans(a)macports.org Date: 2014-02-25 13:43:04 -0800 (Tue, 25 Feb 2014) Log Message: ----------- apply upstream patch to prevent configuration failure, use autogen.sh to reconfigure with our intltool.m4, fixes intltool configuration. Modified Paths: -------------- trunk/dports/gnome/gnome-system-log/Portfile Added Paths: ----------- trunk/dports/gnome/gnome-system-log/files/ trunk/dports/gnome/gnome-system-log/files/autogen.sh trunk/dports/gnome/gnome-system-log/files/patch-fix-autogen-and-configure.diff Modified: trunk/dports/gnome/gnome-system-log/Portfile =================================================================== --- trunk/dports/gnome/gnome-system-log/Portfile 2014-02-25 21:11:36 UTC (rev 117415) +++ trunk/dports/gnome/gnome-system-log/Portfile 2014-02-25 21:43:04 UTC (rev 117416) @@ -26,7 +26,9 @@ depends_build port:pkgconfig \ port:intltool \ - port:itstool + port:itstool \ + port:yelp-tools \ + port:gnome-common depends_lib port:desktop-file-utils \ port:gnome-icon-theme \ @@ -36,6 +38,19 @@ depends_run port:gnome-settings-daemon \ port:yelp +# apply upstream patch to prevent configuration failure when using autogen.sh +# see patch comments for details + +patchfiles patch-fix-autogen-and-configure.diff + +# reconfigure with our intltool.m4 using autogen.sh from upstream git + +post-patch { + xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath} +} + +configure.cmd ./autogen.sh + configure.args --disable-zlib \ --disable-schemas-compile \ --disable-silent-rules Added: trunk/dports/gnome/gnome-system-log/files/autogen.sh =================================================================== --- trunk/dports/gnome/gnome-system-log/files/autogen.sh (rev 0) +++ trunk/dports/gnome/gnome-system-log/files/autogen.sh 2014-02-25 21:43:04 UTC (rev 117416) @@ -0,0 +1,20 @@ +#!/bin/sh +# Run this to generate all the initial makefiles, etc. + +srcdir=`dirname $0` +test -z "$srcdir" && srcdir=. + +PKG_NAME="GNOME System Log" + +(test -f $srcdir/configure.ac) || { + echo -n "**Error**: Directory "\`$srcdir\'" does not look like the" + echo " top-level GNOME System Log directory" + exit 1 +} + +which gnome-autogen.sh || { + echo "You need to install gnome-common package" + exit 1 +} + +USE_GNOME2_MACROS=1 . gnome-autogen.sh Added: trunk/dports/gnome/gnome-system-log/files/patch-fix-autogen-and-configure.diff =================================================================== --- trunk/dports/gnome/gnome-system-log/files/patch-fix-autogen-and-configure.diff (rev 0) +++ trunk/dports/gnome/gnome-system-log/files/patch-fix-autogen-and-configure.diff 2014-02-25 21:43:04 UTC (rev 117416) @@ -0,0 +1,35 @@ +From 195a0c6dc1d713ef15b371f0db063c0607f58146 Mon Sep 17 00:00:00 2001 +From: Seán de Búrca <leftmostcat(a)gmail.com> +Date: Mon, 26 Aug 2013 21:57:28 +0000 +Subject: Fix autogen and configure + +aclocal needs an explicit macro dir and side-by-side use of IT_PROG_INTLTOOL and AM_GNU_GETTEXT is not supported. + +https://bugzilla.gnome.org/show_bug.cgi?id=672001 +--- +diff --git a/Makefile.am b/Makefile.am +index c176536..170b17c 100644 +--- Makefile.am ++++ Makefile.am +@@ -1,3 +1,5 @@ + SUBDIRS = data help po src + ++ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} ++ + EXTRA_DIST = COPYING.docs +diff --git a/configure.ac b/configure.ac +index 112c3ba..9abced5 100644 +--- configure.ac ++++ configure.ac +@@ -21,9 +21,6 @@ PKG_PROG_PKG_CONFIG([0.22]) + + AC_PATH_PROG(GLIB_GENMARSHAL, [glib-genmarshal]) + +-AM_GNU_GETTEXT([external]) +-AM_GNU_GETTEXT_VERSION([0.17]) +- + AC_PROG_CC + AM_PROG_CC_C_O + AC_PROG_CXX +-- +cgit v0.9.2

1 0

[117415] trunk/dports/multimedia/VLC-devel
by jeremyhu＠macports.org 25 Feb '14

25 Feb '14

Revision: 117415 https://trac.macports.org/changeset/117415 Author: jeremyhu(a)macports.org Date: 2014-02-25 13:11:36 -0800 (Tue, 25 Feb 2014) Log Message: ----------- VLC-devel: Update to current git Modified Paths: -------------- trunk/dports/multimedia/VLC-devel/Portfile trunk/dports/multimedia/VLC-devel/files/PR-34741-no__clang_version__.patch trunk/dports/multimedia/VLC-devel/files/no-sparkle.patch Modified: trunk/dports/multimedia/VLC-devel/Portfile =================================================================== --- trunk/dports/multimedia/VLC-devel/Portfile 2014-02-25 20:31:16 UTC (rev 117414) +++ trunk/dports/multimedia/VLC-devel/Portfile 2014-02-25 21:11:36 UTC (rev 117415) @@ -6,7 +6,7 @@ name VLC-devel version 2.1.99 -revision 6 +revision 7 categories multimedia @@ -29,7 +29,7 @@ fetch.type git #git.url git://git.videolan.org/vlc/vlc-2.1.git git.url git://git.videolan.org/vlc.git -git.branch 050a16328dac1d3573326c43d47376d08210604d +git.branch ee6b5cefbc89b56b9688698e1e03eb178b653762 #master_sites http://download.videolan.org/pub/videolan/vlc/${version}/ #distname vlc-${version} Modified: trunk/dports/multimedia/VLC-devel/files/PR-34741-no__clang_version__.patch =================================================================== --- trunk/dports/multimedia/VLC-devel/files/PR-34741-no__clang_version__.patch 2014-02-25 20:31:16 UTC (rev 117414) +++ trunk/dports/multimedia/VLC-devel/files/PR-34741-no__clang_version__.patch 2014-02-25 21:11:36 UTC (rev 117415) @@ -1,16 +1,19 @@ ---- ./modules/gui/macosx/about.m.orig 2012-06-03 11:19:43.000000000 -0700 -+++ ./modules/gui/macosx/about.m 2012-06-03 11:22:22.000000000 -0700 -@@ -94,9 +94,11 @@ static VLAboutBox *_o_sharedInstance = n +--- modules/gui/macosx/about.m.orig 2014-02-25 11:36:09.000000000 -0800 ++++ modules/gui/macosx/about.m 2014-02-25 12:06:29.000000000 -0800 +@@ -101,10 +101,14 @@ static VLAboutBox *_o_sharedInstance = n /* setup the creator / revision field */ NSString *compiler; -#ifdef __clang__ +#ifdef __clang_version__ compiler = [NSString stringWithFormat:@"clang %s", __clang_version__]; --#elif __llvm__ +-#else +#elif defined(__clang__) + compiler = [NSString stringWithFormat:@"clang"]; +#elif defined(__llvm__) compiler = [NSString stringWithFormat:@"llvm-gcc %s", __VERSION__]; - #else - compiler = [NSString stringWithFormat:@"gcc %s", __VERSION__]; ++#else ++ compiler = [NSString stringWithFormat:@"gcc %s", __VERSION__]; + #endif + [o_revision_field setStringValue: [NSString stringWithFormat: _NS("Compiled by %s with %@"), VLC_CompileBy(), compiler]]; + Modified: trunk/dports/multimedia/VLC-devel/files/no-sparkle.patch =================================================================== --- trunk/dports/multimedia/VLC-devel/files/no-sparkle.patch 2014-02-25 20:31:16 UTC (rev 117414) +++ trunk/dports/multimedia/VLC-devel/files/no-sparkle.patch 2014-02-25 21:11:36 UTC (rev 117415) @@ -70,18 +70,27 @@ index c5fced6..da7d001 100644 --- modules/gui/macosx/intf.m +++ modules/gui/macosx/intf.m -@@ -69,8 +69,6 @@ +@@ -67,8 +67,6 @@ #import "VideoEffects.h" #import "AudioEffects.h" -#import <Sparkle/Sparkle.h> /* we're the update delegate */ - #import "iTunes.h" + #import "Spotify.h" - /***************************************************************************** -@@ -916,16 +915,6 @@ static VLCMain *_o_sharedMainInstance = nil; +@@ -736,8 +736,6 @@ static VLCMain *_o_sharedMainInstance = + + [NSBundle loadNibNamed:@"MainWindow" owner: self]; + [o_mainwindow makeKeyAndOrderFront:nil]; +- +- [[SUUpdater sharedUpdater] setDelegate:self]; } + - (void)applicationDidFinishLaunching:(NSNotification *)aNotification +@@ -917,25 +915,6 @@ static VLCMain *_o_sharedMainInstance = + } + #pragma mark - -#pragma mark Sparkle delegate -/* received directly before the update gets installed, so let's shut down a bit */ @@ -92,6 +101,15 @@ - [[VLCCoreInteraction sharedInstance] stop]; -} - +-/* don't be enthusiastic about an update if we currently play a video */ +-- (BOOL)updaterMayCheckForUpdates:(SUUpdater *)bundle +-{ +- if ([self activeVideoPlayback]) +- return NO; +- +- return YES; +-} +- -#pragma mark - #pragma mark Media Key support

1 0

[117414] trunk/base/src/cregistry/sql.c
by jmr＠macports.org 25 Feb '14

25 Feb '14

Revision: 117414 https://trac.macports.org/changeset/117414 Author: jmr(a)macports.org Date: 2014-02-25 12:31:16 -0800 (Tue, 25 Feb 2014) Log Message: ----------- re-revert reverted reversion Modified Paths: -------------- trunk/base/src/cregistry/sql.c Modified: trunk/base/src/cregistry/sql.c =================================================================== --- trunk/base/src/cregistry/sql.c 2014-02-25 20:30:35 UTC (rev 117413) +++ trunk/base/src/cregistry/sql.c 2014-02-25 20:31:16 UTC (rev 117414) @@ -264,7 +264,7 @@ /* we can't call vercmp directly because it's static, but we have * sql_version, which is basically an alias */ - if (sql_version(NULL, -1, version, -1, "1.1") < 0) { + if (sql_version(NULL, -1, version, -1, "1.100") < 0) { /* we need to update to 1.1, add binary field and index to files * table */ static char* version_1_1_queries[] = {

1 0

[117413] trunk/dports/gnome/gnome-font-viewer/Portfile
by devans＠macports.org 25 Feb '14

25 Feb '14

Revision: 117413 https://trac.macports.org/changeset/117413 Author: devans(a)macports.org Date: 2014-02-25 12:30:35 -0800 (Tue, 25 Feb 2014) Log Message: ----------- gnome-font-viewer: replace in-tree intltool.m4 with our version, autoreconf to correct intltool configuration. Modified Paths: -------------- trunk/dports/gnome/gnome-font-viewer/Portfile Modified: trunk/dports/gnome/gnome-font-viewer/Portfile =================================================================== --- trunk/dports/gnome/gnome-font-viewer/Portfile 2014-02-25 20:26:21 UTC (rev 117412) +++ trunk/dports/gnome/gnome-font-viewer/Portfile 2014-02-25 20:30:35 UTC (rev 117413) @@ -35,8 +35,15 @@ depends_run port:gnome-settings-daemon -#configure.optflags -g -O0 +# update m4/intltool.m4 and autoreconf +pre-configure { + copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4 +} + +use_autoreconf yes +autoreconf.args -fvi + configure.args --disable-schemas-compile \ --disable-silent-rules

1 0

[117412] trunk/base/src/cregistry/sql.c
by cal＠macports.org 25 Feb '14

25 Feb '14

Revision: 117412 https://trac.macports.org/changeset/117412 Author: cal(a)macports.org Date: 2014-02-25 12:26:21 -0800 (Tue, 25 Feb 2014) Log Message: ----------- cregistry/sql.c: the db version should be 1.200 on creation; omitting the quotes will make it 1.2, though. Modified Paths: -------------- trunk/base/src/cregistry/sql.c Modified: trunk/base/src/cregistry/sql.c =================================================================== --- trunk/base/src/cregistry/sql.c 2014-02-25 20:20:21 UTC (rev 117411) +++ trunk/base/src/cregistry/sql.c 2014-02-25 20:26:21 UTC (rev 117412) @@ -129,7 +129,7 @@ /* metadata table */ "CREATE TABLE registry.metadata (key UNIQUE, value)", - "INSERT INTO registry.metadata (key, value) VALUES ('version', 1.200)", + "INSERT INTO registry.metadata (key, value) VALUES ('version', '1.200')", "INSERT INTO registry.metadata (key, value) VALUES ('created', strftime('%s', 'now'))", /* ports table */

1 0

[117411] trunk/base/src/cregistry/sql.c
by cal＠macports.org 25 Feb '14

25 Feb '14

Revision: 117411 https://trac.macports.org/changeset/117411 Author: cal(a)macports.org Date: 2014-02-25 12:20:21 -0800 (Tue, 25 Feb 2014) Log Message: ----------- cregistry/sql.c: revert the part of r117409 that broke the buildbots Revision Links: -------------- https://trac.macports.org/changeset/117409 Modified Paths: -------------- trunk/base/src/cregistry/sql.c Modified: trunk/base/src/cregistry/sql.c =================================================================== --- trunk/base/src/cregistry/sql.c 2014-02-25 20:07:47 UTC (rev 117410) +++ trunk/base/src/cregistry/sql.c 2014-02-25 20:20:21 UTC (rev 117411) @@ -264,7 +264,7 @@ /* we can't call vercmp directly because it's static, but we have * sql_version, which is basically an alias */ - if (sql_version(NULL, -1, version, -1, "1.100") < 0) { + if (sql_version(NULL, -1, version, -1, "1.1") < 0) { /* we need to update to 1.1, add binary field and index to files * table */ static char* version_1_1_queries[] = {

1 0