[116271] users/devans/GNOME-3/unstable/dports/gnome
devans at macports.org
devans at macports.org
Thu Jan 23 09:32:19 PST 2014
Revision: 116271
https://trac.macports.org/changeset/116271
Author: devans at macports.org
Date: 2014-01-23 09:32:19 -0800 (Thu, 23 Jan 2014)
Log Message:
-----------
GNOME-3/unstable/dports: sync with stable, update various GNOME ports to latest unstable version.
* gnome/epiphany version 3.11.3
* gnome/evince version 3.11.3
* gnome/evolution-data-server version 3.11.4
* gnome/file-roller version 3.11.4
* gnome/gdm version 3.11.4
* gnome/gedit version 3.11.2
* gnome-online-accounts version 3.11.4
* gnome-system-monitor version 3.11.4
* gnome/gtksourceview3 version 3.11.3
* gnome/yelp version 3.11.1
* gnome/yelp-tools version 3.11.3
* gnome/yelp-xsl version 3.11.4
Modified Paths:
--------------
users/devans/GNOME-3/unstable/dports/gnome/epiphany/Portfile
users/devans/GNOME-3/unstable/dports/gnome/evince/Portfile
users/devans/GNOME-3/unstable/dports/gnome/evolution-data-server/Portfile
users/devans/GNOME-3/unstable/dports/gnome/evolution-data-server/files/patch-configure.ac.diff
users/devans/GNOME-3/unstable/dports/gnome/file-roller/Portfile
users/devans/GNOME-3/unstable/dports/gnome/gdm/Portfile
users/devans/GNOME-3/unstable/dports/gnome/gedit/Portfile
users/devans/GNOME-3/unstable/dports/gnome/gedit/files/patch-configure.diff
users/devans/GNOME-3/unstable/dports/gnome/gnome-online-accounts/Portfile
users/devans/GNOME-3/unstable/dports/gnome/gnome-online-accounts/files/patch-return-val-if-fail.diff
users/devans/GNOME-3/unstable/dports/gnome/gnome-system-monitor/Portfile
users/devans/GNOME-3/unstable/dports/gnome/gtksourceview3/Portfile
users/devans/GNOME-3/unstable/dports/gnome/yelp/Portfile
users/devans/GNOME-3/unstable/dports/gnome/yelp-tools/Portfile
users/devans/GNOME-3/unstable/dports/gnome/yelp-xsl/Portfile
Added Paths:
-----------
users/devans/GNOME-3/unstable/dports/gnome/gdm/files/patch-daemon-gdm-session-worker.c.diff
users/devans/GNOME-3/unstable/dports/gnome/gtksourceview3/
Removed Paths:
-------------
users/devans/GNOME-3/unstable/dports/gnome/gnome-system-monitor/files/patch-src_openfiles.cpp.diff
users/devans/GNOME-3/unstable/dports/gnome/gtksourceview3/
Property Changed:
----------------
users/devans/GNOME-3/unstable/dports/gnome/epiphany/
users/devans/GNOME-3/unstable/dports/gnome/evince/
users/devans/GNOME-3/unstable/dports/gnome/evolution-data-server/
users/devans/GNOME-3/unstable/dports/gnome/file-roller/
users/devans/GNOME-3/unstable/dports/gnome/gdm/
users/devans/GNOME-3/unstable/dports/gnome/gedit/
users/devans/GNOME-3/unstable/dports/gnome/gnome-online-accounts/
users/devans/GNOME-3/unstable/dports/gnome/gnome-system-monitor/
users/devans/GNOME-3/unstable/dports/gnome/yelp/
users/devans/GNOME-3/unstable/dports/gnome/yelp-tools/
users/devans/GNOME-3/unstable/dports/gnome/yelp-xsl/
Property changes on: users/devans/GNOME-3/unstable/dports/gnome/epiphany
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/mld-qt-481/dports/gnome/epiphany:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/gnome/epiphany:108265-114987
/users/devans/GNOME-3/stable/dports/gnome/epiphany:114069-116230
/users/rmstonecipher/gnome/epiphany:102363-103172
Modified: users/devans/GNOME-3/unstable/dports/gnome/epiphany/Portfile
===================================================================
--- users/devans/GNOME-3/unstable/dports/gnome/epiphany/Portfile 2014-01-23 17:31:25 UTC (rev 116270)
+++ users/devans/GNOME-3/unstable/dports/gnome/epiphany/Portfile 2014-01-23 17:32:19 UTC (rev 116271)
@@ -4,7 +4,7 @@
PortSystem 1.0
name epiphany
-version 3.10.2
+version 3.11.3
license GPL-2+
set branch [join [lrange [split ${version} .] 0 1] .]
description A GNOME Web browser.
@@ -16,13 +16,13 @@
maintainers devans openmaintainer
categories gnome www
platforms darwin
-homepage http://www.gnome.org/projects/${name}
+homepage https://wiki.gnome.org/Apps/Web
master_sites gnome:sources/${name}/${branch}/
use_xz yes
-checksums rmd160 1cce6919dcda2fedd269fa14d099c106707f0691 \
- sha256 7788221f775605ab29b26b92f4907ca9d5e8cf7999d103697a5979228d5fdd47
+checksums rmd160 d42d6898fddc74417be4c88a5b75853af25edc48 \
+ sha256 fcb513d099eb00cfe366393f52c8aabc4d86819c176a23da18d65ce79e96194a
depends_build port:pkgconfig \
port:intltool
@@ -31,7 +31,7 @@
port:gnome-icon-theme \
port:gnome-icon-theme-symbolic \
port:gtk3 \
- port:webkit-gtk3 \
+ path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3 \
port:gnome-desktop \
port:libxslt\
port:libsoup \
@@ -48,6 +48,26 @@
depends_run port:gnome-settings-daemon
+platform darwin {
+ set cxx_stdlib {}
+
+ if {[info exists configure.cxx_stdlib] &&
+ ${configure.cxx_stdlib} ne {} &&
+ [string match *clang* ${configure.cxx}]} {
+ set cxx_stdlib ${configure.cxx_stdlib}
+ } elseif {[string match *clang* ${configure.cxx}] &&
+ ${os.major} >= 13} {
+ set cxx_stdlib libc++
+ } else {
+ set cxx_stdlib libstdc++
+ }
+
+ if {${cxx_stdlib} eq "libstdc++"} {
+ depends_lib-delete path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3
+ depends_lib-append path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3-2.0
+ }
+}
+
configure.cflags-append -Wno-format-nonliteral
configure.args --with-distributor-name=MacPorts \
Property changes on: users/devans/GNOME-3/unstable/dports/gnome/evince
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/dports/gnome/evince:108270-111023
+ /trunk/dports/gnome/evince:108265-116177
/users/devans/GNOME-3/stable/dports/gnome/evince:114069-116230
Modified: users/devans/GNOME-3/unstable/dports/gnome/evince/Portfile
===================================================================
--- users/devans/GNOME-3/unstable/dports/gnome/evince/Portfile 2014-01-23 17:31:25 UTC (rev 116270)
+++ users/devans/GNOME-3/unstable/dports/gnome/evince/Portfile 2014-01-23 17:32:19 UTC (rev 116271)
@@ -4,7 +4,7 @@
PortSystem 1.0
name evince
-version 3.11.1
+version 3.11.3
license GPL-2+
set branch [join [lrange [split ${version} .] 0 1] .]
description Evince is a document viewer for multiple document formats like pdf, and many others.
@@ -13,18 +13,19 @@
maintainers devans openmaintainer
categories gnome print
platforms darwin
-homepage http://projects.gnome.org/evince/
+homepage https://wiki.gnome.org/Apps/Evince
master_sites gnome:sources/${name}/${branch}/
use_xz yes
-checksums rmd160 5bb09496f038ae05b1c816a18a9c42dd594e8eb1 \
- sha256 281709a051c10d0375b6dddd3d6cdd3785b3cd8552c791a6873358bcf7eed461
+checksums rmd160 639791ca04b36c42e1b2b4ceea980bb2e2ea6bad \
+ sha256 3c449e6921085a19532e12e2680aae50a99c6f219df7aa071aecaee9d8943086
depends_skip_archcheck gnome-settings-daemon
depends_build port:pkgconfig \
port:intltool \
+ port:yelp-tools \
port:itstool
depends_lib port:desktop-file-utils \
@@ -62,6 +63,10 @@
--enable-comics \
--enable-t1lib
+# Teach glibtool about -stdlib=libc++
+use_autoreconf yes
+autoreconf.args -fvi
+
variant djvu description {Support for djvu documents using djvulibre} {
configure.args-replace --disable-djvu --enable-djvu
depends_lib-append port:djvulibre
Property changes on: users/devans/GNOME-3/unstable/dports/gnome/evolution-data-server
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/dports/gnome/evolution-data-server:108265-111631
+ /trunk/dports/gnome/evolution-data-server:108265-116176
/users/devans/GNOME-3/stable/dports/gnome/evolution-data-server:114069-116236
Modified: users/devans/GNOME-3/unstable/dports/gnome/evolution-data-server/Portfile
===================================================================
--- users/devans/GNOME-3/unstable/dports/gnome/evolution-data-server/Portfile 2014-01-23 17:31:25 UTC (rev 116270)
+++ users/devans/GNOME-3/unstable/dports/gnome/evolution-data-server/Portfile 2014-01-23 17:32:19 UTC (rev 116271)
@@ -1,11 +1,10 @@
# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
# $Id$
-PortSystem 1.0
+PortSystem 1.0
name evolution-data-server
-version 3.10.2
-revision 1
+version 3.11.4
set branch [join [lrange [split ${version} .] 0 1] .]
description Addressbook and calender libs for GNOME.
long_description Evolution Data Server provides a central location for \
@@ -14,13 +13,13 @@
categories gnome
license LGPL-2+
platforms darwin
-homepage http://www.gnome.org/
+homepage https://wiki.gnome.org/Apps/Evolution
master_sites gnome:sources/${name}/${branch}/
use_xz yes
-checksums rmd160 cee85c27208f10fda082b86f3c1aa84f0b12d77f \
- sha256 0f384d18811515e2e73d6e8683a440559cef495637b94fecfb10e6ff0283ecb9
+checksums rmd160 95645a0b0971b0d2e620caa615d248c20ae81940 \
+ sha256 a0fdb2258b70555f8d54c1b9c517bc973d5f00a4b7a25c6ae3b38f178f69249c
depends_build port:pkgconfig \
port:gnome-common \
@@ -41,7 +40,8 @@
port:gnome-online-accounts \
port:gobject-introspection \
port:sqlite3 \
- port:vala
+ port:vala \
+ port:db46
patchfiles patch-configure.ac.diff \
patch-calendar-libedata-cal-e-cal-backend-intervaltree.c.diff \
@@ -50,6 +50,10 @@
use_autoreconf yes
autoreconf.args -fvi
+configure.env-append \
+ DB_CFLAGS="-I${prefix}/include/db46" \
+ DB_LIBS="-L${prefix}/lib/db46 -ldb"
+
configure.args --enable-smime \
--enable-ipv6 \
--enable-nntp \
@@ -73,6 +77,10 @@
universal_variant no
+# 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 phonenumber description {Phone number parsing/validation using libphonenumber} {
depends_lib-append port:libphonenumber-cpp
configure.cxxflags-append -DI18N_PHONENUMBERS_USE_BOOST
Modified: users/devans/GNOME-3/unstable/dports/gnome/evolution-data-server/files/patch-configure.ac.diff
===================================================================
--- users/devans/GNOME-3/unstable/dports/gnome/evolution-data-server/files/patch-configure.ac.diff 2014-01-23 17:31:25 UTC (rev 116270)
+++ users/devans/GNOME-3/unstable/dports/gnome/evolution-data-server/files/patch-configure.ac.diff 2014-01-23 17:32:19 UTC (rev 116271)
@@ -1,6 +1,6 @@
---- configure.ac.orig 2013-04-16 15:56:55.000000000 -0700
-+++ configure.ac 2013-08-24 15:28:59.000000000 -0700
-@@ -345,8 +345,8 @@
+--- configure.ac.orig 2014-01-08 12:49:10.000000000 -0800
++++ configure.ac 2014-01-21 22:10:12.000000000 -0800
+@@ -317,8 +317,8 @@
dnl This must appear after AC_CANONICAL_HOST, which defines $host.
case "$host" in
@@ -11,14 +11,3 @@
;;
*)
LDFLAGS="$LDFLAGS -Wl,--no-undefined"
-@@ -557,8 +557,8 @@
- [Prefix where libdb is installed]),
- [libdb_prefix="$withval"], [libdb_prefix='${prefix}'])
-
--DB_CFLAGS="-I$libdb_prefix/include"
--DB_LIBS="-L$libdb_prefix/lib -ldb"
-+DB_CFLAGS="-I$prefix/include/db46"
-+DB_LIBS="-L$prefix/lib/db46 -ldb"
-
- AC_MSG_CHECKING([Berkeley DB])
- save_cflags=$CFLAGS; CFLAGS=$DB_CFLAGS
Property changes on: users/devans/GNOME-3/unstable/dports/gnome/file-roller
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/dports/gnome/file-roller:108270-111024
+ /trunk/dports/gnome/file-roller:108265-116177
/users/devans/GNOME-3/stable/dports/gnome/file-roller:114069-116236
Modified: users/devans/GNOME-3/unstable/dports/gnome/file-roller/Portfile
===================================================================
--- users/devans/GNOME-3/unstable/dports/gnome/file-roller/Portfile 2014-01-23 17:31:25 UTC (rev 116270)
+++ users/devans/GNOME-3/unstable/dports/gnome/file-roller/Portfile 2014-01-23 17:32:19 UTC (rev 116271)
@@ -4,7 +4,7 @@
PortSystem 1.0
name file-roller
-version 3.10.2.1
+version 3.11.4
license GPL-2+
set branch [join [lrange [split ${version} .] 0 1] .]
description An archive manager for GNOME
@@ -18,13 +18,13 @@
maintainers devans openmaintainer
categories gnome
platforms darwin
-homepage http://fileroller.sourceforge.net/
+homepage https://wiki.gnome.org/Apps/FileRoller
master_sites gnome:sources/${name}/${branch}/
use_xz yes
-checksums rmd160 9e5df7f8d6e2bc93bbeefff2908bf43365393cb4 \
- sha256 fde1104103df71c126e759089f12dc7fa25ec642308649e87d542ee7c3276790
+checksums rmd160 1f558b862cc3d85fb73953e1b7d57590cf4f7215 \
+ sha256 b6218820787ffdef1d5476c1ca15672b10bf87e769d2a60efbe637f53e8f606e
depends_build port:pkgconfig \
port:intltool \
Property changes on: users/devans/GNOME-3/unstable/dports/gnome/gdm
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/mld-qt-481/dports/gnome/gdm:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/gnome/gdm:108265-114987
/users/devans/GNOME-3/stable/dports/gnome/gdm:114069-116236
/users/rmstonecipher/gnome/gdm:102363-103172
Modified: users/devans/GNOME-3/unstable/dports/gnome/gdm/Portfile
===================================================================
--- users/devans/GNOME-3/unstable/dports/gnome/gdm/Portfile 2014-01-23 17:31:25 UTC (rev 116270)
+++ users/devans/GNOME-3/unstable/dports/gnome/gdm/Portfile 2014-01-23 17:32:19 UTC (rev 116271)
@@ -7,7 +7,7 @@
PortSystem 1.0
name gdm
-version 3.10.0.1
+version 3.11.4
license GPL-2
set branch [join [lrange [split ${version} .] 0 1] .]
description The Gnome Display Manager is a re-implementation of the well known xdm program.
@@ -17,16 +17,17 @@
maintainers nomaintainer
categories gnome
platforms darwin
-homepage http://www.gnome.org/
+homepage https://wiki.gnome.org/Projects/GDM
master_sites gnome:sources/${name}/${branch}/
use_xz yes
-checksums rmd160 3e4839d56165e2f68451374d89d70986f5e247a1 \
- sha256 549a42009af9c79a4e07632e405dcb71ba2e876e766cff02471511ad641b6ae7
+checksums rmd160 1c9e31b51e68347fbbcb55a281e26afcddbf9679 \
+ sha256 efd7dbd64c4361991e5d796f618fe88a5ce090d879e26b0a90cc8fec48fc90ff
depends_build port:pkgconfig \
- port:intltool
+ port:intltool \
+ port:itstool
depends_lib port:desktop-file-utils \
port:gtk3 \
@@ -49,7 +50,8 @@
port:gnome-settings-daemon
patchfiles patch-configure.diff \
- patch-daemon-gdm-session.c.diff
+ patch-daemon-gdm-session.c.diff \
+ patch-daemon-gdm-session-worker.c.diff
post-patch {
reinplace "s|@MP_PREFIX@|${prefix}|" ${worksrcpath}/configure
Copied: users/devans/GNOME-3/unstable/dports/gnome/gdm/files/patch-daemon-gdm-session-worker.c.diff (from rev 116236, users/devans/GNOME-3/stable/dports/gnome/gdm/files/patch-daemon-gdm-session-worker.c.diff)
===================================================================
--- users/devans/GNOME-3/unstable/dports/gnome/gdm/files/patch-daemon-gdm-session-worker.c.diff (rev 0)
+++ users/devans/GNOME-3/unstable/dports/gnome/gdm/files/patch-daemon-gdm-session-worker.c.diff 2014-01-23 17:32:19 UTC (rev 116271)
@@ -0,0 +1,36 @@
+--- daemon/gdm-session-worker.c.orig 2013-12-18 13:49:21.000000000 -0800
++++ daemon/gdm-session-worker.c 2013-12-18 13:52:29.000000000 -0800
+@@ -740,6 +740,33 @@
+ return utf8;
+ }
+
++#ifdef __APPLE__
++#include <Availability.h>
++#if __MAC_OS_X_VERSION_MIN_REQUIRED <= 1060
++static char * strndup (char const *s, size_t n);
++static size_t strnlen (const char *string, size_t maxlen);
++
++static size_t
++strnlen (const char *string, size_t maxlen)
++{
++ const char *end = memchr (string, '\0', maxlen);
++ return end ? (size_t) (end - string) : maxlen;
++}
++
++static char *
++strndup (char const *s, size_t n)
++{
++ size_t len = strnlen (s, n);
++ char *new = malloc (len + 1);
++
++ if (new == NULL)
++ return NULL;
++
++ new[len] = '\0';
++ return memcpy (new, s, len);
++}
++#endif
++#endif
+ static gboolean
+ gdm_session_worker_process_pam_message (GdmSessionWorker *worker,
+ const struct pam_message *query,
Property changes on: users/devans/GNOME-3/unstable/dports/gnome/gedit
___________________________________________________________________
Added: svn:mergeinfo
+ /users/devans/GNOME-3/stable/dports/gnome/gedit:114069-116236
Modified: users/devans/GNOME-3/unstable/dports/gnome/gedit/Portfile
===================================================================
--- users/devans/GNOME-3/unstable/dports/gnome/gedit/Portfile 2014-01-23 17:31:25 UTC (rev 116270)
+++ users/devans/GNOME-3/unstable/dports/gnome/gedit/Portfile 2014-01-23 17:32:19 UTC (rev 116271)
@@ -4,7 +4,7 @@
PortSystem 1.0
name gedit
-version 3.10.2
+version 3.11.2
license GPL-2
set branch [join [lrange [split ${version} .] 0 1] .]
description GNOME editor.
@@ -13,13 +13,13 @@
maintainers devans openmaintainer
categories gnome editors
platforms darwin
-homepage http://www.gnome.org/projects/gedit/
+homepage https://wiki.gnome.org/Apps/Gedit
master_sites gnome:sources/${name}/${branch}/
use_xz yes
-checksums rmd160 1cb59a4259f208274ad48d409eba58bdc85030b4 \
- sha256 cc607f877fb925af5c9a71935c70fb76238a62bf133b163471369bd183f15b69
+checksums rmd160 b97679a9f57062d568165aa324a392b55657252e \
+ sha256 f8ce9e7645310fabf4d1e0941d75e9da08d454159c9f264684adf128829afe0b
depends_build port:pkgconfig \
port:intltool \
Modified: users/devans/GNOME-3/unstable/dports/gnome/gedit/files/patch-configure.diff
===================================================================
--- users/devans/GNOME-3/unstable/dports/gnome/gedit/files/patch-configure.diff 2014-01-23 17:31:25 UTC (rev 116270)
+++ users/devans/GNOME-3/unstable/dports/gnome/gedit/files/patch-configure.diff 2014-01-23 17:32:19 UTC (rev 116271)
@@ -1,6 +1,6 @@
---- configure.orig 2013-11-13 02:04:23.000000000 -0800
-+++ configure 2013-11-27 08:02:31.000000000 -0800
-@@ -16455,9 +16455,9 @@
+--- configure.orig 2013-12-20 08:15:32.000000000 -0800
++++ configure 2013-12-20 15:02:06.000000000 -0800
+@@ -16556,9 +16556,9 @@
Property changes on: users/devans/GNOME-3/unstable/dports/gnome/gnome-online-accounts
___________________________________________________________________
Added: svn:mergeinfo
+ /trunk/dports/gnome/gnome-online-accounts:113257-115773
/users/devans/GNOME-3/stable/dports/gnome/gnome-online-accounts:114069-116230
Modified: users/devans/GNOME-3/unstable/dports/gnome/gnome-online-accounts/Portfile
===================================================================
--- users/devans/GNOME-3/unstable/dports/gnome/gnome-online-accounts/Portfile 2014-01-23 17:31:25 UTC (rev 116270)
+++ users/devans/GNOME-3/unstable/dports/gnome/gnome-online-accounts/Portfile 2014-01-23 17:32:19 UTC (rev 116271)
@@ -4,7 +4,7 @@
PortSystem 1.0
name gnome-online-accounts
-version 3.10.2
+version 3.11.4
license LGPL-2
set branch [join [lrange [split ${version} .] 0 1] .]
description Single sign-on framework for GNOME
@@ -13,30 +13,53 @@
maintainers devans openmaintainer
categories gnome
platforms darwin
-homepage https://wiki.gnome.org/GnomeOnlineAccounts
+homepage https://wiki.gnome.org/Projects/GnomeOnlineAccounts
master_sites gnome:sources/${name}/${branch}/
use_xz yes
-checksums rmd160 73f3124a9d66863d9205ad9e53aa3c386b261215 \
- sha256 0b2418c1845337b6574a12d2075d319d8aaa5bbc4b0d1d123108c5da00e11b97
+checksums rmd160 599f96ec3ea33d775caf947d5ab2384fc645f185 \
+ sha256 ebcbd2c731a722cb381632e91395c1007f7c3828bfea1560581f108acd93b457
depends_build port:pkgconfig \
- port:intltool
+ port:intltool \
+ port:gtk-doc
depends_lib port:gtk3 \
- port:webkit-gtk3 \
+ path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3 \
port:libsoup \
port:json-glib \
port:rest \
port:libsecret \
port:libxml2 \
port:gobject-introspection \
- port:gcr
+ port:gcr \
+ port:telepathy-glib
patchfiles patch-return-val-if-fail.diff
configure.cflags-append -Wno-format-nonliteral
configure.args --enable-introspection=yes
-
+
+# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
+platform darwin {
+ set cxxstdlib {}
+
+ if {[info exists configure.cxx_stdlib] &&
+ ${configure.cxx_stdlib} ne {} &&
+ [string match *clang* ${configure.cxx}]} {
+ set cxxstdlib ${configure.cxx_stdlib}
+ } elseif {[string match *clang* ${configure.cxx}] &&
+ ${os.major} >= 13} {
+ set cxxstdlib libc++
+ } else {
+ set cxxstdlib libstdc++
+ }
+
+ if {${cxxstdlib} eq "libstdc++"} {
+ depends_lib-delete path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3
+ depends_lib-append path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3-2.0
+ }
+}
+
livecheck.type gnome-with-unstable
Modified: users/devans/GNOME-3/unstable/dports/gnome/gnome-online-accounts/files/patch-return-val-if-fail.diff
===================================================================
--- users/devans/GNOME-3/unstable/dports/gnome/gnome-online-accounts/files/patch-return-val-if-fail.diff 2014-01-23 17:31:25 UTC (rev 116270)
+++ users/devans/GNOME-3/unstable/dports/gnome/gnome-online-accounts/files/patch-return-val-if-fail.diff 2014-01-23 17:32:19 UTC (rev 116271)
@@ -1,6 +1,6 @@
---- src/goabackend/goaproviderfactory.c.orig 2013-11-27 07:11:13.000000000 -0800
-+++ src/goabackend/goaproviderfactory.c 2013-11-27 07:13:03.000000000 -0800
-@@ -114,7 +114,7 @@
+--- src/goabackend/goaproviderfactory.c.orig 2014-01-08 07:53:27.000000000 -0800
++++ src/goabackend/goaproviderfactory.c 2014-01-21 15:16:14.000000000 -0800
+@@ -86,7 +86,7 @@
{
GoaProviderFactoryClass *klass;
@@ -8,15 +8,4 @@
+ g_return_val_if_fail (GOA_IS_PROVIDER_FACTORY (factory), NULL);
klass = GOA_PROVIDER_FACTORY_GET_CLASS (factory);
- return klass->get_providers_finish (factory, out_providers, result, error);
---- src/goabackend/goatelepathyfactory.c.orig 2013-11-27 07:19:01.000000000 -0800
-+++ src/goabackend/goatelepathyfactory.c 2013-11-27 07:19:36.000000000 -0800
-@@ -50,7 +50,7 @@
- get_provider (GoaProviderFactory *factory,
- const gchar *provider_name)
- {
-- g_return_if_fail (GOA_IS_TELEPATHY_FACTORY (factory));
-+ g_return_val_if_fail (GOA_IS_TELEPATHY_FACTORY (factory), NULL);
-
- return GOA_PROVIDER (goa_telepathy_provider_new_from_protocol_name (provider_name));
- }
+ g_return_if_fail (klass->get_providers != NULL);
Property changes on: users/devans/GNOME-3/unstable/dports/gnome/gnome-system-monitor
___________________________________________________________________
Added: svn:mergeinfo
+ /users/devans/GNOME-3/stable/dports/gnome/gnome-system-monitor:114069-116236
Modified: users/devans/GNOME-3/unstable/dports/gnome/gnome-system-monitor/Portfile
===================================================================
--- users/devans/GNOME-3/unstable/dports/gnome/gnome-system-monitor/Portfile 2014-01-23 17:31:25 UTC (rev 116270)
+++ users/devans/GNOME-3/unstable/dports/gnome/gnome-system-monitor/Portfile 2014-01-23 17:32:19 UTC (rev 116271)
@@ -4,7 +4,7 @@
PortSystem 1.0
name gnome-system-monitor
-version 3.10.2
+version 3.11.4
license GPL-2+
set branch [join [lrange [split ${version} .] 0 1] .]
description A system monitor.
@@ -15,13 +15,13 @@
maintainers devans openmaintainer
categories gnome
platforms darwin
-homepage http://www.gnome.org/
+homepage https://wiki.gnome.org/Apps/SystemMonitor
master_sites gnome:sources/${name}/${branch}/
use_xz yes
-checksums rmd160 767dad0a7f8197bef017568ffe987c0c00c05462 \
- sha256 bd009e15672afe4ad3ebd7ed286cce79b9f76420fd39bc77a5826b29134b9db0
+checksums rmd160 68de89436b4c43be89c8a4f2d4bae6cf1417e029 \
+ sha256 0c9d20621e7f30c2532ec76efc8cef4423eefdac971a468557419c2094a491ae
depends_build port:pkgconfig \
port:intltool \
@@ -39,8 +39,7 @@
depends_run port:gnome-settings-daemon \
port:yelp
-patchfiles patch-src_openfiles.cpp.diff \
- patch-src-procproperties.cpp.diff
+patchfiles patch-src-procproperties.cpp.diff
configure.args --disable-silent-rules \
--enable-wnck \
Deleted: users/devans/GNOME-3/unstable/dports/gnome/gnome-system-monitor/files/patch-src_openfiles.cpp.diff
===================================================================
--- users/devans/GNOME-3/unstable/dports/gnome/gnome-system-monitor/files/patch-src_openfiles.cpp.diff 2014-01-23 17:31:25 UTC (rev 116270)
+++ users/devans/GNOME-3/unstable/dports/gnome/gnome-system-monitor/files/patch-src_openfiles.cpp.diff 2014-01-23 17:32:19 UTC (rev 116271)
@@ -1,13 +0,0 @@
---- src/openfiles.cpp.orig 2013-04-05 13:20:20.000000000 -0700
-+++ src/openfiles.cpp 2013-09-19 13:16:28.000000000 -0700
-@@ -49,7 +49,9 @@
- }
- }
-
--
-+#ifndef NI_IDN
-+#define NI_IDN (0)
-+#endif
-
- static char *
- friendlier_hostname(const char *addr_str, int port)
Property changes on: users/devans/GNOME-3/unstable/dports/gnome/gtksourceview3
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/mld-qt-481/dports/gnome/gtksourceview3:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/users/rmstonecipher/gnome/gtksourceview3:102363-103172
Modified: users/devans/GNOME-3/unstable/dports/gnome/gtksourceview3/Portfile
===================================================================
--- trunk/dports/gnome/gtksourceview3/Portfile 2014-01-22 04:45:02 UTC (rev 116236)
+++ users/devans/GNOME-3/unstable/dports/gnome/gtksourceview3/Portfile 2014-01-23 17:32:19 UTC (rev 116271)
@@ -6,7 +6,7 @@
name gtksourceview3
set gname gtksourceview
-version 3.10.1
+version 3.11.3
license LGPL-2.1+
set branch [join [lrange [split ${version} .] 0 1] .]
maintainers devans openmaintainer
@@ -26,8 +26,8 @@
distname ${gname}-${version}
use_xz yes
-checksums rmd160 6a48604c9122f224cae5c19bcd6393cd3fbdb047 \
- sha256 38de44f832b4110a3442af2fce58fce0a54f4b22a763c490bcdc1b1db2fb0b01
+checksums rmd160 2bb786ad0077e327593873086fa784ba291b544b \
+ sha256 0b7a0c8c43fd27752720d21a6760c800a10135aecf1ae1ffd1e890eeb84e961f
depends_build port:intltool \
port:pkgconfig \
@@ -63,5 +63,5 @@
NEWS README ${destroot}${docdir}
}
-livecheck.type gnome
+livecheck.type gnome-with-unstable
livecheck.name ${gname}
Property changes on: users/devans/GNOME-3/unstable/dports/gnome/yelp
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/mld-qt-481/dports/gnome/yelp:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/gnome/yelp:108265-115773
/users/devans/GNOME-3/stable/dports/gnome/yelp:114069-116230
/users/rmstonecipher/gnome/yelp:102363-103172
Modified: users/devans/GNOME-3/unstable/dports/gnome/yelp/Portfile
===================================================================
--- users/devans/GNOME-3/unstable/dports/gnome/yelp/Portfile 2014-01-23 17:31:25 UTC (rev 116270)
+++ users/devans/GNOME-3/unstable/dports/gnome/yelp/Portfile 2014-01-23 17:32:19 UTC (rev 116271)
@@ -4,7 +4,7 @@
PortSystem 1.0
name yelp
-version 3.10.1
+version 3.11.1
license GPL-2
set branch [join [lrange [split ${version} .] 0 1] .]
description Help browser for GNOME.
@@ -16,13 +16,13 @@
maintainers devans openmaintainer
categories gnome
platforms darwin
-homepage http://www.gnome.org/
+homepage https://wiki.gnome.org/Apps/Yelp
master_sites gnome:sources/${name}/${branch}/
use_xz yes
-checksums rmd160 dcb874dd98611968ffe3e8d42a3514af1fecf0ca \
- sha256 17736479b7d0b1128c7d6cb3073f2b09e4bbc82670731b2a0d3a3219a520f816
+checksums rmd160 d56c775cbfdf99e9aa42ffee4cc36c20f309b07c \
+ sha256 89ca8241a431051450ed580d63cd3a568968b6f4ad15e5a5f6793f27d016ddfb
depends_skip_archcheck gnome-settings-daemon
@@ -34,7 +34,7 @@
port:gnome-icon-theme \
port:gnome-icon-theme-symbolic \
port:gtk3 \
- port:webkit-gtk3 \
+ path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3 \
port:sqlite3 \
port:xz \
port:bzip2 \
@@ -59,4 +59,25 @@
system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
}
+# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
+platform darwin {
+ set cxxstdlib {}
+
+ if {[info exists configure.cxx_stdlib] &&
+ ${configure.cxx_stdlib} ne {} &&
+ [string match *clang* ${configure.cxx}]} {
+ set cxxstdlib ${configure.cxx_stdlib}
+ } elseif {[string match *clang* ${configure.cxx}] &&
+ ${os.major} >= 13} {
+ set cxxstdlib libc++
+ } else {
+ set cxxstdlib libstdc++
+ }
+
+ if {${cxxstdlib} eq "libstdc++"} {
+ depends_lib-delete path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3
+ depends_lib-append path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3-2.0
+ }
+}
+
livecheck.type gnome-with-unstable
Property changes on: users/devans/GNOME-3/unstable/dports/gnome/yelp-tools
___________________________________________________________________
Added: svn:mergeinfo
+ /users/devans/GNOME-3/stable/dports/gnome/yelp-tools:114069-116230
Modified: users/devans/GNOME-3/unstable/dports/gnome/yelp-tools/Portfile
===================================================================
--- users/devans/GNOME-3/unstable/dports/gnome/yelp-tools/Portfile 2014-01-23 17:31:25 UTC (rev 116270)
+++ users/devans/GNOME-3/unstable/dports/gnome/yelp-tools/Portfile 2014-01-23 17:32:19 UTC (rev 116271)
@@ -4,22 +4,22 @@
PortSystem 1.0
name yelp-tools
-version 3.10.0
+version 3.11.3
license GPL-2+
set branch [join [lrange [split ${version} .] 0 1] .]
description Tools to help create Yelp documentation.
long_description yelp-tools is a collection of scripts and build utilities to help create, \
manage, and publish documentation for Yelp and the web.
-maintainers devans openmaintainer
+maintainers gmail.com:juanrgar openmaintainer
categories gnome
platforms darwin
-homepage http://www.gnome.org/
+homepage https://wiki.gnome.org/Apps/Yelp/Tools
master_sites gnome:sources/${name}/${branch}/
use_xz yes
-checksums rmd160 a3812a049072fff37bdec453bc86dc186eb59323 \
- sha256 ff5e1102631049b08e3ef0ade2cd10e63a62a812690e3d8558ed1413baef2611
+checksums rmd160 2a5c8959d11f409052a0bc0360056ed8916a7135 \
+ sha256 89115c949d72fe15a8bb5fc57c2b7bc78ce3fefc7f931dbe78b941ab9ade9fd7
supported_archs noarch
Property changes on: users/devans/GNOME-3/unstable/dports/gnome/yelp-xsl
___________________________________________________________________
Added: svn:mergeinfo
+ /users/devans/GNOME-3/stable/dports/gnome/yelp-xsl:114069-116230
Modified: users/devans/GNOME-3/unstable/dports/gnome/yelp-xsl/Portfile
===================================================================
--- users/devans/GNOME-3/unstable/dports/gnome/yelp-xsl/Portfile 2014-01-23 17:31:25 UTC (rev 116270)
+++ users/devans/GNOME-3/unstable/dports/gnome/yelp-xsl/Portfile 2014-01-23 17:32:19 UTC (rev 116271)
@@ -4,7 +4,7 @@
PortSystem 1.0
name yelp-xsl
-version 3.10.1
+version 3.11.4
license GPL-2 LGPL-2.1
set branch [join [lrange [split ${version} .] 0 1] .]
description A collection of XSLT and other data files required by Yelp.
@@ -14,13 +14,13 @@
maintainers devans openmaintainer
categories gnome
platforms darwin
-homepage http://www.gnome.org/
+homepage https://wiki.gnome.org/Apps/Yelp
master_sites gnome:sources/${name}/${branch}/
use_xz yes
-checksums rmd160 ced70ec74364dd01352b61ca4625e2c7ba996401 \
- sha256 59c6dee3999121f6ffd33a9c5228316b75bc22e3bd68fff310beb4eeff245887
+checksums rmd160 f7ae60c09ff5830f3fbdca5c601e1c8f10c33e7a \
+ sha256 e85e67fcc3edec4c34e7edc601fe3c9bd5096de1b91f288e27af6fb663732b36
depends_build port:pkgconfig \
port:intltool \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140123/c0211346/attachment-0001.html>
More information about the macports-changes
mailing list