[135382] users/devans/GNOME-3/stable/dports/gnome/gnome-terminal
devans at macports.org
devans at macports.org
Thu Apr 23 08:22:39 PDT 2015
Revision: 135382
https://trac.macports.org/changeset/135382
Author: devans at macports.org
Date: 2015-04-23 08:22:39 -0700 (Thu, 23 Apr 2015)
Log Message:
-----------
GNOME-3/stable: gnome-terminal, update to version 3.16.1, reconfigure using upstream autogen.sh for intltool 0.51 compatibility.
Modified Paths:
--------------
users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/Portfile
users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/files/no-dupfd_cloexec.patch
users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/files/patch-src-Makefile.am.diff
Added Paths:
-----------
users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/files/autogen.sh
Property Changed:
----------------
users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/
Property changes on: users/devans/GNOME-3/stable/dports/gnome/gnome-terminal
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/mld-qt-481/dports/gnome/gnome-terminal:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/gnome/gnome-terminal:108265-127228
/users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal:116416-118154,119539-125614
/users/rmstonecipher/gnome/gnome-terminal:102363-103172
+ /branches/mld-qt-481/dports/gnome/gnome-terminal:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/gnome/gnome-terminal:108265-127228
/users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal:116416-118154,119539-125614,132290-134556
/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 2015-04-23 15:22:36 UTC (rev 135381)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/Portfile 2015-04-23 15:22:39 UTC (rev 135382)
@@ -4,7 +4,7 @@
PortSystem 1.0
name gnome-terminal
-version 3.14.2
+version 3.16.1
set branch [join [lrange [split ${version} .] 0 1] .]
description Terminal component for the GNOME 3 Desktop
long_description ${description}
@@ -17,8 +17,8 @@
use_xz yes
-checksums rmd160 4604fb020bbee6b24cc846b9a960aa2b9227c7b2 \
- sha256 886bf9accb863d59791c5d8f2078d0fb022245a79854ad4a131b7b2186c27d2b
+checksums rmd160 45d05d3616d6a9848db5476b8794671e6ba5abc8 \
+ sha256 7dce4df5d88e4968ed64d57e61d51e2ab7944a02ece34d5776582a0ed3d7b45b
depends_build port:pkgconfig \
port:intltool \
@@ -26,7 +26,10 @@
port:yelp-tools \
port:appstream-glib \
port:libxml2 \
- port:gnome-common
+ port:gnome-common \
+ port:autoconf \
+ port:automake \
+ port:libtool
depends_lib port:desktop-file-utils \
port:gsettings-desktop-schemas \
@@ -44,14 +47,13 @@
no-dupfd_cloexec.patch \
patch-src-Makefile.am.diff
-# update m4/intltool.m4 and autoreconf
+# reconfigure using upstream autogen.sh for intltool 0.51 compatibility
-pre-configure {
- copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
+post-patch {
+ xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath}
}
-use_autoreconf yes
-autoreconf.args -fvi
+configure.cmd ./autogen.sh
configure.args --with-gtk=3.0 \
--with-nautilus-extension=no \
@@ -70,8 +72,6 @@
depends_lib-append port:gconf
}
-default_variants +nautilus
-
post-activate {
system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
Added: users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/files/autogen.sh
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/files/autogen.sh (rev 0)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/files/autogen.sh 2015-04-23 15:22:39 UTC (rev 135382)
@@ -0,0 +1,15 @@
+#!/bin/sh
+# Run this to generate all the initial makefiles, etc.
+
+set -e
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+cd "$srcdir"
+mkdir -p m4 >/dev/null 2>&1 || true
+intltoolize --force
+autoreconf --verbose --force --install
+cd -
+
+test -n "$NOCONFIGURE" || "$srcdir/configure" "$@"
Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/files/no-dupfd_cloexec.patch
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/files/no-dupfd_cloexec.patch 2015-04-23 15:22:36 UTC (rev 135381)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/files/no-dupfd_cloexec.patch 2015-04-23 15:22:39 UTC (rev 135382)
@@ -9,7 +9,7 @@
#include <glib.h>
#include <glib/gi18n.h>
-@@ -1192,7 +1192,12 @@
+@@ -1199,7 +1199,12 @@
for (j = 0; j < n_fds; j++) {
if (fds[j] == target_fd) {
do {
Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/files/patch-src-Makefile.am.diff
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/files/patch-src-Makefile.am.diff 2015-04-23 15:22:36 UTC (rev 135381)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/files/patch-src-Makefile.am.diff 2015-04-23 15:22:39 UTC (rev 135382)
@@ -1,7 +1,7 @@
---- src/Makefile.am.orig 2014-10-07 15:58:41.000000000 -0700
-+++ src/Makefile.am 2014-10-07 15:59:21.000000000 -0700
+--- src/Makefile.am.orig 2015-02-09 11:27:29.000000000 -0800
++++ src/Makefile.am 2015-02-19 18:09:35.000000000 -0800
@@ -199,8 +199,6 @@
- $(WARN_CFLAGS) \
+ $(AM_CFLAGS) \
-Wno-cast-qual \
-Wno-format-nonliteral \
- -Wno-suggest-attribute=format \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150423/f2db6836/attachment.html>
More information about the macports-changes
mailing list