[136193] trunk/dports/gnome/gnome-session
devans at macports.org
devans at macports.org
Mon May 11 16:06:16 PDT 2015
Revision: 136193
https://trac.macports.org/changeset/136193
Author: devans at macports.org
Date: 2015-05-11 16:06:16 -0700 (Mon, 11 May 2015)
Log Message:
-----------
gnome-session: update to version 3.16.0, reconfigure using upstream autogen.sh for intltool 0.51 compatibility, minor white space.
Modified Paths:
--------------
trunk/dports/gnome/gnome-session/Portfile
trunk/dports/gnome/gnome-session/files/patch-gnome-session-main.c.diff
Added Paths:
-----------
trunk/dports/gnome/gnome-session/files/autogen.sh
trunk/dports/gnome/gnome-session/files/patch-configure.ac.diff
trunk/dports/gnome/gnome-session/files/patch-header-guard-typo.diff
Property Changed:
----------------
trunk/dports/gnome/gnome-session/
trunk/dports/gnome/gnome-session/files/patch-gnome-session-main.c.diff
Property changes on: trunk/dports/gnome/gnome-session
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/mld-qt-481/dports/gnome/gnome-session:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/users/devans/GNOME-3/stable/dports/gnome/gnome-session:108269-118732,119139-126096
/users/devans/GNOME-3/unstable/dports/gnome/gnome-session:116416-118152,122271-125737
/users/rmstonecipher/gnome/gnome-session:102363-103172
+ /branches/mld-qt-481/dports/gnome/gnome-session:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/users/devans/GNOME-3/stable/dports/gnome/gnome-session:108269-118732,119139-136068
/users/devans/GNOME-3/unstable/dports/gnome/gnome-session:116416-118152,122271-125737,132287-134574
/users/rmstonecipher/gnome/gnome-session:102363-103172
Modified: trunk/dports/gnome/gnome-session/Portfile
===================================================================
--- trunk/dports/gnome/gnome-session/Portfile 2015-05-11 22:52:15 UTC (rev 136192)
+++ trunk/dports/gnome/gnome-session/Portfile 2015-05-11 23:06:16 UTC (rev 136193)
@@ -4,7 +4,7 @@
PortSystem 1.0
name gnome-session
-version 3.14.0
+version 3.16.0
license LGPL-2+
set branch [join [lrange [split ${version} .] 0 1] .]
description Session component for the GNOME 3 desktop.
@@ -18,13 +18,16 @@
use_xz yes
-checksums rmd160 1314231bc693ad9c6b334570c60d1f9bb011bc1f \
- sha256 b1e6e805478b863eda58e61ecd0e13961f63dd76e2d49692affc5a1d00f2c184
+checksums rmd160 0c7a029159dc7864c63a6348bf9b8c703430a2dd \
+ sha256 9b546d455edd9d681070a61c98a4164557f89ebbd66367a2aa528d807dfea99d
depends_build port:pkgconfig \
port:intltool \
port:libxslt \
- port:gnome-common
+ port:gnome-common \
+ port:autoconf \
+ port:automake \
+ port:libtool
depends_lib port:desktop-file-utils \
port:gnome-desktop \
@@ -44,17 +47,18 @@
port:xorg-xtrans \
port:mesa
-patchfiles patch-gnome-session-main.c.diff \
- patch-gnome-session-check-accelerated-helper.c.diff
+patchfiles patch-configure.ac.diff \
+ patch-gnome-session-main.c.diff \
+ patch-gnome-session-check-accelerated-helper.c.diff \
+ patch-header-guard-typo.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.cflags-append \
-Wno-format-nonliteral
@@ -78,4 +82,4 @@
system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
}
-livecheck.type gnome
+livecheck.type gnome
Copied: trunk/dports/gnome/gnome-session/files/autogen.sh (from rev 136068, users/devans/GNOME-3/stable/dports/gnome/gnome-session/files/autogen.sh)
===================================================================
--- trunk/dports/gnome/gnome-session/files/autogen.sh (rev 0)
+++ trunk/dports/gnome/gnome-session/files/autogen.sh 2015-05-11 23:06:16 UTC (rev 136193)
@@ -0,0 +1,21 @@
+#!/bin/sh
+# Run this to generate all the initial makefiles, etc.
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+PKG_NAME="gnome-session"
+
+# (test -f $srcdir/configure.ac \
+# && test -f $srcdir/$PKG_NAME.doap) || {
+# echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
+# echo " top-level $PKG_NAME directory"
+# exit 1
+# }
+
+which gnome-autogen.sh || {
+ echo "You need to install gnome-common."
+ exit 1
+}
+
+. gnome-autogen.sh
Copied: trunk/dports/gnome/gnome-session/files/patch-configure.ac.diff (from rev 136068, users/devans/GNOME-3/stable/dports/gnome/gnome-session/files/patch-configure.ac.diff)
===================================================================
--- trunk/dports/gnome/gnome-session/files/patch-configure.ac.diff (rev 0)
+++ trunk/dports/gnome/gnome-session/files/patch-configure.ac.diff 2015-05-11 23:06:16 UTC (rev 136193)
@@ -0,0 +1,12 @@
+--- configure.ac.orig 2015-05-02 11:15:33.000000000 -0700
++++ configure.ac 2015-05-02 11:18:36.000000000 -0700
+@@ -97,7 +97,8 @@
+ [enable_gconf=$enableval],
+ [enable_gconf=auto])
+
+-PKG_CHECK_MODULES(GCONF, gconf-2.0, [have_gconf=yes], [have_gconf=no])
++#PKG_CHECK_MODULES(GCONF, gconf-2.0, [have_gconf=yes], [have_gconf=no])
++have_gconf=no
+
+ if test x$enable_gconf = xauto ; then
+ enable_gconf=$have_gconf
Modified: trunk/dports/gnome/gnome-session/files/patch-gnome-session-main.c.diff
===================================================================
--- trunk/dports/gnome/gnome-session/files/patch-gnome-session-main.c.diff 2015-05-11 22:52:15 UTC (rev 136192)
+++ trunk/dports/gnome/gnome-session/files/patch-gnome-session-main.c.diff 2015-05-11 23:06:16 UTC (rev 136193)
@@ -1,17 +1,6 @@
---- gnome-session/main.c.orig 2014-03-18 13:31:47.000000000 -0700
-+++ gnome-session/main.c 2014-03-19 23:56:21.000000000 -0700
-@@ -31,6 +31,10 @@
-
- #include <glib-unix.h>
-
-+#ifdef __APPLE__
-+#include <gio/gio.h>
-+#endif
-+
- #include <dbus/dbus.h>
- #include <dbus/dbus-glib.h>
- #include <dbus/dbus-glib-bindings.h>
-@@ -240,6 +244,14 @@
+--- gnome-session/main.c.orig 2015-01-05 10:34:39.000000000 -0800
++++ gnome-session/main.c 2015-01-30 08:42:20.000000000 -0800
+@@ -179,6 +179,14 @@
if (g_getenv ("DBUS_SESSION_BUS_ADDRESS"))
return TRUE;
@@ -26,7 +15,7 @@
/* Just a sanity check to prevent infinite recursion if
* dbus-launch fails to set DBUS_SESSION_BUS_ADDRESS
*/
-@@ -264,6 +276,7 @@
+@@ -203,6 +211,7 @@
g_strerror (errno));
return FALSE;
}
@@ -34,3 +23,21 @@
/* Should not be reached */
return TRUE;
+@@ -227,6 +236,17 @@
+ return g_spawn_check_exit_status (status, error);
+ }
+
++#ifdef __APPLE__
++
++static int
++rpmatch (const char *response)
++{
++ return (*response == 'y' || *response == 'Y' ? 1
++ : *response == 'n' || *response == 'N' ? 0 : -1);
++}
++
++#endif
++
+ int
+ main (int argc, char **argv)
+ {
Property changes on: trunk/dports/gnome/gnome-session/files/patch-gnome-session-main.c.diff
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/mld-qt-481/dports/gnome/gnome-session/files/patch-gnome-session-main.c.diff:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/users/devans/GNOME-3/stable/dports/gnome/gnome-session/files/patch-gnome-session-main.c.diff:108269-113174,114678-118732
/users/rmstonecipher/gnome/gnome-session/files/patch-gnome-session-main.c.diff:102363-103172
+ /branches/mld-qt-481/dports/gnome/gnome-session/files/patch-gnome-session-main.c.diff:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/users/devans/GNOME-3/stable/dports/gnome/gnome-session/files/patch-gnome-session-main.c.diff:108269-113174,114678-118732,119139-136068
/users/devans/GNOME-3/unstable/dports/gnome/gnome-session/files/patch-gnome-session-main.c.diff:132287-134574
/users/rmstonecipher/gnome/gnome-session/files/patch-gnome-session-main.c.diff:102363-103172
Copied: trunk/dports/gnome/gnome-session/files/patch-header-guard-typo.diff (from rev 136068, users/devans/GNOME-3/stable/dports/gnome/gnome-session/files/patch-header-guard-typo.diff)
===================================================================
--- trunk/dports/gnome/gnome-session/files/patch-header-guard-typo.diff (rev 0)
+++ trunk/dports/gnome/gnome-session/files/patch-header-guard-typo.diff 2015-05-11 23:06:16 UTC (rev 136193)
@@ -0,0 +1,11 @@
+--- gnome-session/gsm-fail-whale.h.orig 2015-01-29 16:22:48.000000000 -0800
++++ gnome-session/gsm-fail-whale.h 2015-01-29 16:23:08.000000000 -0800
+@@ -15,7 +15,7 @@
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+-#ifndef __GSM_FAIL_WHALE_H___
++#ifndef __GSM_FAIL_WHALE_H__
+ #define __GSM_FAIL_WHALE_H__
+
+ #include <glib.h>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150511/905bd66b/attachment.html>
More information about the macports-changes
mailing list