[128298] users/devans/GNOME-3/stable/dports

devans at macports.org devans at macports.org
Tue Nov 18 10:35:26 PST 2014


Revision: 128298
          https://trac.macports.org/changeset/128298
Author:   devans at macports.org
Date:     2014-11-18 10:35:26 -0800 (Tue, 18 Nov 2014)
Log Message:
-----------
GNOME-3/stable: glib2, easytag, merge sync with trunk.

Modified Paths:
--------------
    users/devans/GNOME-3/stable/dports/audio/easytag/Portfile
    users/devans/GNOME-3/stable/dports/devel/glib2/Portfile

Added Paths:
-----------
    users/devans/GNOME-3/stable/dports/devel/glib2/files/yosemite-libtool.patch

Removed Paths:
-------------
    users/devans/GNOME-3/stable/dports/devel/glib2/files/yosemite-symbol-lookup.patch

Property Changed:
----------------
    users/devans/GNOME-3/stable/dports/audio/easytag/
    users/devans/GNOME-3/stable/dports/devel/glib2/


Property changes on: users/devans/GNOME-3/stable/dports/audio/easytag
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/mld-qt-481/dports/audio/easytag:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/audio/easytag:128123-128225
   + /branches/mld-qt-481/dports/audio/easytag:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/audio/easytag:128123-128297

Modified: users/devans/GNOME-3/stable/dports/audio/easytag/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/audio/easytag/Portfile	2014-11-18 18:30:01 UTC (rev 128297)
+++ users/devans/GNOME-3/stable/dports/audio/easytag/Portfile	2014-11-18 18:35:26 UTC (rev 128298)
@@ -1,52 +1,51 @@
 # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 # $Id$
 
-PortSystem      1.0
+PortSystem          1.0
 
-name            easytag
-version         2.2.4
-revision        2
-set branch      [join [lrange [split ${version} .] 0 1] .]
-categories      audio gnome
-platforms       darwin
-maintainers     nomaintainer
-homepage        https://wiki.gnome.org/Apps/EasyTAG/
-license         GPL-2+
-description     Tool for editing tags of audio files
+name                easytag
+version             2.2.4
+revision            2
+set branch          [join [lrange [split ${version} .] 0 1] .]
+categories          audio gnome
+platforms           darwin
+maintainers         devans openmaintainer
+homepage            https://wiki.gnome.org/Apps/EasyTAG/
+license             GPL-2+
+description         Tool for editing tags of audio files
 
-long_description \
-                EasyTAG is an utility for viewing and editing tags \
-                for MP3, MP2, FLAC, Ogg Vorbis, MusePack, Monkey's \
-                audio files and MP4/AAC. \
-                Its simple and nice GTK2+ interface makes tagging easier \
-                under UNIX systems.
+long_description    EasyTAG is an utility for viewing and editing tags \
+                    for MP3, MP2, FLAC, Ogg Vorbis, MusePack, Monkey's \
+                    audio files and MP4/AAC. \
+                    Its simple and nice GTK2+ interface makes tagging easier \
+                    under UNIX systems.
 
-master_sites    gnome:sources/${name}/${branch}
+master_sites        gnome:sources/${name}/${branch}
 
-checksums       rmd160  21f7931bc1a9e7a09630163f6b713b7c72ea2b80 \
-                sha256  458329ab17e07fac5e92a2d732f0f4e9b12ea8aa31707506b39d3b2428d0c091
+checksums           rmd160  21f7931bc1a9e7a09630163f6b713b7c72ea2b80 \
+                    sha256  458329ab17e07fac5e92a2d732f0f4e9b12ea8aa31707506b39d3b2428d0c091
 
-use_xz          yes
+use_xz              yes
 
-depends_build   port:pkgconfig \
-                port:intltool \
-                port:itstool \
-                port:yelp-tools \
-                port:appstream-glib
+depends_build       port:pkgconfig \
+                    port:intltool \
+                    port:itstool \
+                    port:yelp-tools \
+                    port:appstream-glib
 
-depends_lib     port:desktop-file-utils \
-                port:gtk3 \
-                port:libvorbis \
-                port:flac \
-                port:id3lib \
-                port:libid3tag \
-                port:speex \
-                port:libopus \
-                port:opusfile \
-                port:taglib \
-                port:wavpack
+depends_lib         port:desktop-file-utils \
+                    port:gtk3 \
+                    port:libvorbis \
+                    port:flac \
+                    port:id3lib \
+                    port:libid3tag \
+                    port:speex \
+                    port:libopus \
+                    port:opusfile \
+                    port:taglib \
+                    port:wavpack
 
