diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2009-05-03 02:54:34 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2009-05-03 02:54:34 +0000 |
| commit | aa5eaef8c971e11e1fa7ea68fad7eaa0b04c076a (patch) | |
| tree | 7e78cd5e00ebd9cf9f58a5278549363b412dd621 /x11/gdm/files/patch-configure | |
| parent | Update to 2.2.5. (diff) | |
* Add support for a gdm_lang rc.conf macro to control the locale used by
the GDM greeter [1]
* Add a patch from Fedora to support reading the keyboard layout from hal [2]
PR: 131533 [2]
Obtained from: Fedora CVS [2]
Submitted by: daichi [1]
Andreas Wetzel <mickey242@gmx.net> [2]
Notes
Notes:
svn path=/head/; revision=233140
Diffstat (limited to 'x11/gdm/files/patch-configure')
| -rw-r--r-- | x11/gdm/files/patch-configure | 69 |
1 files changed, 69 insertions, 0 deletions
diff --git a/x11/gdm/files/patch-configure b/x11/gdm/files/patch-configure new file mode 100644 index 000000000000..baa14aa863dd --- /dev/null +++ b/x11/gdm/files/patch-configure @@ -0,0 +1,69 @@ +--- 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 + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED_VERSION + gobject-2.0 >= \$GLIB_REQUIRED_VERSION ++ hal + \"") >&5 + ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION + gobject-2.0 >= $GLIB_REQUIRED_VERSION ++ hal + ") 2>&5 + ac_status=$? + $as_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 ++ hal + " 2>/dev/null` + else + pkg_failed=yes +@@ -19185,15 +19188,18 @@ if test -n "$DAEMON_LIBS"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED_VERSION + gobject-2.0 >= \$GLIB_REQUIRED_VERSION ++ hal + \"") >&5 + ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION + gobject-2.0 >= $GLIB_REQUIRED_VERSION ++ hal + ") 2>&5 + ac_status=$? + $as_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 ++ hal + " 2>/dev/null` + else + pkg_failed=yes +@@ -19214,10 +19220,12 @@ fi + 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 ++ hal + " 2>&1` + else + DAEMON_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION + gobject-2.0 >= $GLIB_REQUIRED_VERSION ++ hal + " 2>&1` + fi + # Put the nasty error message in config.log where it belongs +@@ -19225,6 +19233,7 @@ fi + + { { $as_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 + " >&5 + $as_echo "$as_me: error: Package requirements (dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION + gobject-2.0 >= $GLIB_REQUIRED_VERSION ++ hal + ) were not met: + + $DAEMON_PKG_ERRORS |