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

31 May 2014

Revision: 120529
          https://trac.macports.org/changeset/120529
Author:   devans@macports.org
Date:     2014-05-31 12:35:59 -0700 (Sat, 31 May 2014)
Log Message:
-----------
GNOME-3/stable: sync ports with trunk:
    * devel/json-glib
    * devel/zeitgeist
    * gnome/geocode-glib
    * dports/gnome/gjs
    * dports/gnome/gtk3
    * dports/gnome/libsoup

Modified Paths:
--------------
    users/devans/GNOME-3/stable/dports/devel/json-glib/Portfile
    users/devans/GNOME-3/stable/dports/devel/zeitgeist/Portfile
    users/devans/GNOME-3/stable/dports/gnome/geocode-glib/Portfile
    users/devans/GNOME-3/stable/dports/gnome/gjs/Portfile
    users/devans/GNOME-3/stable/dports/gnome/gtk3/Portfile
    users/devans/GNOME-3/stable/dports/gnome/libsoup/Portfile

Added Paths:
-----------
    users/devans/GNOME-3/stable/dports/devel/zeitgeist/files/patch-libzeitgeist-Makefile.am.diff
    users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/files/
    users/devans/GNOME-3/stable/dports/gnome/gtk3/files/

Removed Paths:
-------------
    users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/files/

Property Changed:
----------------
    users/devans/GNOME-3/stable/dports/devel/json-glib/
    users/devans/GNOME-3/stable/dports/devel/zeitgeist/
    users/devans/GNOME-3/stable/dports/gnome/geocode-glib/
    users/devans/GNOME-3/stable/dports/gnome/gjs/
    users/devans/GNOME-3/stable/dports/gnome/gtk3/
    users/devans/GNOME-3/stable/dports/gnome/libsoup/


Property changes on: users/devans/GNOME-3/stable/dports/devel/json-glib
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/mld-qt-481/dports/devel/json-glib:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/users/cal/ports/devel/json-glib:96570-97031
   + /branches/mld-qt-481/dports/devel/json-glib:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/devel/json-glib:117602-120528
/users/cal/ports/devel/json-glib:96570-97031

Modified: users/devans/GNOME-3/stable/dports/devel/json-glib/Portfile
===================================================================

--- users/devans/GNOME-3/stable/dports/devel/json-glib/Portfile	2014-05-31 18:49:05 UTC (rev 120528)
+++ users/devans/GNOME-3/stable/dports/devel/json-glib/Portfile	2014-05-31 19:35:59 UTC (rev 120529)
@@ -4,7 +4,7 @@
 PortSystem          1.0
 
 name                json-glib
-version             1.0.0
+version             1.0.2
 set branch          [join [lrange [split ${version} .] 0 1] .]
 categories          devel
 license             LGPL-2.1+
@@ -24,8 +24,8 @@
 
 use_xz              yes
 
-checksums           rmd160  e9a99e1179b446cca06ad7c17b3c03a94d67efc9 \
-                    sha256  dbf558d2da989ab84a27e4e13daa51ceaa97eb959c2c2f80976c9322a8f4cdde
+checksums           rmd160  f80ecfdd7f6a0f8fa2dd8f5cdf704a301582bad5 \
+                    sha256  887bd192da8f5edc53b490ec51bf3ffebd958a671f5963e4f3af32c22e35660a
 
 configure.args      --enable-introspection=yes
 


Property changes on: users/devans/GNOME-3/stable/dports/devel/zeitgeist
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/mld-qt-481/dports/devel/zeitgeist:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/devel/zeitgeist:118239-119099
/users/cal/ports/devel/zeitgeist:96570-97031
   + /branches/mld-qt-481/dports/devel/zeitgeist:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/devel/zeitgeist:118239-120528
/users/cal/ports/devel/zeitgeist:96570-97031

Modified: users/devans/GNOME-3/stable/dports/devel/zeitgeist/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/devel/zeitgeist/Portfile	2014-05-31 18:49:05 UTC (rev 120528)
+++ users/devans/GNOME-3/stable/dports/devel/zeitgeist/Portfile	2014-05-31 19:35:59 UTC (rev 120529)
@@ -5,7 +5,7 @@
 
 name                zeitgeist
 version             0.9.14
-revision            3
+revision            6
 license             LGPL-2.1
 set branch          [join [lrange [split ${version} .] 0 1] .]
 description         Zeitgeist is a service which logs the users's activities and \
@@ -38,7 +38,8 @@
                     port:raptor2 \
                     port:vala
 
