[127775] users/devans/GNOME-3/stable/dports
devans at macports.org
devans at macports.org
Mon Nov 3 13:41:42 PST 2014
Revision: 127775
https://trac.macports.org/changeset/127775
Author: devans at macports.org
Date: 2014-11-03 13:41:42 -0800 (Mon, 03 Nov 2014)
Log Message:
-----------
GNOME-3/stable: sync with trunk.
Modified Paths:
--------------
users/devans/GNOME-3/stable/dports/devel/glib2/Portfile
users/devans/GNOME-3/stable/dports/gnome/adwaita-icon-theme/Portfile
users/devans/GNOME-3/stable/dports/gnome/alacarte/Portfile
users/devans/GNOME-3/stable/dports/gnome/glom/Portfile
users/devans/GNOME-3/stable/dports/gnome/gnome-common/Portfile
users/devans/GNOME-3/stable/dports/gnome/gnome-desktop/Portfile
users/devans/GNOME-3/stable/dports/gnome/gnumeric/Portfile
users/devans/GNOME-3/stable/dports/gnome/gstreamer1-gst-plugins-ugly/Portfile
Added Paths:
-----------
users/devans/GNOME-3/stable/dports/devel/glib2/files/patch-gmodule-gmodule-dl.c.diff
users/devans/GNOME-3/stable/dports/devel/glib2/files/yosemite-symbol-lookup.patch
Property Changed:
----------------
users/devans/GNOME-3/stable/dports/devel/glib2/
users/devans/GNOME-3/stable/dports/gnome/adwaita-icon-theme/
users/devans/GNOME-3/stable/dports/gnome/alacarte/
users/devans/GNOME-3/stable/dports/gnome/glom/
users/devans/GNOME-3/stable/dports/gnome/gnome-common/
users/devans/GNOME-3/stable/dports/gnome/gnome-desktop/
users/devans/GNOME-3/stable/dports/gnome/gnumeric/
users/devans/GNOME-3/stable/dports/gnome/gstreamer1-gst-plugins-ugly/
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-126482
/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-127772
/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-03 21:36:21 UTC (rev 127774)
+++ users/devans/GNOME-3/stable/dports/devel/glib2/Portfile 2014-11-03 21:41:42 UTC (rev 127775)
@@ -11,6 +11,7 @@
conflicts glib2-devel
set my_name glib
version 2.42.0
+revision 1
set branch [join [lrange [split ${version} .] 0 1] .]
categories devel
maintainers ryandesign openmaintainer
@@ -42,7 +43,9 @@
patch-gi18n.h.diff \
patch-gio_xdgmime_xdgmime.c.diff \
patch-gio_gdbusprivate.c.diff \
- patch-get-launchd-dbus-session-address.diff
+ patch-get-launchd-dbus-session-address.diff \
+ patch-gmodule-gmodule-dl.c.diff \
+ yosemite-symbol-lookup.patch
depends_build bin:xmllint:libxml2
Copied: users/devans/GNOME-3/stable/dports/devel/glib2/files/patch-gmodule-gmodule-dl.c.diff (from rev 127772, trunk/dports/devel/glib2/files/patch-gmodule-gmodule-dl.c.diff)
===================================================================
--- users/devans/GNOME-3/stable/dports/devel/glib2/files/patch-gmodule-gmodule-dl.c.diff (rev 0)
+++ users/devans/GNOME-3/stable/dports/devel/glib2/files/patch-gmodule-gmodule-dl.c.diff 2014-11-03 21:41:42 UTC (rev 127775)
@@ -0,0 +1,30 @@
+--- gmodule/gmodule-dl.c.orig 2014-07-04 16:59:10.000000000 -0700
++++ gmodule/gmodule-dl.c 2014-11-03 10:53:31.000000000 -0800
+@@ -126,16 +126,18 @@ static void
+ _g_module_close (gpointer handle,
+ gboolean is_unref)
+ {
+- /* are there any systems out there that have dlopen()/dlclose()
+- * without a reference count implementation?
++ /* Intentionally not dlclose()ing because it is safer to leave the library
++ * loaded in memory than to close it and possibly leave dangling pointers
++ * to things like atexit handlers, atfork handlers, blocks, etc.
++ *
++ * See https://trac.macports.org/ticket/45309 for an example from when
++ * a library used by a module added a new dependency which had an
++ * initializer which added a child atfork handler. The result is that
++ * after closing the module, the system had a dangling pointer for the
++ * atfork handler which would at best crash on the child side of fork()
++ * and at worst lead to arbitray code execution of whatever happened to be
++ * at that location in memory at a later time in the process.
+ */
+- is_unref |= 1;
+-
+- if (is_unref)
+- {
+- if (dlclose (handle) != 0)
+- g_module_set_error (fetch_dlerror (TRUE));
+- }
+ }
+
+ static gpointer
Copied: users/devans/GNOME-3/stable/dports/devel/glib2/files/yosemite-symbol-lookup.patch (from rev 127772, trunk/dports/devel/glib2/files/yosemite-symbol-lookup.patch)
===================================================================
--- users/devans/GNOME-3/stable/dports/devel/glib2/files/yosemite-symbol-lookup.patch (rev 0)
+++ users/devans/GNOME-3/stable/dports/devel/glib2/files/yosemite-symbol-lookup.patch 2014-11-03 21:41:42 UTC (rev 127775)
@@ -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' ;;
Property changes on: users/devans/GNOME-3/stable/dports/gnome/adwaita-icon-theme
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/dports/gnome/adwaita-icon-theme:126100-126282
/users/devans/GNOME-3/stable/dports/gnome/adwaita-icon-theme:126096
+ /trunk/dports/gnome/adwaita-icon-theme:126100-127622
/users/devans/GNOME-3/stable/dports/gnome/adwaita-icon-theme:126096
Modified: users/devans/GNOME-3/stable/dports/gnome/adwaita-icon-theme/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/adwaita-icon-theme/Portfile 2014-11-03 21:36:21 UTC (rev 127774)
+++ users/devans/GNOME-3/stable/dports/gnome/adwaita-icon-theme/Portfile 2014-11-03 21:41:42 UTC (rev 127775)
@@ -4,7 +4,7 @@
PortSystem 1.0
name adwaita-icon-theme
-version 3.14.0
+version 3.14.1
set branch [join [lrange [split ${version} .] 0 1] .]
categories gnome
maintainers devans openmaintainer
@@ -20,8 +20,8 @@
use_xz yes
-checksums rmd160 4eed31c91347692089d5d35239ffb0af2a9a9412 \
- sha256 afacb6025a18be007e33a9663b92cee9d2745279bb00107a68e09b2806f9541f
+checksums rmd160 bb63375d0be862c7fc4790bd09b0c6f764444383 \
+ sha256 b776a7ad58c97f4c1ede316e44d8d054105429cb4e3a8ec46616a14b11df48ee
depends_build port:pkgconfig \
port:intltool \
Property changes on: users/devans/GNOME-3/stable/dports/gnome/alacarte
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/mld-qt-481/dports/gnome/alacarte:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/gnome/alacarte:108271-119100
/users/devans/GNOME-3/unstable/dports/gnome/alacarte:117866-118151
/users/rmstonecipher/gnome/alacarte:102363-103172
+ /branches/mld-qt-481/dports/gnome/alacarte:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/gnome/alacarte:108271-127773
/users/devans/GNOME-3/unstable/dports/gnome/alacarte:117866-118151
/users/rmstonecipher/gnome/alacarte:102363-103172
Modified: users/devans/GNOME-3/stable/dports/gnome/alacarte/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/alacarte/Portfile 2014-11-03 21:36:21 UTC (rev 127774)
+++ users/devans/GNOME-3/stable/dports/gnome/alacarte/Portfile 2014-11-03 21:41:42 UTC (rev 127775)
@@ -5,6 +5,7 @@
name alacarte
version 3.11.91
+revision 1
epoch 1
license GPL-2+
set branch [join [lrange [split ${version} .] 0 1] .]
@@ -33,7 +34,8 @@
depends_lib port:desktop-file-utils \
port:gtk3 \
- port:gnome-menus
+ port:gnome-menus \
+ port:py27-gobject3
depends_run port:gnome-settings-daemon \
port:yelp
@@ -48,32 +50,18 @@
use_autoreconf yes
autoreconf.args -fvi
+# python3 is not supported
+
+configure.python ${prefix}/bin/python2.7
+set python_prefix ${frameworks_dir}/Python.framework/Versions/2.7
+configure.pkg_config_path ${python_prefix}/lib/pkgconfig
+
configure.args --disable-silent-rules
post-destroot {
move ${destroot}${prefix}/bin/alacarte.py ${destroot}${prefix}/bin/alacarte
}
-# python3 is not supported
-
-variant python26 description {Use python 2.6} {
- depends_lib-append port:py26-gobject3
- configure.python ${prefix}/bin/python2.6
- set python_prefix ${frameworks_dir}/Python.framework/Versions/2.6
- configure.pkg_config_path ${python_prefix}/lib/pkgconfig
-}
-
-variant python27 description {Use python 2.7} {
- depends_lib-append port:py27-gobject3
- configure.python ${prefix}/bin/python2.7
- set python_prefix ${frameworks_dir}/Python.framework/Versions/2.7
- configure.pkg_config_path ${python_prefix}/lib/pkgconfig
-}
-
-if {![variant_isset python26]} {
- default_variants +python27
-}
-
notes "
Be sure to set the following environment variables:
Property changes on: users/devans/GNOME-3/stable/dports/gnome/glom
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/mld-qt-481/dports/gnome/glom:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/gnome/glom:121763-123544
/users/devans/GNOME-3/unstable/dports/gnome/glom:121774-125977
/users/rmstonecipher/gnome/glom:102363-103172
+ /branches/mld-qt-481/dports/gnome/glom:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/gnome/glom:121763-127773
/users/devans/GNOME-3/unstable/dports/gnome/glom:121774-125977
/users/rmstonecipher/gnome/glom:102363-103172
Modified: users/devans/GNOME-3/stable/dports/gnome/glom/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/glom/Portfile 2014-11-03 21:36:21 UTC (rev 127774)
+++ users/devans/GNOME-3/stable/dports/gnome/glom/Portfile 2014-11-03 21:41:42 UTC (rev 127775)
@@ -16,7 +16,6 @@
platforms darwin
homepage http://www.glom.org/
-#master_sites https://git.gnome.org/browse/glom/snapshot
master_sites gnome:sources/${name}/${branch}/
use_xz yes
@@ -32,7 +31,7 @@
port:itstool \
port:yelp-tools \
port:mm-common \
- port:graphviz \
+ path:bin/dot:graphviz \
port:doxygen \
port:libxslt \
port:py27-sphinx
@@ -92,9 +91,15 @@
system "${prefix}/bin/update-mime-database ${prefix}/share/mime"
}
+# locale issues apparently only effect OS X 10.8 and earlier.
+
+if {${os.major} < 12} {
+
notes "
To work around known locale issues, set LANG=C when starting glom
$ LANG=C glom
"
+}
+
livecheck.type gnome
Property changes on: users/devans/GNOME-3/stable/dports/gnome/gnome-common
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/mld-qt-481/dports/gnome/gnome-common:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/users/rmstonecipher/gnome/gnome-common:102363-103172
+ /branches/mld-qt-481/dports/gnome/gnome-common:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/gnome/gnome-common:118190-127773
/users/rmstonecipher/gnome/gnome-common:102363-103172
Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-common/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome-common/Portfile 2014-11-03 21:36:21 UTC (rev 127774)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-common/Portfile 2014-11-03 21:41:42 UTC (rev 127775)
@@ -13,6 +13,8 @@
installs_libs no
supported_archs noarch
+conflicts autoconf-archive
+
description Files that should be in pretty much every GNOME application.
long_description \
Property changes on: users/devans/GNOME-3/stable/dports/gnome/gnome-desktop
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/dports/gnome/gnome-desktop:108265-119077
/users/devans/GNOME-3/unstable/dports/gnome/gnome-desktop:116416-118152,119624-125621
+ /trunk/dports/gnome/gnome-desktop:108265-127772
/users/devans/GNOME-3/unstable/dports/gnome/gnome-desktop:116416-118152,119624-125621
Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-desktop/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome-desktop/Portfile 2014-11-03 21:36:21 UTC (rev 127774)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-desktop/Portfile 2014-11-03 21:41:42 UTC (rev 127775)
@@ -62,6 +62,10 @@
--x-includes=${prefix}/include \
--x-libraries=${prefix}/lib
+# 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}"
+
#
# portions of this port are strictly X11 specific
# so a +quartz build is not possible (fails in configure if X11 is absent)
@@ -71,4 +75,10 @@
system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
}
+# The rules enabled by gobject-introspection require GNU make 3.81+
+platform darwin 8 {
+ depends_build-append port:gmake
+ build.cmd ${prefix}/bin/gmake
+}
+
livecheck.type gnome
Property changes on: users/devans/GNOME-3/stable/dports/gnome/gnumeric
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/mld-qt-481/dports/gnome/gnumeric:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/gnome/gnumeric:125979-126617
/users/rmstonecipher/gnome/gnumeric:102363-103172
+ /branches/mld-qt-481/dports/gnome/gnumeric:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/gnome/gnumeric:125979-127773
/users/rmstonecipher/gnome/gnumeric:102363-103172
Modified: users/devans/GNOME-3/stable/dports/gnome/gnumeric/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnumeric/Portfile 2014-11-03 21:36:21 UTC (rev 127774)
+++ users/devans/GNOME-3/stable/dports/gnome/gnumeric/Portfile 2014-11-03 21:41:42 UTC (rev 127775)
@@ -6,6 +6,7 @@
name gnumeric
version 1.12.18
+revision 1
set branch [join [lrange [split ${version} .] 0 1] .]
license GPL-2+
@@ -50,7 +51,8 @@
configure.args --disable-silent-rules \
--disable-schemas-compile \
--enable-introspection \
- --without-gda
+ --without-gda \
+ --without-python
# gobject-introspection uses g-ir-scanner, which uses $CC from env
build.args-append CC="${configure.cc} ${configure.cc_archflags}"
@@ -60,23 +62,15 @@
configure.args-replace --without-gda --with-gda
}
-variant python26 conflicts python27 description {Use python 2.6} {
- configure.python ${prefix}/bin/python2.6
- depends_lib-append port:py26-gobject3
- set python_framework ${frameworks_dir}/Python.framework/Versions/2.6
- configure.pkg_config_path ${python_framework}/lib/pkgconfig
-}
-
-variant python27 conflicts python26 description {Use python 2.7} {
+variant python27 description {Build Python plugin loader using python 2.7} {
configure.python ${prefix}/bin/python2.7
+ configure.args-replace --without-python --with-python
depends_lib-append port:py27-gobject3
set python_framework ${frameworks_dir}/Python.framework/Versions/2.7
configure.pkg_config_path ${python_framework}/lib/pkgconfig
}
-if {![variant_isset python26]} {
- default_variants +python27
-}
+default_variants +python27
post-activate {
system "${prefix}/bin/scrollkeeper-update"
Property changes on: users/devans/GNOME-3/stable/dports/gnome/gstreamer1-gst-plugins-ugly
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/mld-qt-481/dports/gnome/gstreamer1-gst-plugins-ugly:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/gnome/gstreamer1-gst-plugins-ugly:125773-126619
/users/rmstonecipher/gnome/gstreamer1-gst-plugins-ugly:102363-103172
+ /branches/mld-qt-481/dports/gnome/gstreamer1-gst-plugins-ugly:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/gnome/gstreamer1-gst-plugins-ugly:125773-127773
/users/rmstonecipher/gnome/gstreamer1-gst-plugins-ugly:102363-103172
Modified: users/devans/GNOME-3/stable/dports/gnome/gstreamer1-gst-plugins-ugly/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gstreamer1-gst-plugins-ugly/Portfile 2014-11-03 21:36:21 UTC (rev 127774)
+++ users/devans/GNOME-3/stable/dports/gnome/gstreamer1-gst-plugins-ugly/Portfile 2014-11-03 21:41:42 UTC (rev 127775)
@@ -9,6 +9,7 @@
name gstreamer1-gst-plugins-ugly
set my_name gst-plugins-ugly
version 1.4.3
+revision 1
description \
A set of good-quality plug-ins for GStreamer that might pose distribution \
problems.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141103/72e18f99/attachment-0001.html>
More information about the macports-changes
mailing list