-depends_run     port:gnome-themes-standard
+depends_run         port:gnome-themes-standard
 
 # update m4/intltool.m4 and autoreconf
 
@@ -54,17 +53,17 @@
     copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
 }
 
-use_autoreconf  yes
-autoreconf.args -fvi
+use_autoreconf      yes
+autoreconf.args     -fvi
 
-configure.args  --with-gtk2=no
+configure.args      --with-gtk2=no
 
 configure.cxxflags-append \
-                -Wno-format-nonliteral
+                    -Wno-format-nonliteral
 
 post-activate {
     system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
     system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
 }
 
-livecheck.type  gnome-with-unstable
+livecheck.type      gnome


Property changes on: users/devans/GNOME-3/stable/dports/devel/glib2
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/mld-qt-481/dports/devel/glib2:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/devel/glib2:52045-52046,62644,64476,72697,91791,125620-128108
/trunk/dports/devel/glib2-devel:51739-120463
/users/cal/ports/devel/glib2:96570-97031
/users/devans/GNOME-3/unstable/dports/devel/glib2:120511-125619
   + /branches/mld-qt-481/dports/devel/glib2:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/devel/glib2:52045-52046,62644,64476,72697,91791,125620-128290
/trunk/dports/devel/glib2-devel:51739-120463
/users/cal/ports/devel/glib2:96570-97031
/users/devans/GNOME-3/unstable/dports/devel/glib2:120511-125619

Modified: users/devans/GNOME-3/stable/dports/devel/glib2/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/devel/glib2/Portfile	2014-11-18 18:30:01 UTC (rev 128297)
+++ users/devans/GNOME-3/stable/dports/devel/glib2/Portfile	2014-11-18 18:35:26 UTC (rev 128298)
@@ -43,9 +43,11 @@
                             patch-gio_xdgmime_xdgmime.c.diff \
                             patch-gio_gdbusprivate.c.diff \
                             patch-get-launchd-dbus-session-address.diff \
-                            patch-gmodule-gmodule-dl.c.diff \
-                            yosemite-symbol-lookup.patch
+                            patch-gmodule-gmodule-dl.c.diff
 
+# Don't link with "-flat_namespace -undefined suppress" on Yosemite and later.
+patchfiles-append           yosemite-libtool.patch
+
 depends_build               bin:xmllint:libxml2
 
 depends_lib                 port:gettext \

Copied: users/devans/GNOME-3/stable/dports/devel/glib2/files/yosemite-libtool.patch (from rev 128290, trunk/dports/devel/glib2/files/yosemite-libtool.patch)
===================================================================
--- users/devans/GNOME-3/stable/dports/devel/glib2/files/yosemite-libtool.patch	                        (rev 0)
+++ users/devans/GNOME-3/stable/dports/devel/glib2/files/yosemite-libtool.patch	2014-11-18 18:35:26 UTC (rev 128298)
@@ -0,0 +1,13 @@
+Index: configure
+===================================================================
+--- configure.orig
++++ configure
+@@ -11742,7 +11742,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
+       case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+ 	10.0,*86*-darwin8*|10.0,*-darwin[91]*)
+ 	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+-	10.[012]*)
++	10.[012][,.]*)
+ 	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+ 	10.*)
+ 	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;

Deleted: users/devans/GNOME-3/stable/dports/devel/glib2/files/yosemite-symbol-lookup.patch
===================================================================
--- users/devans/GNOME-3/stable/dports/devel/glib2/files/yosemite-symbol-lookup.patch	2014-11-18 18:30:01 UTC (rev 128297)
+++ users/devans/GNOME-3/stable/dports/devel/glib2/files/yosemite-symbol-lookup.patch	2014-11-18 18:35:26 UTC (rev 128298)
@@ -1,13 +0,0 @@
-Index: configure
-===================================================================
---- configure.orig
-+++ configure
-@@ -11742,7 +11742,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
-       case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
- 	10.0,*86*-darwin8*|10.0,*-darwin[91]*)
- 	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
--	10.[012]*)
-+	10.[012][,.]*)
- 	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
- 	10.*)
- 	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141118/caa34463/attachment-0001.html>


More information about the macports-changes mailing list