[117598] users/devans/GNOME-3/stable/dports
devans at macports.org
devans at macports.org
Tue Mar 4 11:52:01 PST 2014
Revision: 117598
https://trac.macports.org/changeset/117598
Author: devans at macports.org
Date: 2014-03-04 11:52:01 -0800 (Tue, 04 Mar 2014)
Log Message:
-----------
GNOME3/stable/dports: sync GNOME ports with trunk to pick up recent intltool configuration fixes.
Modified Paths:
--------------
users/devans/GNOME-3/stable/dports/gnome/epiphany/Portfile
users/devans/GNOME-3/stable/dports/gnome/evince/Portfile
users/devans/GNOME-3/stable/dports/gnome/file-roller/Portfile
users/devans/GNOME-3/stable/dports/gnome/folks/Portfile
users/devans/GNOME-3/stable/dports/gnome/gcr/Portfile
users/devans/GNOME-3/stable/dports/gnome/gnome-backgrounds/Portfile
users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/Portfile
users/devans/GNOME-3/stable/dports/gnome/gnome-devel-docs/Portfile
users/devans/GNOME-3/stable/dports/gnome/gnome-icon-theme-extras/Portfile
users/devans/GNOME-3/stable/dports/gnome/gnome-online-accounts/Portfile
users/devans/GNOME-3/stable/dports/gnome/gnome-settings-daemon/Portfile
users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/Portfile
users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/files/patch-uuid.diff
users/devans/GNOME-3/stable/dports/gnome/gnome-user-docs/Portfile
users/devans/GNOME-3/stable/dports/gnome/gucharmap/Portfile
users/devans/GNOME-3/stable/dports/gnome/libgnomekbd/Portfile
users/devans/GNOME-3/stable/dports/gnome/nautilus/Portfile
users/devans/GNOME-3/stable/dports/gnome/seahorse/Portfile
users/devans/GNOME-3/stable/dports/gnome/totem-pl-parser/Portfile
users/devans/GNOME-3/stable/dports/gnome/vino/Portfile
users/devans/GNOME-3/stable/dports/gnome/yelp/Portfile
users/devans/GNOME-3/stable/dports/gnome/yelp-tools/Portfile
users/devans/GNOME-3/stable/dports/gnome/yelp-xsl/Portfile
users/devans/GNOME-3/stable/dports/gnome/zenity/Portfile
users/devans/GNOME-3/stable/dports/net/rygel/Portfile
Added Paths:
-----------
users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/files/patch-users-logged-in-check.diff
users/devans/GNOME-3/stable/dports/gnome/totem-pl-parser/files/patch-configure.ac.diff
users/devans/GNOME-3/stable/dports/net/rygel/files/patch-configure.ac.diff
Removed Paths:
-------------
users/devans/GNOME-3/stable/dports/net/rygel/files/patch-configure.diff
Property Changed:
----------------
users/devans/GNOME-3/stable/dports/gnome/epiphany/
users/devans/GNOME-3/stable/dports/gnome/evince/
users/devans/GNOME-3/stable/dports/gnome/file-roller/
users/devans/GNOME-3/stable/dports/gnome/folks/
users/devans/GNOME-3/stable/dports/gnome/gcr/
users/devans/GNOME-3/stable/dports/gnome/gnome-backgrounds/
users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/
users/devans/GNOME-3/stable/dports/gnome/gnome-devel-docs/
users/devans/GNOME-3/stable/dports/gnome/gnome-icon-theme/
users/devans/GNOME-3/stable/dports/gnome/gnome-icon-theme-extras/
users/devans/GNOME-3/stable/dports/gnome/gnome-keyring/
users/devans/GNOME-3/stable/dports/gnome/gnome-online-accounts/
users/devans/GNOME-3/stable/dports/gnome/gnome-settings-daemon/
users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/
users/devans/GNOME-3/stable/dports/gnome/gnome-user-docs/
users/devans/GNOME-3/stable/dports/gnome/gucharmap/
users/devans/GNOME-3/stable/dports/gnome/libgdata/
users/devans/GNOME-3/stable/dports/gnome/libgnomekbd/
users/devans/GNOME-3/stable/dports/gnome/nautilus/
users/devans/GNOME-3/stable/dports/gnome/seahorse/
users/devans/GNOME-3/stable/dports/gnome/totem/
users/devans/GNOME-3/stable/dports/gnome/totem-pl-parser/
users/devans/GNOME-3/stable/dports/gnome/vino/
users/devans/GNOME-3/stable/dports/gnome/yelp/
users/devans/GNOME-3/stable/dports/gnome/yelp-tools/
users/devans/GNOME-3/stable/dports/gnome/yelp-xsl/
users/devans/GNOME-3/stable/dports/gnome/zenity/
users/devans/GNOME-3/stable/dports/net/rygel/
Property changes on: users/devans/GNOME-3/stable/dports/gnome/epiphany
___________________________________________________________________
Modified: 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-116767
/users/rmstonecipher/gnome/epiphany:102363-103172
+ /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-117326
/users/rmstonecipher/gnome/epiphany:102363-103172
Modified: users/devans/GNOME-3/stable/dports/gnome/epiphany/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/epiphany/Portfile 2014-03-04 19:24:27 UTC (rev 117597)
+++ users/devans/GNOME-3/stable/dports/gnome/epiphany/Portfile 2014-03-04 19:52:01 UTC (rev 117598)
@@ -25,7 +25,8 @@
sha256 c18235ecceaa9c76e7d90d370861cb2bba45019e1e14391a00dac3d2e94a0db7
depends_build port:pkgconfig \
- port:intltool
+ port:intltool \
+ port:gnome-common
depends_lib port:desktop-file-utils \
port:gnome-icon-theme \
@@ -69,16 +70,22 @@
}
}
+# update m4/intltool.m4 and autoreconf
+
+pre-configure {
+ copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
+ reinplace "s|--rpath=|-rpath |g" ${worksrcpath}/configure.ac
+}
+
+use_autoreconf yes
+autoreconf.args -fvi
+
configure.cflags-append -Wno-format-nonliteral
configure.args --with-distributor-name=MacPorts \
--disable-schemas-compile \
--disable-tests
-pre-configure {
- reinplace "s|--rpath=|-rpath |g" ${worksrcpath}/configure
-}
-
post-activate {
system "${prefix}/bin/update-desktop-database -q ${prefix}/share/applications"
system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
Property changes on: users/devans/GNOME-3/stable/dports/gnome/evince
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/dports/gnome/evince:108265-116177
+ /trunk/dports/gnome/evince:108265-117324
Modified: users/devans/GNOME-3/stable/dports/gnome/evince/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/evince/Portfile 2014-03-04 19:24:27 UTC (rev 117597)
+++ users/devans/GNOME-3/stable/dports/gnome/evince/Portfile 2014-03-04 19:52:01 UTC (rev 117598)
@@ -22,12 +22,11 @@
checksums rmd160 4f53cfe7df43e4775b9d932b9a35db799a65669d \
sha256 b30dcc3a93dd3c682325e685061c48ccd800835af49578f4db813bbaf5f5e9af
-depends_skip_archcheck gnome-settings-daemon
-
depends_build port:pkgconfig \
port:intltool \
+ port:itstool \
port:yelp-tools \
- port:itstool
+ port:gnome-common
depends_lib port:desktop-file-utils \
port:gnome-icon-theme \
@@ -64,7 +63,13 @@
--enable-comics \
--enable-t1lib
-# Teach glibtool about -stdlib=libc++
+# update m4/intltool.m4 and autoreconf
+# teach glibtool about -stdlib=libc++
+
+pre-configure {
+ copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
+}
+
use_autoreconf yes
autoreconf.args -fvi
Property changes on: users/devans/GNOME-3/stable/dports/gnome/file-roller
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/dports/gnome/file-roller:108265-116177
+ /trunk/dports/gnome/file-roller:108265-117439
Modified: users/devans/GNOME-3/stable/dports/gnome/file-roller/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/file-roller/Portfile 2014-03-04 19:24:27 UTC (rev 117597)
+++ users/devans/GNOME-3/stable/dports/gnome/file-roller/Portfile 2014-03-04 19:52:01 UTC (rev 117598)
@@ -46,16 +46,21 @@
patchfiles patch-src-fr-command-lrzip.c.diff
+# 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 --with-smclient=xsmp \
--disable-nautilus-actions \
--disable-packagekit \
--disable-schemas-compile \
--disable-silent-rules
-# Don't do intltool's INTLTOOL_PERL dance
-use_autoreconf yes
-autoreconf.args -fvi
-
variant nautilus description {Build optional nautilus context menu actions} {
configure.args-delete --disable-nautilus-actions
depends_lib-append port:nautilus
Property changes on: users/devans/GNOME-3/stable/dports/gnome/folks
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/mld-qt-481/dports/gnome/folks:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/gnome/folks:108265-117310
/users/rmstonecipher/gnome/folks:102363-103172
Modified: users/devans/GNOME-3/stable/dports/gnome/folks/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/folks/Portfile 2014-03-04 19:24:27 UTC (rev 117597)
+++ users/devans/GNOME-3/stable/dports/gnome/folks/Portfile 2014-03-04 19:52:01 UTC (rev 117598)
@@ -43,6 +43,15 @@
port:libxml2 \
port:vala
+# 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-eds-backend \
--disable-bluez-backend \
--enable-libsocialweb-backend=yes \
Property changes on: users/devans/GNOME-3/stable/dports/gnome/gcr
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/dports/gnome/gcr:113249-116176
+ /trunk/dports/gnome/gcr:113249-117311
Modified: users/devans/GNOME-3/stable/dports/gnome/gcr/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gcr/Portfile 2014-03-04 19:24:27 UTC (rev 117597)
+++ users/devans/GNOME-3/stable/dports/gnome/gcr/Portfile 2014-03-04 19:52:01 UTC (rev 117598)
@@ -5,7 +5,7 @@
name gcr
version 3.10.1
-revision 1
+revision 2
license LGPL-2
set branch [join [lrange [split ${version} .] 0 1] .]
description GCR is a library for displaying certificates, and crypto UI, accessing \
@@ -36,14 +36,25 @@
port:gobject-introspection \
port:p11-kit \
port:libgcrypt \
- port:gnupg
+ port:gnupg \
+ port:vala
patchfiles patch-egg-egg-asn1x.h.diff \
patch-egg-egg-armor.c.diff \
patch-ui-gcr.pc.in.diff \
patch-ui-gcr-ui.pc.in.diff
+# 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 --enable-introspection=yes \
+ --enable-vala=yes \
--disable-schemas-compile \
--disable-update-mime \
--disable-update-icon-cache \
Property changes on: users/devans/GNOME-3/stable/dports/gnome/gnome-backgrounds
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/mld-qt-481/dports/gnome/gnome-backgrounds:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/gnome/gnome-backgrounds:108265-117320
/users/rmstonecipher/gnome/gnome-backgrounds:102363-103172
Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-backgrounds/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome-backgrounds/Portfile 2014-03-04 19:24:27 UTC (rev 117597)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-backgrounds/Portfile 2014-03-04 19:52:01 UTC (rev 117598)
@@ -27,4 +27,15 @@
depends_build port:intltool \
port:gettext
+depends_lib path:lib/pkgconfig/glib-2.0.pc:glib2
+
+# update m4/intltool.m4 and autoreconf
+
+pre-configure {
+ copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
+}
+
+use_autoreconf yes
+autoreconf.args -fvi
+
livecheck.type gnome
Property changes on: users/devans/GNOME-3/stable/dports/gnome/gnome-control-center
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/mld-qt-481/dports/gnome/gnome-control-center:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/gnome/gnome-control-center:108265-117321
/users/rmstonecipher/gnome/gnome-control-center:102363-103172
Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/Portfile 2014-03-04 19:24:27 UTC (rev 117597)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/Portfile 2014-03-04 19:52:01 UTC (rev 117598)
@@ -54,10 +54,20 @@
# color panel disabled by patch, dependency colord requires libudev
-patchfiles patch-disable-color-panel.diff \
+# patch-output-is-laptop.diff \
+# patch-background-linker-fix.diff \
+# patch-background-libsocialweb.diff \
+
+patchfiles \
+ patch-users-logged-in-check.diff \
+ patch-disable-color-panel.diff \
patch-disable-shell-test-hostname.diff \
patch-panels-user-accounts.diff
+pre-configure {
+ copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
+}
+
use_autoreconf yes
autoreconf.args -fvi
Copied: users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/files/patch-users-logged-in-check.diff (from rev 117321, trunk/dports/gnome/gnome-control-center/files/patch-users-logged-in-check.diff)
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/files/patch-users-logged-in-check.diff (rev 0)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/files/patch-users-logged-in-check.diff 2014-03-04 19:52:01 UTC (rev 117598)
@@ -0,0 +1,29 @@
+From b9836c120a94c21f6d2eb8bc706408741b16b346 Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen at redhat.com>
+Date: Fri, 10 Jan 2014 17:52:37 +0000
+Subject: users: Improve logged-in check when deleting users
+
+When deleting a user account, we try to check if the user is
+still logged in, but we are using an accountsservice API that
+ignores console logins. But deleting a user that is logged
+in on the console is just as bad, so use
+act_user_is_logged_in_anywhere instead, which includes console
+logins.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=721951
+---
+diff --git a/panels/user-accounts/um-user-panel.c b/panels/user-accounts/um-user-panel.c
+index 2c02520..058eaad 100644
+--- panels/user-accounts/um-user-panel.c
++++ panels/user-accounts/um-user-panel.c
+@@ -478,7 +478,7 @@ delete_user (GtkButton *button, CcUserPanelPrivate *d)
+ g_signal_connect (dialog, "response",
+ G_CALLBACK (gtk_widget_destroy), NULL);
+ }
+- else if (act_user_is_logged_in (user)) {
++ else if (act_user_is_logged_in_anywhere (user)) {
+ dialog = gtk_message_dialog_new (GTK_WINDOW (gtk_widget_get_toplevel (d->main_box)),
+ 0,
+ GTK_MESSAGE_INFO,
+--
+cgit v0.9.2
Property changes on: users/devans/GNOME-3/stable/dports/gnome/gnome-devel-docs
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/mld-qt-481/dports/gnome/gnome-devel-docs:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/gnome/gnome-devel-docs:108265-117303
/users/rmstonecipher/gnome/gnome-devel-docs:102363-103172
Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-devel-docs/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome-devel-docs/Portfile 2014-03-04 19:24:27 UTC (rev 117597)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-devel-docs/Portfile 2014-03-04 19:52:01 UTC (rev 117598)
@@ -4,7 +4,7 @@
PortSystem 1.0
name gnome-devel-docs
-version 3.10.2
+version 3.10.3
license GFDL-1.1
set branch [join [lrange [split ${version} .] 0 1] .]
description The GNOME Developer Documentation Package
@@ -26,14 +26,12 @@
use_xz yes
-checksums rmd160 729d2091752f6abcbd23c5af942448d955c9eb11 \
- sha256 5f31700dec79504c486de5705b740089631c1b35cf97990b025d541859622e9a
+checksums rmd160 403eda4d6158556e5859c8eafc81423f599103ad \
+ sha256 746839d741538c5b4c0f0f8d3200375b28010d8d9bb1f9513ace69e7cc13b450
depends_build port:itstool \
port:libxml2
-patchfiles patch-work-around-itstool-bz715116.diff
-
configure.args --disable-silent-rules
livecheck.type gnome
Property changes on: users/devans/GNOME-3/stable/dports/gnome/gnome-icon-theme
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/mld-qt-481/dports/gnome/gnome-icon-theme:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/gnome/gnome-icon-theme:108265-117327
/users/rmstonecipher/gnome/gnome-icon-theme:102363-103172
Property changes on: users/devans/GNOME-3/stable/dports/gnome/gnome-icon-theme-extras
___________________________________________________________________
Added: svn:mergeinfo
+ /trunk/dports/gnome/gnome-icon-theme-extras:113233-117328
Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-icon-theme-extras/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome-icon-theme-extras/Portfile 2014-03-04 19:24:27 UTC (rev 117597)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-icon-theme-extras/Portfile 2014-03-04 19:52:01 UTC (rev 117598)
@@ -23,8 +23,7 @@
checksums rmd160 04edfd0998a5ba470885f84eae05d1da72f6f758 \
sha256 93aaaadf40c85ebc42232a4d8e45ca507754b8e1271e797bbcdaded52bd03ec7
-depends_build port:intltool \
- port:pkgconfig \
+depends_build port:pkgconfig \
port:icon-naming-utils \
port:gtk3
Property changes on: users/devans/GNOME-3/stable/dports/gnome/gnome-keyring
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/mld-qt-481/dports/gnome/gnome-keyring:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/users/rmstonecipher/gnome/gnome-keyring:102363-103172
+ /branches/mld-qt-481/dports/gnome/gnome-keyring:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/gnome/gnome-keyring:108265-117330
/users/rmstonecipher/gnome/gnome-keyring:102363-103172
Property changes on: users/devans/GNOME-3/stable/dports/gnome/gnome-online-accounts
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/dports/gnome/gnome-online-accounts:113257-115773
+ /trunk/dports/gnome/gnome-online-accounts:113257-117452
Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-online-accounts/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome-online-accounts/Portfile 2014-03-04 19:24:27 UTC (rev 117597)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-online-accounts/Portfile 2014-03-04 19:52:01 UTC (rev 117598)
@@ -23,7 +23,8 @@
depends_build port:pkgconfig \
port:intltool \
- port:gtk-doc
+ port:gtk-doc \
+ port:gnome-common
depends_lib port:gtk3 \
path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3 \
@@ -38,6 +39,11 @@
patchfiles patch-return-val-if-fail.diff
+# autoreconf with MacPorts intltool.m4
+
+use_autoreconf yes
+autoreconf.args -fvi
+
configure.cflags-append -Wno-format-nonliteral
configure.args --enable-introspection=yes
@@ -63,4 +69,3 @@
}
livecheck.type gnome
-
Property changes on: users/devans/GNOME-3/stable/dports/gnome/gnome-settings-daemon
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/dports/gnome/gnome-settings-daemon:108336
+ /trunk/dports/gnome/gnome-settings-daemon:108265-117360
Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-settings-daemon/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome-settings-daemon/Portfile 2014-03-04 19:24:27 UTC (rev 117597)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-settings-daemon/Portfile 2014-03-04 19:52:01 UTC (rev 117598)
@@ -2,6 +2,7 @@
# $Id$
PortSystem 1.0
+PortGroup active_variants 1.1
name gnome-settings-daemon
version 3.10.2
@@ -44,6 +45,9 @@
port:xorg-libXrandr \
port:xorg-libxkbfile
+# Without libcanberra +x11 gnome-settings-daemon will fail to find the libcanberra-gtk3 package, aborting configure
+require_active_variants port:libcanberra x11
+
#
# the following plugins are disabled by patch
#
Property changes on: users/devans/GNOME-3/stable/dports/gnome/gnome-terminal
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/mld-qt-481/dports/gnome/gnome-terminal:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/users/rmstonecipher/gnome/gnome-terminal:102363-103172
Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/Portfile 2014-03-04 19:24:27 UTC (rev 117597)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/Portfile 2014-03-04 19:52:01 UTC (rev 117598)
@@ -24,7 +24,9 @@
depends_build port:pkgconfig \
port:intltool \
port:itstool \
- port:libxml2
+ port:yelp-tools \
+ port:libxml2 \
+ port:gnome-common
depends_lib port:desktop-file-utils \
port:gnome-icon-theme \
@@ -44,6 +46,15 @@
patch-gschema.xml.in.diff \
no-dupfd_cloexec.patch
+# 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 --with-gtk=3.0 \
--disable-migration \
--disable-silent-rules \
Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/files/patch-uuid.diff
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/files/patch-uuid.diff 2014-03-04 19:24:27 UTC (rev 117597)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/files/patch-uuid.diff 2014-03-04 19:52:01 UTC (rev 117598)
@@ -34,153 +34,13 @@
#include <dconf.h>
#include "terminal-type-builtins.h"
---- configure.orig 2013-10-14 12:28:06.000000000 -0700
-+++ configure 2013-11-25 18:05:42.000000000 -0800
-@@ -13128,7 +13128,6 @@
- gtk+-\$GTK_API_VERSION >= \$GTK_REQUIRED
- gsettings-desktop-schemas >= \$GSETTINGS_DESKTOP_SCHEMAS_REQUIRED
- dconf >= \$DCONF_REQUIRED
-- uuid
- \$PLATFORM_DEPS\""; } >&5
- ($PKG_CONFIG --exists --print-errors "vte$VTE_PC_VERSION >= $VTE_REQUIRED
- glib-2.0 >= $GLIB_REQUIRED
-@@ -13136,7 +13135,6 @@
+--- configure.ac.orig 2014-02-24 14:08:39.000000000 -0800
++++ configure.ac 2014-02-24 14:08:49.000000000 -0800
+@@ -82,7 +82,6 @@
gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED
dconf >= $DCONF_REQUIRED
- uuid
- $PLATFORM_DEPS") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-@@ -13147,7 +13145,6 @@
- gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
- gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED
- dconf >= $DCONF_REQUIRED
-- uuid
- $PLATFORM_DEPS" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
- else
-@@ -13166,7 +13163,6 @@
- gtk+-\$GTK_API_VERSION >= \$GTK_REQUIRED
- gsettings-desktop-schemas >= \$GSETTINGS_DESKTOP_SCHEMAS_REQUIRED
- dconf >= \$DCONF_REQUIRED
-- uuid
- \$PLATFORM_DEPS\""; } >&5
- ($PKG_CONFIG --exists --print-errors "vte$VTE_PC_VERSION >= $VTE_REQUIRED
- glib-2.0 >= $GLIB_REQUIRED
-@@ -13174,7 +13170,6 @@
- gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
- gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED
- dconf >= $DCONF_REQUIRED
-- uuid
- $PLATFORM_DEPS") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-@@ -13185,7 +13180,6 @@
- gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
- gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED
- dconf >= $DCONF_REQUIRED
-- uuid
- $PLATFORM_DEPS" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
- else
-@@ -13213,7 +13207,6 @@
- gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
- gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED
- dconf >= $DCONF_REQUIRED
-- uuid
- $PLATFORM_DEPS" 2>&1`
- else
- TERM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "vte$VTE_PC_VERSION >= $VTE_REQUIRED
-@@ -13222,7 +13215,6 @@
- gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
- gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED
- dconf >= $DCONF_REQUIRED
-- uuid
- $PLATFORM_DEPS" 2>&1`
- fi
- # Put the nasty error message in config.log where it belongs
-@@ -13234,7 +13226,6 @@
- gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
- gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED
- dconf >= $DCONF_REQUIRED
-- uuid
- $PLATFORM_DEPS) were not met:
+ $PLATFORM_DEPS])
- $TERM_PKG_ERRORS
-@@ -13574,13 +13565,13 @@
- vte\$VTE_PC_VERSION >= \$VTE_REQUIRED
- gconf-2.0 >= \$GCONF_REQUIRED
- dconf >= \$DCONF_REQUIRED
-- uuid\""; } >&5
-+ \""; } >&5
- ($PKG_CONFIG --exists --print-errors "
- gio-2.0 >= $GIO_REQUIRED
- vte$VTE_PC_VERSION >= $VTE_REQUIRED
- gconf-2.0 >= $GCONF_REQUIRED
- dconf >= $DCONF_REQUIRED
-- uuid") 2>&5
-+ ") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
-@@ -13589,7 +13580,7 @@
- vte$VTE_PC_VERSION >= $VTE_REQUIRED
- gconf-2.0 >= $GCONF_REQUIRED
- dconf >= $DCONF_REQUIRED
-- uuid" 2>/dev/null`
-+ " 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
- else
- pkg_failed=yes
-@@ -13606,13 +13597,13 @@
- vte\$VTE_PC_VERSION >= \$VTE_REQUIRED
- gconf-2.0 >= \$GCONF_REQUIRED
- dconf >= \$DCONF_REQUIRED
-- uuid\""; } >&5
-+ \""; } >&5
- ($PKG_CONFIG --exists --print-errors "
- gio-2.0 >= $GIO_REQUIRED
- vte$VTE_PC_VERSION >= $VTE_REQUIRED
- gconf-2.0 >= $GCONF_REQUIRED
- dconf >= $DCONF_REQUIRED
-- uuid") 2>&5
-+ ") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
-@@ -13621,7 +13612,7 @@
- vte$VTE_PC_VERSION >= $VTE_REQUIRED
- gconf-2.0 >= $GCONF_REQUIRED
- dconf >= $DCONF_REQUIRED
-- uuid" 2>/dev/null`
-+ " 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
- else
- pkg_failed=yes
-@@ -13647,14 +13638,14 @@
- vte$VTE_PC_VERSION >= $VTE_REQUIRED
- gconf-2.0 >= $GCONF_REQUIRED
- dconf >= $DCONF_REQUIRED
-- uuid" 2>&1`
-+ " 2>&1`
- else
- MIGRATOR_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "
- gio-2.0 >= $GIO_REQUIRED
- vte$VTE_PC_VERSION >= $VTE_REQUIRED
- gconf-2.0 >= $GCONF_REQUIRED
- dconf >= $DCONF_REQUIRED
-- uuid" 2>&1`
-+ " 2>&1`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$MIGRATOR_PKG_ERRORS" >&5
-@@ -13664,7 +13655,7 @@
- vte$VTE_PC_VERSION >= $VTE_REQUIRED
- gconf-2.0 >= $GCONF_REQUIRED
- dconf >= $DCONF_REQUIRED
-- uuid) were not met:
-+ ) were not met:
-
- $MIGRATOR_PKG_ERRORS
-
+ # DConf broke API without changing the pkgconfig name
Property changes on: users/devans/GNOME-3/stable/dports/gnome/gnome-user-docs
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/mld-qt-481/dports/gnome/gnome-user-docs:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/gnome/gnome-user-docs:108265-117330
/users/rmstonecipher/gnome/gnome-user-docs:102363-103172
Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-user-docs/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome-user-docs/Portfile 2014-03-04 19:24:27 UTC (rev 117597)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-user-docs/Portfile 2014-03-04 19:52:01 UTC (rev 117598)
@@ -4,7 +4,7 @@
PortSystem 1.0
name gnome-user-docs
-version 3.10.2
+version 3.10.3
set branch [join [lrange [split ${version} .] 0 1] .]
description End-user documentation for GNOME3
long_description \
@@ -23,8 +23,8 @@
use_xz yes
-checksums sha256 a733828428e827fa40f2a240b13447917b2d71f1dce03365ef0344c52476b4d7 \
- rmd160 31a889c314348d6647730452498877014318af5e
+checksums sha256 960b6373ea52e41e3deb3501930e024005b29d2cc958bfadc87450a291d2a905 \
+ rmd160 b703b4cc3a64666d103cf0133064f1ae676064d6
depends_build port:pkgconfig \
port:libxml2 \
Property changes on: users/devans/GNOME-3/stable/dports/gnome/gucharmap
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/mld-qt-481/dports/gnome/gucharmap:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/gnome/gucharmap:108265-116177
/users/rmstonecipher/gnome/gucharmap:102363-103172
+ /branches/mld-qt-481/dports/gnome/gucharmap:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/gnome/gucharmap:108265-117387
/users/rmstonecipher/gnome/gucharmap:102363-103172
Modified: users/devans/GNOME-3/stable/dports/gnome/gucharmap/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gucharmap/Portfile 2014-03-04 19:24:27 UTC (rev 117597)
+++ users/devans/GNOME-3/stable/dports/gnome/gucharmap/Portfile 2014-03-04 19:52:01 UTC (rev 117598)
@@ -24,6 +24,8 @@
depends_build port:pkgconfig \
port:intltool \
port:itstool \
+ port:gnome-common \
+ port:yelp-tools \
port:gtk-doc
depends_lib port:desktop-file-utils \
@@ -34,6 +36,15 @@
depends_run port:gnome-settings-daemon \
port:yelp
+# update m4/intltool.m4 and autoreconf
+
+pre-configure {
+ copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
+}
+
+use_autoreconf yes
+autoreconf.args -fvi
+
use_parallel_build no
configure.args --with-gtk=3.0 \
Property changes on: users/devans/GNOME-3/stable/dports/gnome/libgdata
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/mld-qt-481/dports/gnome/libgdata:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/gnome/libgdata:108265-117388
/users/rmstonecipher/gnome/libgdata:102363-103172
Property changes on: users/devans/GNOME-3/stable/dports/gnome/libgnomekbd
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/mld-qt-481/dports/gnome/libgnomekbd:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/gnome/libgnomekbd:108265-116176
/users/rmstonecipher/gnome/libgnomekbd:102363-103172
+ /branches/mld-qt-481/dports/gnome/libgnomekbd:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/gnome/libgnomekbd:108265-117389
/users/rmstonecipher/gnome/libgnomekbd:102363-103172
Modified: users/devans/GNOME-3/stable/dports/gnome/libgnomekbd/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/libgnomekbd/Portfile 2014-03-04 19:24:27 UTC (rev 117597)
+++ users/devans/GNOME-3/stable/dports/gnome/libgnomekbd/Portfile 2014-03-04 19:52:01 UTC (rev 117598)
@@ -24,13 +24,23 @@
sha256 c41ea5b0f64da470925ba09f9f1b46b26b82d4e433e594b2c71eab3da8856a09
depends_build port:pkgconfig \
- port:intltool
+ port:intltool \
+ port:gnome-common
depends_lib port:desktop-file-utils \
port:gtk3 \
port:libxklavier \
port:gobject-introspection
+# 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 --enable-introspection \
--without-x \
--disable-schemas-compile \
Property changes on: users/devans/GNOME-3/stable/dports/gnome/nautilus
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/mld-qt-481/dports/gnome/nautilus:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/gnome/nautilus:108265-115773
/users/rmstonecipher/gnome/nautilus:102363-103172
+ /branches/mld-qt-481/dports/gnome/nautilus:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/gnome/nautilus:108265-117423
/users/rmstonecipher/gnome/nautilus:102363-103172
Modified: users/devans/GNOME-3/stable/dports/gnome/nautilus/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/nautilus/Portfile 2014-03-04 19:24:27 UTC (rev 117597)
+++ users/devans/GNOME-3/stable/dports/gnome/nautilus/Portfile 2014-03-04 19:52:01 UTC (rev 117598)
@@ -42,6 +42,15 @@
depends_run port:gnome-settings-daemon
+# 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 --enable-introspection=yes \
--enable-tracker=no \
--disable-packagekit \
Property changes on: users/devans/GNOME-3/stable/dports/gnome/seahorse
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/mld-qt-481/dports/gnome/seahorse:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/gnome/seahorse:108265-117440
/users/rmstonecipher/gnome/seahorse:102363-103172
Modified: users/devans/GNOME-3/stable/dports/gnome/seahorse/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/seahorse/Portfile 2014-03-04 19:24:27 UTC (rev 117597)
+++ users/devans/GNOME-3/stable/dports/gnome/seahorse/Portfile 2014-03-04 19:52:01 UTC (rev 117598)
@@ -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:gtk3 \
@@ -48,6 +50,15 @@
--disable-schemas-compile \
--disable-silent-rules
+# update m4/intltool.m4 and autoreconf
+
+pre-configure {
+ copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
+}
+
+use_autoreconf yes
+autoreconf.args -fvi
+
post-activate {
system "${prefix}/bin/update-desktop-database -q ${prefix}/share/applications"
system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
Property changes on: users/devans/GNOME-3/stable/dports/gnome/totem
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/dports/gnome/totem:108265-117110
+ /trunk/dports/gnome/totem:108265-117246
Property changes on: users/devans/GNOME-3/stable/dports/gnome/totem-pl-parser
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/mld-qt-481/dports/gnome/totem-pl-parser:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/gnome/totem-pl-parser:108265-117245
/users/rmstonecipher/gnome/totem-pl-parser:102363-103172
Modified: users/devans/GNOME-3/stable/dports/gnome/totem-pl-parser/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/totem-pl-parser/Portfile 2014-03-04 19:24:27 UTC (rev 117597)
+++ users/devans/GNOME-3/stable/dports/gnome/totem-pl-parser/Portfile 2014-03-04 19:52:01 UTC (rev 117598)
@@ -4,7 +4,7 @@
PortSystem 1.0
name totem-pl-parser
-version 3.10.0
+version 3.10.1
set branch [join [lrange [split ${version} .] 0 1] .]
categories gnome
license LGPL-2+
@@ -20,11 +20,12 @@
use_xz yes
-checksums rmd160 f0cb5f798daaa678e9d17b06c7fe31c10ca939dc \
- sha256 87eac3fdf2b632dfac0edda07906a3e84f1ce4442b8127394414020dafe41aa9
+checksums rmd160 eb1a3a59f1c994c50d8332e716c8cfd98ee53f13 \
+ sha256 13d20222e7230eff1b22acc2b6b54d3c910590782a3ac39b859857407fb5e413
depends_build port:pkgconfig \
- port:intltool
+ port:intltool \
+ port:gnome-common
depends_lib port:libsoup \
port:libarchive \
@@ -34,8 +35,18 @@
port:gmime \
port:gobject-introspection
-patchfiles patch-plparse-plparser.symbols.diff
+patchfiles patch-plparse-plparser.symbols.diff \
+ patch-configure.ac.diff
+# 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 --enable-introspection=yes \
--enable-libarchive \
--enable-libgcrypt \
Copied: users/devans/GNOME-3/stable/dports/gnome/totem-pl-parser/files/patch-configure.ac.diff (from rev 117245, trunk/dports/gnome/totem-pl-parser/files/patch-configure.ac.diff)
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/totem-pl-parser/files/patch-configure.ac.diff (rev 0)
+++ users/devans/GNOME-3/stable/dports/gnome/totem-pl-parser/files/patch-configure.ac.diff 2014-03-04 19:52:01 UTC (rev 117598)
@@ -0,0 +1,17 @@
+--- configure.ac.orig 2014-02-19 15:15:07.000000000 -0800
++++ configure.ac 2014-02-19 15:19:33.000000000 -0800
+@@ -8,12 +8,13 @@ AC_INIT([totem-pl-parser],
+ [totem_version_major.totem_version_minor.totem_version_micro],
+ [http://bugzilla.gnome.org/enter_bug.cgi?product=totem-pl-parser&component=General])
+
++AM_INIT_AUTOMAKE([1.9 dist-xz no-dist-gzip check-news subdir-objects])
++
+ AC_CONFIG_SRCDIR([plparse/totem-pl-parser.c])
+ AC_CONFIG_HEADERS([config.h])
+ AC_CONFIG_MACRO_DIR([m4])
+ AC_USE_SYSTEM_EXTENSIONS
+
+-AM_INIT_AUTOMAKE([1.9 dist-xz no-dist-gzip check-news subdir-objects])
+ AM_MAINTAINER_MODE([enable])
+
+ # Enable silent build when available (Automake 1.11)
Property changes on: users/devans/GNOME-3/stable/dports/gnome/vino
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/mld-qt-481/dports/gnome/vino:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/gnome/vino:108265-117436
/users/rmstonecipher/gnome/vino:102363-103172
Modified: users/devans/GNOME-3/stable/dports/gnome/vino/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/vino/Portfile 2014-03-04 19:24:27 UTC (rev 117597)
+++ users/devans/GNOME-3/stable/dports/gnome/vino/Portfile 2014-03-04 19:52:01 UTC (rev 117598)
@@ -21,7 +21,8 @@
sha256 faf10d667c43d00cd37dc6343b44012456de9d2e39d8ce679c719e65d2dfbe46
depends_build port:pkgconfig \
- port:intltool
+ port:intltool \
+ port:gnome-common
depends_lib port:desktop-file-utils \
port:gtk3 \
@@ -38,6 +39,15 @@
port:jpeg \
port:zlib
+# update m4/intltool.m4 and autoreconf
+
+pre-configure {
+ copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
+}
+
+use_autoreconf yes
+autoreconf.args -fvi
+
configure.cflags-append \
-Wno-format-nonliteral
Property changes on: users/devans/GNOME-3/stable/dports/gnome/yelp
___________________________________________________________________
Modified: 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/rmstonecipher/gnome/yelp:102363-103172
+ /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-117591
/users/rmstonecipher/gnome/yelp:102363-103172
Modified: users/devans/GNOME-3/stable/dports/gnome/yelp/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/yelp/Portfile 2014-03-04 19:24:27 UTC (rev 117597)
+++ users/devans/GNOME-3/stable/dports/gnome/yelp/Portfile 2014-03-04 19:52:01 UTC (rev 117598)
@@ -4,8 +4,7 @@
PortSystem 1.0
name yelp
-version 3.10.1
-revision 1
+version 3.10.2
license GPL-2
set branch [join [lrange [split ${version} .] 0 1] .]
description Help browser for GNOME.
@@ -22,14 +21,15 @@
use_xz yes
-checksums rmd160 dcb874dd98611968ffe3e8d42a3514af1fecf0ca \
- sha256 17736479b7d0b1128c7d6cb3073f2b09e4bbc82670731b2a0d3a3219a520f816
+checksums rmd160 9245b27ca92ed49064c369bff78734b17e168d51 \
+ sha256 31cdff0df058fd42752808b6454b774281505f42695ee8b20891eb1332c34338
depends_skip_archcheck gnome-settings-daemon
depends_build port:pkgconfig \
port:intltool \
- port:itstool
+ port:itstool \
+ port:gnome-common
depends_lib port:desktop-file-utils \
port:gnome-icon-theme \
@@ -49,6 +49,15 @@
depends_run port:gnome-user-docs \
port:gnome-settings-daemon
+# 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 \
--disable-schemas-compile \
Property changes on: users/devans/GNOME-3/stable/dports/gnome/yelp-tools
___________________________________________________________________
Added: svn:mergeinfo
+ /trunk/dports/gnome/yelp-tools:113273-117432
Modified: users/devans/GNOME-3/stable/dports/gnome/yelp-tools/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/yelp-tools/Portfile 2014-03-04 19:24:27 UTC (rev 117597)
+++ users/devans/GNOME-3/stable/dports/gnome/yelp-tools/Portfile 2014-03-04 19:52:01 UTC (rev 117598)
@@ -24,7 +24,6 @@
supported_archs noarch
depends_build port:pkgconfig \
- port:intltool \
port:itstool \
port:libxslt \
port:libxml2
Property changes on: users/devans/GNOME-3/stable/dports/gnome/yelp-xsl
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/mld-qt-481/dports/gnome/yelp-xsl:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/gnome/yelp-xsl:108265-117431
/users/rmstonecipher/gnome/yelp-xsl:102363-103172
Modified: users/devans/GNOME-3/stable/dports/gnome/yelp-xsl/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/yelp-xsl/Portfile 2014-03-04 19:24:27 UTC (rev 117597)
+++ users/devans/GNOME-3/stable/dports/gnome/yelp-xsl/Portfile 2014-03-04 19:52:01 UTC (rev 117598)
@@ -30,6 +30,15 @@
port:libxslt \
port:libxml2
+# update m4/intltool.m4 and autoreconf
+
+pre-configure {
+ copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
+}
+
+use_autoreconf yes
+autoreconf.args -fvi
+
post-activate {
system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
}
Property changes on: users/devans/GNOME-3/stable/dports/gnome/zenity
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/mld-qt-481/dports/gnome/zenity:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/gnome/zenity:108265-115773
/users/rmstonecipher/gnome/zenity:102363-103172
+ /branches/mld-qt-481/dports/gnome/zenity:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/gnome/zenity:108265-117452
/users/rmstonecipher/gnome/zenity:102363-103172
Modified: users/devans/GNOME-3/stable/dports/gnome/zenity/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/zenity/Portfile 2014-03-04 19:24:27 UTC (rev 117597)
+++ users/devans/GNOME-3/stable/dports/gnome/zenity/Portfile 2014-03-04 19:52:01 UTC (rev 117598)
@@ -32,7 +32,12 @@
port:libnotify \
path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3
-# 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
Property changes on: users/devans/GNOME-3/stable/dports/net/rygel
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/dports/net/rygel:113316-115697
+ /trunk/dports/net/rygel:113316-117439
Modified: users/devans/GNOME-3/stable/dports/net/rygel/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/net/rygel/Portfile 2014-03-04 19:24:27 UTC (rev 117597)
+++ users/devans/GNOME-3/stable/dports/net/rygel/Portfile 2014-03-04 19:52:01 UTC (rev 117598)
@@ -38,9 +38,18 @@
depends_run port:gnome-settings-daemon
-patchfiles patch-configure.diff \
+patchfiles patch-configure.ac.diff \
patch-return.diff
+# 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-silent-rules \
--enable-tracker-plugin=no
Copied: users/devans/GNOME-3/stable/dports/net/rygel/files/patch-configure.ac.diff (from rev 117439, trunk/dports/net/rygel/files/patch-configure.ac.diff)
===================================================================
--- users/devans/GNOME-3/stable/dports/net/rygel/files/patch-configure.ac.diff (rev 0)
+++ users/devans/GNOME-3/stable/dports/net/rygel/files/patch-configure.ac.diff 2014-03-04 19:52:01 UTC (rev 117598)
@@ -0,0 +1,20 @@
+--- configure.ac.orig 2013-12-22 03:32:37.000000000 -0800
++++ configure.ac 2014-02-26 00:43:42.000000000 -0800
+@@ -43,7 +43,7 @@
+ GSTPBU_REQUIRED=1.0
+ GIO_REQUIRED=2.26
+ GEE_REQUIRED=0.8.0
+-UUID_REQUIRED=1.41.3
++UUID_REQUIRED=1.6.2
+ LIBSOUP_REQUIRED=2.34.0
+ GTK_REQUIRED=3.0
+
+@@ -387,7 +387,7 @@
+ AM_CONDITIONAL(ENABLE_VALADOC, test x$found_valadoc = xyes)
+
+ AC_SUBST([RYGEL_PLUGIN_LINKER_FLAGS],
+- ["-module -avoid-version -Wl,-z,defs"])
++ ["-module -avoid-version"])
+ AC_SUBST([RYGEL_PLUGIN_DIR],
+ [${libdir}/rygel-2.0/plugins])
+ AC_SUBST([RYGEL_MEDIA_ENGINE_DIR],
Deleted: users/devans/GNOME-3/stable/dports/net/rygel/files/patch-configure.diff
===================================================================
--- users/devans/GNOME-3/stable/dports/net/rygel/files/patch-configure.diff 2014-03-04 19:24:27 UTC (rev 117597)
+++ users/devans/GNOME-3/stable/dports/net/rygel/files/patch-configure.diff 2014-03-04 19:52:01 UTC (rev 117598)
@@ -1,20 +0,0 @@
---- configure.orig 2013-11-11 11:26:23.000000000 -0800
-+++ configure 2013-11-16 12:02:53.000000000 -0800
-@@ -12902,7 +12902,7 @@
- GSTPBU_REQUIRED=1.0
- GIO_REQUIRED=2.26
- GEE_REQUIRED=0.8.0
--UUID_REQUIRED=1.41.3
-+UUID_REQUIRED=1.6.2
- LIBSOUP_REQUIRED=2.34.0
- GTK_REQUIRED=3.0
-
-@@ -17584,7 +17584,7 @@
- fi
-
-
--RYGEL_PLUGIN_LINKER_FLAGS="-module -avoid-version -Wl,-z,defs"
-+RYGEL_PLUGIN_LINKER_FLAGS="-module -avoid-version"
-
- RYGEL_PLUGIN_DIR=${libdir}/rygel-2.0/plugins
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140304/27a499b7/attachment-0001.html>
More information about the macports-changes
mailing list