-patchfiles          patch-configure.ac.diff
+patchfiles          patch-configure.ac.diff \
+                    patch-libzeitgeist-Makefile.am.diff
 
 post-patch {
     reinplace "s|^#\!.*|#!${configure.python}|" \
@@ -67,8 +68,12 @@
 
 configure.cmd       ./autogen.sh
 configure.args      --disable-silent-rules \
-                    --disable-introspection
+                    --enable-introspection
 
+# gobject-introspection uses g-ir-scanner, which uses $CC from env
+build.args-append       CC="${configure.cc} ${configure.cc_archflags}"
+destroot.args-append    CC="${configure.cc} ${configure.cc_archflags}"
+
 variant python25 conflicts python26 python27 description {Build using Python 2.5} {
     depends_lib-append  port:py25-rdflib
     configure.python    ${prefix}/bin/python2.5

Copied: users/devans/GNOME-3/stable/dports/devel/zeitgeist/files/patch-libzeitgeist-Makefile.am.diff (from rev 120528, trunk/dports/devel/zeitgeist/files/patch-libzeitgeist-Makefile.am.diff)
===================================================================
--- users/devans/GNOME-3/stable/dports/devel/zeitgeist/files/patch-libzeitgeist-Makefile.am.diff	                        (rev 0)
+++ users/devans/GNOME-3/stable/dports/devel/zeitgeist/files/patch-libzeitgeist-Makefile.am.diff	2014-05-31 19:35:59 UTC (rev 120529)
@@ -0,0 +1,13 @@
+=== modified file 'libzeitgeist/Makefile.am'
+--- libzeitgeist/Makefile.am	2013-03-18 12:56:51 +0000
++++ libzeitgeist/Makefile.am	2014-01-27 21:45:42 +0000
+@@ -186,7 +186,7 @@
+ # We have to extract our own dlname from libzeitgeist-2.0.la; see bgo#658002.
+ # This is what g-ir-scanner does.
+ libzeitgeist_dlname = \
+-	`$(SED) -n "s/^dlname='\([A-Za-z0-9.+-]\+\)'/\1/p" libzeitgeist-2.0.la`
++	`$(SED) -n "s/^dlname='\([A-Za-z0-9.+-]\{1,\}\)'/\1/p" libzeitgeist-2.0.la`
+ 
+ if HAVE_INTROSPECTION
+ libzeitgeist_2_0_gir_VALASOURCES = \
+


Property changes on: users/devans/GNOME-3/stable/dports/gnome/geocode-glib
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/mld-qt-481/dports/gnome/geocode-glib:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/gnome/geocode-glib:116274-119100
/users/rmstonecipher/gnome/geocode-glib:102363-103172
   + /branches/mld-qt-481/dports/gnome/geocode-glib:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/gnome/geocode-glib:116274-120528
/users/rmstonecipher/gnome/geocode-glib:102363-103172

Modified: users/devans/GNOME-3/stable/dports/gnome/geocode-glib/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/geocode-glib/Portfile	2014-05-31 18:49:05 UTC (rev 120528)
+++ users/devans/GNOME-3/stable/dports/gnome/geocode-glib/Portfile	2014-05-31 19:35:59 UTC (rev 120529)
@@ -49,4 +49,10 @@
 configure.args      --enable-introspection=yes \
                     --disable-silent-rules
 
+platform darwin 8 {
+    # The rules enabled by gobject-introspection require GNU make 3.81+
+    depends_build-append    port:gmake
+    build.cmd               ${prefix}/bin/gmake
+}
+
 livecheck.type      gnome


Property changes on: users/devans/GNOME-3/stable/dports/gnome/gjs
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/mld-qt-481/dports/gnome/gjs:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/gnome/gjs:116275-119077
/users/rmstonecipher/gnome/gjs:102363-103172
   + /branches/mld-qt-481/dports/gnome/gjs:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/gnome/gjs:116275-120528
/users/rmstonecipher/gnome/gjs:102363-103172

Modified: users/devans/GNOME-3/stable/dports/gnome/gjs/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gjs/Portfile	2014-05-31 18:49:05 UTC (rev 120528)
+++ users/devans/GNOME-3/stable/dports/gnome/gjs/Portfile	2014-05-31 19:35:59 UTC (rev 120529)
@@ -41,10 +41,7 @@
 
 # Blacklist needs to match mozjs24:
 # /opt/local/include/mozjs-24/mozilla/Compiler.h:22:4: error: #error "mfbt (and Gecko) require at least gcc 4.4 to build."
-# blacklist macports-clang-3.3 which breaks build when linking C++ by passing -export_dynamic to ld
-# add macports-clang-3.4 which builds correctly to fallback list
-compiler.blacklist  *gcc* {clang < 300} macports-clang-3.3
-compiler.fallback-append macports-clang-3.4
+compiler.blacklist  *gcc* {clang < 300}
 
 configure.args  --disable-silent-rules
 


Property changes on: users/devans/GNOME-3/stable/dports/gnome/gtk3
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/mld-qt-481/dports/gnome/gtk3:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/users/rmstonecipher/gnome/gtk3:102363-103172
   + /branches/mld-qt-481/dports/gnome/gtk3:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/gnome/gtk3:119527-120528
/users/rmstonecipher/gnome/gtk3:102363-103172

Modified: users/devans/GNOME-3/stable/dports/gnome/gtk3/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gtk3/Portfile	2014-05-31 18:49:05 UTC (rev 120528)
+++ users/devans/GNOME-3/stable/dports/gnome/gtk3/Portfile	2014-05-31 19:35:59 UTC (rev 120529)
@@ -36,6 +36,9 @@
                     ftp://ftp.gtk.org/pub/gtk/${branch}/ \
                     http://ftp.gtk.org/pub/gtk/${branch}/
 
+# See http://trac.macports.org/ticket/43283
+patchfiles          patch-backingScaleFactor.diff
+
 minimum_xcodeversions {9 3.1}
 depends_build       port:pkgconfig
 


Property changes on: users/devans/GNOME-3/stable/dports/gnome/libsoup
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/mld-qt-481/dports/gnome/libsoup:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/gnome/libsoup:116350-120049
/users/rmstonecipher/gnome/libsoup:102363-103172
   + /branches/mld-qt-481/dports/gnome/libsoup:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/gnome/libsoup:116350-120528
/users/rmstonecipher/gnome/libsoup:102363-103172

Modified: users/devans/GNOME-3/stable/dports/gnome/libsoup/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/libsoup/Portfile	2014-05-31 18:49:05 UTC (rev 120528)
+++ users/devans/GNOME-3/stable/dports/gnome/libsoup/Portfile	2014-05-31 19:35:59 UTC (rev 120529)
@@ -70,7 +70,7 @@
 
 platform darwin 8 {
     # The rules enabled by gobject-introspection require GNU make 3.81+
-    depends_run-append      port:gmake
+    depends_build-append    port:gmake
     build.cmd               ${prefix}/bin/gmake
 }

    

devans＠macports.org

tags

participants (1)