summaryrefslogtreecommitdiffstats
path: root/x11/gdm/files
diff options
context:
space:
mode:
authorkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2009-08-25 15:52:03 +0800
committerkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2009-08-25 15:52:03 +0800
commit026d03f588016057cb4c5df96944c396353dbb4c (patch)
tree982ce21813997394726b262d940246105996289f /x11/gdm/files
parent1105bfd3196efef553461481e861e54d2a84993d (diff)
downloadmarcuscom-ports-026d03f588016057cb4c5df96944c396353dbb4c.tar
marcuscom-ports-026d03f588016057cb4c5df96944c396353dbb4c.tar.gz
marcuscom-ports-026d03f588016057cb4c5df96944c396353dbb4c.tar.bz2
marcuscom-ports-026d03f588016057cb4c5df96944c396353dbb4c.tar.lz
marcuscom-ports-026d03f588016057cb4c5df96944c396353dbb4c.tar.xz
marcuscom-ports-026d03f588016057cb4c5df96944c396353dbb4c.tar.zst
marcuscom-ports-026d03f588016057cb4c5df96944c396353dbb4c.zip
Update to 2.27.90.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@12719 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11/gdm/files')
-rw-r--r--x11/gdm/files/patch-configure26
-rw-r--r--x11/gdm/files/patch-daemon_gdm-display-access-file.c12
2 files changed, 13 insertions, 25 deletions
diff --git a/x11/gdm/files/patch-configure b/x11/gdm/files/patch-configure
index baa14aa86..4f46c6626 100644
--- a/x11/gdm/files/patch-configure
+++ b/x11/gdm/files/patch-configure
@@ -1,8 +1,8 @@
---- configure.orig 2009-05-02 22:45:53.000000000 -0400
-+++ configure 2009-05-02 22:47:16.000000000 -0400
-@@ -19163,15 +19163,18 @@ if test -n "$DAEMON_CFLAGS"; then
+--- configure.orig 2009-08-25 09:31:58.000000000 +0200
++++ configure 2009-08-25 09:34:28.000000000 +0200
+@@ -22627,15 +22637,18 @@
if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED_VERSION
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED_VERSION
gobject-2.0 >= \$GLIB_REQUIRED_VERSION
+ hal
\"") >&5
@@ -11,7 +11,7 @@
+ hal
") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
pkg_cv_DAEMON_CFLAGS=`$PKG_CONFIG --cflags "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
gobject-2.0 >= $GLIB_REQUIRED_VERSION
@@ -19,9 +19,9 @@
" 2>/dev/null`
else
pkg_failed=yes
-@@ -19185,15 +19188,18 @@ if test -n "$DAEMON_LIBS"; then
+@@ -22649,15 +22662,18 @@
if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED_VERSION
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED_VERSION
gobject-2.0 >= \$GLIB_REQUIRED_VERSION
+ hal
\"") >&5
@@ -30,7 +30,7 @@
+ hal
") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
pkg_cv_DAEMON_LIBS=`$PKG_CONFIG --libs "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
gobject-2.0 >= $GLIB_REQUIRED_VERSION
@@ -38,7 +38,7 @@
" 2>/dev/null`
else
pkg_failed=yes
-@@ -19214,10 +19220,12 @@ fi
+@@ -22678,10 +22694,12 @@
if test $_pkg_short_errors_supported = yes; then
DAEMON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
gobject-2.0 >= $GLIB_REQUIRED_VERSION
@@ -51,17 +51,17 @@
" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
-@@ -19225,6 +19233,7 @@ fi
+@@ -22689,6 +22707,7 @@
- { { $as_echo "$as_me:$LINENO: error: Package requirements (dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
+ { { echo "$as_me:$LINENO: error: Package requirements (dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
gobject-2.0 >= $GLIB_REQUIRED_VERSION
+ hal
) were not met:
$DAEMON_PKG_ERRORS
-@@ -19238,6 +19247,7 @@ See the pkg-config man page for more det
+@@ -22702,6 +22721,7 @@
" >&5
- $as_echo "$as_me: error: Package requirements (dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
+ echo "$as_me: error: Package requirements (dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
gobject-2.0 >= $GLIB_REQUIRED_VERSION
+ hal
) were not met:
diff --git a/x11/gdm/files/patch-daemon_gdm-display-access-file.c b/x11/gdm/files/patch-daemon_gdm-display-access-file.c
deleted file mode 100644
index 0f54784ec..000000000
--- a/x11/gdm/files/patch-daemon_gdm-display-access-file.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- daemon/gdm-display-access-file.c.orig 2009-04-16 01:32:41.000000000 +0200
-+++ daemon/gdm-display-access-file.c 2009-04-16 01:33:17.000000000 +0200
-@@ -41,6 +41,9 @@
- #include "gdm-display-access-file.h"
- #include "gdm-common.h"
-
-+/* OpenBSD defines 255, glibc defines 64. */
-+#define HOST_NAME_MAX 64
-+
- struct _GdmDisplayAccessFilePrivate
- {
- char *username;