[117912] users/devans/GNOME-3/unstable/dports/gnome/gdm
devans at macports.org
devans at macports.org
Sun Mar 16 20:26:10 PDT 2014
Revision: 117912
https://trac.macports.org/changeset/117912
Author: devans at macports.org
Date: 2014-03-16 20:26:10 -0700 (Sun, 16 Mar 2014)
Log Message:
-----------
GNOME-3/unstable: gdm, update m4/intltool.m4 and autoreconf to fix intltool configuration, patchfiles.
Modified Paths:
--------------
users/devans/GNOME-3/unstable/dports/gnome/gdm/Portfile
users/devans/GNOME-3/unstable/dports/gnome/gdm/files/patch-daemon-gdm-session-worker.c.diff
Added Paths:
-----------
users/devans/GNOME-3/unstable/dports/gnome/gdm/files/patch-configure.ac.diff
Removed Paths:
-------------
users/devans/GNOME-3/unstable/dports/gnome/gdm/files/patch-configure.diff
users/devans/GNOME-3/unstable/dports/gnome/gdm/files/patch-daemon-gdm-session.c.diff
Property Changed:
----------------
users/devans/GNOME-3/unstable/dports/gnome/gdm/
Property changes on: users/devans/GNOME-3/unstable/dports/gnome/gdm
___________________________________________________________________
Modified: 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
+ /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-117875
/users/devans/GNOME-3/stable/dports/gnome/gdm:114069-117876
/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-03-17 01:38:55 UTC (rev 117911)
+++ users/devans/GNOME-3/unstable/dports/gnome/gdm/Portfile 2014-03-17 03:26:10 UTC (rev 117912)
@@ -49,16 +49,25 @@
depends_run port:gnome-session \
port:gnome-settings-daemon
-patchfiles patch-configure.diff \
- patch-daemon-gdm-session-worker.c.diff
+patchfiles patch-daemon-gdm-session-worker.c.diff \
+ patch-configure.ac.diff
post-patch {
- reinplace "s|@MP_PREFIX@|${prefix}|" ${worksrcpath}/configure
- file attributes ${worksrcpath}/install-sh -permissions +x
+ reinplace "s|@MP_PREFIX@|${prefix}|" ${worksrcpath}/configure.ac
+ file attributes ${worksrcpath}/install-sh -permissions +x
}
use_parallel_build no
+# 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-ipv6 \
--without-console-kit \
--disable-schemas-compile \
Copied: users/devans/GNOME-3/unstable/dports/gnome/gdm/files/patch-configure.ac.diff (from rev 117876, users/devans/GNOME-3/stable/dports/gnome/gdm/files/patch-configure.ac.diff)
===================================================================
--- users/devans/GNOME-3/unstable/dports/gnome/gdm/files/patch-configure.ac.diff (rev 0)
+++ users/devans/GNOME-3/unstable/dports/gnome/gdm/files/patch-configure.ac.diff 2014-03-17 03:26:10 UTC (rev 117912)
@@ -0,0 +1,29 @@
+--- configure.ac.orig 2014-03-15 07:56:54.000000000 -0700
++++ configure.ac 2014-03-15 08:00:06.000000000 -0700
+@@ -499,6 +499,7 @@
+ AC_CHECK_LIB(pam, pam_syslog, [AC_DEFINE(HAVE_PAM_SYSLOG, [], [Define to 1 if you have the pam_syslog function])])
+
+ dnl test whether struct pam_message is const (Linux) or not (Sun)
++ac_pam_includes="/usr/include"
+ if test "x$have_pam" = "xyes"; then
+ pam_appl_h="$ac_pam_includes/security/pam_appl.h"
+ AC_MSG_CHECKING(for const pam_message)
+@@ -1217,7 +1218,17 @@
+ # and /usr/X11 since they often symlink to each other, and configure
+ # should use the more stable location (the real directory) if possible.
+ #
+-if test -x /usr/X11/bin/Xserver; then
++if test -x @MP_PREFIX@/bin/Xquartz; then
++ X_PATH="@MP_PREFIX@/bin"
++ X_SERVER_PATH="@MP_PREFIX@/bin"
++ X_SERVER="@MP_PREFIX@/bin/Xquartz"
++ X_CONFIG_OPTIONS="-audit 0"
++elif test -x /opt/X11/bin/Xquartz; then
++ X_PATH="/opt/X11/bin"
++ X_SERVER_PATH="/opt/X11/bin"
++ X_SERVER="/opt/X11/bin/Xquartz"
++ X_CONFIG_OPTIONS="-audit 0"
++elif test -x /usr/X11/bin/Xserver; then
+ X_PATH="/usr/X11/bin"
+ X_SERVER_PATH="/usr/X11/bin"
+ X_SERVER="/usr/X11/bin/Xserver"
Deleted: users/devans/GNOME-3/unstable/dports/gnome/gdm/files/patch-configure.diff
===================================================================
--- users/devans/GNOME-3/unstable/dports/gnome/gdm/files/patch-configure.diff 2014-03-17 01:38:55 UTC (rev 117911)
+++ users/devans/GNOME-3/unstable/dports/gnome/gdm/files/patch-configure.diff 2014-03-17 03:26:10 UTC (rev 117912)
@@ -1,29 +0,0 @@
---- configure.orig 2013-10-16 07:46:13.000000000 -0700
-+++ configure 2013-11-08 21:31:12.000000000 -0800
-@@ -23256,6 +23256,7 @@
- fi
-
-
-+ac_pam_includes="/usr/include"
- if test "x$have_pam" = "xyes"; then
- pam_appl_h="$ac_pam_includes/security/pam_appl.h"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for const pam_message" >&5
-@@ -25473,7 +25474,17 @@
- # and /usr/X11 since they often symlink to each other, and configure
- # should use the more stable location (the real directory) if possible.
- #
--if test -x /usr/X11/bin/Xserver; then
-+if test -x @MP_PREFIX@/bin/Xquartz; then
-+ X_PATH="/opt/local/bin"
-+ X_SERVER_PATH="/opt/local/bin"
-+ X_SERVER="/opt/local/bin/Xquartz"
-+ X_CONFIG_OPTIONS="-audit 0"
-+elif test -x /opt/X11/bin/Xquartz; then
-+ X_PATH="/opt/X11/bin"
-+ X_SERVER_PATH="/opt/X11/bin"
-+ X_SERVER="/opt/X11/bin/Xquartz"
-+ X_CONFIG_OPTIONS="-audit 0"
-+elif test -x /usr/X11/bin/Xserver; then
- X_PATH="/usr/X11/bin"
- X_SERVER_PATH="/usr/X11/bin"
- X_SERVER="/usr/X11/bin/Xserver"
Modified: users/devans/GNOME-3/unstable/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 2014-03-17 01:38:55 UTC (rev 117911)
+++ users/devans/GNOME-3/unstable/dports/gnome/gdm/files/patch-daemon-gdm-session-worker.c.diff 2014-03-17 03:26:10 UTC (rev 117912)
@@ -1,6 +1,6 @@
---- 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 @@
+--- daemon/gdm-session-worker.c.orig 2014-02-20 12:01:48.000000000 -0800
++++ daemon/gdm-session-worker.c 2014-03-16 20:16:54.000000000 -0700
+@@ -741,6 +741,33 @@
return utf8;
}
Deleted: users/devans/GNOME-3/unstable/dports/gnome/gdm/files/patch-daemon-gdm-session.c.diff
===================================================================
--- users/devans/GNOME-3/unstable/dports/gnome/gdm/files/patch-daemon-gdm-session.c.diff 2014-03-17 01:38:55 UTC (rev 117911)
+++ users/devans/GNOME-3/unstable/dports/gnome/gdm/files/patch-daemon-gdm-session.c.diff 2014-03-17 03:26:10 UTC (rev 117912)
@@ -1,12 +0,0 @@
---- daemon/gdm-session.c.orig 2013-09-19 12:29:48.000000000 -0700
-+++ daemon/gdm-session.c 2013-11-08 21:16:43.000000000 -0800
-@@ -979,6 +979,9 @@
- #ifdef __linux__
- native_credentials = g_credentials_get_native (credentials, G_CREDENTIALS_TYPE_LINUX_UCRED);
- pid = (GPid) ((struct ucred *) native_credentials)->pid;
-+#elif defined (__APPLE__)
-+ native_credentials = g_credentials_get_native (credentials, G_CREDENTIALS_TYPE_INVALID);
-+ pid = (GPid) (0);
- #elif defined (__FreeBSD__)
- native_credentials = g_credentials_get_native (credentials, G_CREDENTIALS_TYPE_OPENBSD_SOCKPEERCRED);
- pid = (GPid) ((struct cmsgcred *) native_credentials)->cmcred_pid;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140316/c8eee39e/attachment-0001.html>
More information about the macports-changes
mailing list