diff options
author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2010-12-01 06:00:17 +0800 |
---|---|---|
committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2010-12-01 06:00:17 +0800 |
commit | 2e4d2e942a99fbc51adebabc4cd543a91491ba37 (patch) | |
tree | 5fb7c33c9eb700d394e22ec7c7faf4258b91ea3b /multimedia/cheese/files/patch-configure | |
parent | 2d95636f2e1c4896bca367221f0b972b5903e72a (diff) | |
download | marcuscom-ports-2e4d2e942a99fbc51adebabc4cd543a91491ba37.tar marcuscom-ports-2e4d2e942a99fbc51adebabc4cd543a91491ba37.tar.gz marcuscom-ports-2e4d2e942a99fbc51adebabc4cd543a91491ba37.tar.bz2 marcuscom-ports-2e4d2e942a99fbc51adebabc4cd543a91491ba37.tar.lz marcuscom-ports-2e4d2e942a99fbc51adebabc4cd543a91491ba37.tar.xz marcuscom-ports-2e4d2e942a99fbc51adebabc4cd543a91491ba37.tar.zst marcuscom-ports-2e4d2e942a99fbc51adebabc4cd543a91491ba37.zip |
Clean up after 2.32 got committed. Only gdm 2.32 isn't committed because of
focus issues. And it doesn't seem it getting any traction upstream.
Next stop GNOME 3.0.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@14916 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'multimedia/cheese/files/patch-configure')
-rw-r--r-- | multimedia/cheese/files/patch-configure | 214 |
1 files changed, 0 insertions, 214 deletions
diff --git a/multimedia/cheese/files/patch-configure b/multimedia/cheese/files/patch-configure deleted file mode 100644 index 8befb947b..000000000 --- a/multimedia/cheese/files/patch-configure +++ /dev/null @@ -1,214 +0,0 @@ ---- configure.orig 2010-04-27 17:32:36.000000000 +0200 -+++ configure 2010-04-27 17:32:36.000000000 +0200 -@@ -756,8 +756,8 @@ HAVE_XTEST_FALSE - HAVE_XTEST_TRUE - XTEST_LIBS - OS_LINUX --UDEV_LIBS --UDEV_CFLAGS -+HAL_LIBS -+HAL_CFLAGS - HAVE_GNOME_DOC_UTILS_FALSE - HAVE_GNOME_DOC_UTILS_TRUE - DISTCHECK_CONFIGURE_FLAGS -@@ -975,8 +975,8 @@ LIBS - CPPFLAGS - CPP - PKG_CONFIG --UDEV_CFLAGS --UDEV_LIBS -+HAL_CFLAGS -+HAL_LIBS - CHEESE_CFLAGS - CHEESE_LIBS' - -@@ -1646,8 +1646,8 @@ Some influential environment variables: - you have headers in a nonstandard directory <include dir> - CPP C preprocessor - PKG_CONFIG path to pkg-config utility -- UDEV_CFLAGS C compiler flags for UDEV, overriding pkg-config -- UDEV_LIBS linker flags for UDEV, overriding pkg-config -+ HAL_CFLAGS C compiler flags for HAL, overriding pkg-config -+ HAL_LIBS linker flags for HAL, overriding pkg-config - CHEESE_CFLAGS - C compiler flags for CHEESE, overriding pkg-config - CHEESE_LIBS linker flags for CHEESE, overriding pkg-config -@@ -13843,38 +13843,38 @@ LIBRSVG_REQUIRED=2.18.0 - # Check for udev - #******************************************************************************* - --UDEV_PKG= -+HAL_PKG= - - pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for UDEV" >&5 --$as_echo_n "checking for UDEV... " >&6; } -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for HAL" >&5 -+$as_echo_n "checking for HAL... " >&6; } - --if test -n "$UDEV_CFLAGS"; then -- pkg_cv_UDEV_CFLAGS="$UDEV_CFLAGS" -+if test -n "$HAL_CFLAGS"; then -+ pkg_cv_HAL_CFLAGS="$HAL_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gudev-1.0\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "gudev-1.0") 2>&5 -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"hal\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "hal") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then -- pkg_cv_UDEV_CFLAGS=`$PKG_CONFIG --cflags "gudev-1.0" 2>/dev/null` -+ pkg_cv_HAL_CFLAGS=`$PKG_CONFIG --cflags "hal" 2>/dev/null` - else - pkg_failed=yes - fi - else - pkg_failed=untried - fi --if test -n "$UDEV_LIBS"; then -- pkg_cv_UDEV_LIBS="$UDEV_LIBS" -+if test -n "$HAL_LIBS"; then -+ pkg_cv_HAL_LIBS="$HAL_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gudev-1.0\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "gudev-1.0") 2>&5 -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"hal\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "hal") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then -- pkg_cv_UDEV_LIBS=`$PKG_CONFIG --libs "gudev-1.0" 2>/dev/null` -+ pkg_cv_HAL_LIBS=`$PKG_CONFIG --libs "hal" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -13892,27 +13892,27 @@ else - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- UDEV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gudev-1.0" 2>&1` -+ HAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "hal" 2>&1` - else -- UDEV_PKG_ERRORS=`$PKG_CONFIG --print-errors "gudev-1.0" 2>&1` -+ HAL_PKG_ERRORS=`$PKG_CONFIG --print-errors "hal" 2>&1` - fi - # Put the nasty error message in config.log where it belongs -- echo "$UDEV_PKG_ERRORS" >&5 -+ echo "$HAL_PKG_ERRORS" >&5 - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } -- UDEV_PKG= -+ HAL_PKG= - elif test $pkg_failed = untried; then -- UDEV_PKG= -+ HAL_PKG= - else -- UDEV_CFLAGS=$pkg_cv_UDEV_CFLAGS -- UDEV_LIBS=$pkg_cv_UDEV_LIBS -+ HAL_CFLAGS=$pkg_cv_HAL_CFLAGS -+ HAL_LIBS=$pkg_cv_HAL_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 - $as_echo "yes" >&6; } - --$as_echo "#define HAVE_UDEV 1" >>confdefs.h -+$as_echo "#define HAVE_HAL 1" >>confdefs.h - -- UDEV_PKG=gudev-1.0 -+ HAL_PKG=hal - fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking operating system" >&5 -@@ -13925,7 +13925,7 @@ $as_echo "#define OS_LINUX /**/" >>confd - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Linux" >&5 - $as_echo "Linux" >&6; } -- if test x$UDEV_PKG = "x" ; then -+ if test x$HAL_PKG = "x" ; then - as_fn_error "libgudev is required under Linux and not installed" "$LINENO" 5 - fi - ;; -@@ -14034,7 +14034,7 @@ if test -n "$CHEESE_CFLAGS"; then - dbus-glib-1 >= \$DBUS_GLIB_REQUIRED \\ - pangocairo >= \$PANGOCAIRO_REQUIRED \\ - librsvg-2.0 >= \$LIBRSVG_REQUIRED -- libcanberra-gtk \$UDEV_PKG\""; } >&5 -+ libcanberra-gtk \$HAL_PKG\""; } >&5 - ($PKG_CONFIG --exists --print-errors "\ - glib-2.0 >= $GLIB_REQUIRED \ - gobject-2.0 >= $GOBJECT_REQUIRED \ -@@ -14050,7 +14050,7 @@ if test -n "$CHEESE_CFLAGS"; then - dbus-glib-1 >= $DBUS_GLIB_REQUIRED \ - pangocairo >= $PANGOCAIRO_REQUIRED \ - librsvg-2.0 >= $LIBRSVG_REQUIRED -- libcanberra-gtk $UDEV_PKG") 2>&5 -+ libcanberra-gtk $HAL_PKG") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then -@@ -14069,7 +14069,7 @@ if test -n "$CHEESE_CFLAGS"; then - dbus-glib-1 >= $DBUS_GLIB_REQUIRED \ - pangocairo >= $PANGOCAIRO_REQUIRED \ - librsvg-2.0 >= $LIBRSVG_REQUIRED -- libcanberra-gtk $UDEV_PKG" 2>/dev/null` -+ libcanberra-gtk $HAL_PKG" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -14095,7 +14095,7 @@ if test -n "$CHEESE_LIBS"; then - dbus-glib-1 >= \$DBUS_GLIB_REQUIRED \\ - pangocairo >= \$PANGOCAIRO_REQUIRED \\ - librsvg-2.0 >= \$LIBRSVG_REQUIRED -- libcanberra-gtk \$UDEV_PKG\""; } >&5 -+ libcanberra-gtk \$HAL_PKG\""; } >&5 - ($PKG_CONFIG --exists --print-errors "\ - glib-2.0 >= $GLIB_REQUIRED \ - gobject-2.0 >= $GOBJECT_REQUIRED \ -@@ -14111,7 +14111,7 @@ if test -n "$CHEESE_LIBS"; then - dbus-glib-1 >= $DBUS_GLIB_REQUIRED \ - pangocairo >= $PANGOCAIRO_REQUIRED \ - librsvg-2.0 >= $LIBRSVG_REQUIRED -- libcanberra-gtk $UDEV_PKG") 2>&5 -+ libcanberra-gtk $HAL_PKG") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then -@@ -14130,7 +14130,7 @@ if test -n "$CHEESE_LIBS"; then - dbus-glib-1 >= $DBUS_GLIB_REQUIRED \ - pangocairo >= $PANGOCAIRO_REQUIRED \ - librsvg-2.0 >= $LIBRSVG_REQUIRED -- libcanberra-gtk $UDEV_PKG" 2>/dev/null` -+ libcanberra-gtk $HAL_PKG" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -14163,7 +14163,7 @@ fi - dbus-glib-1 >= $DBUS_GLIB_REQUIRED \ - pangocairo >= $PANGOCAIRO_REQUIRED \ - librsvg-2.0 >= $LIBRSVG_REQUIRED -- libcanberra-gtk $UDEV_PKG" 2>&1` -+ libcanberra-gtk $HAL_PKG" 2>&1` - else - CHEESE_PKG_ERRORS=`$PKG_CONFIG --print-errors "\ - glib-2.0 >= $GLIB_REQUIRED \ -@@ -14180,7 +14180,7 @@ fi - dbus-glib-1 >= $DBUS_GLIB_REQUIRED \ - pangocairo >= $PANGOCAIRO_REQUIRED \ - librsvg-2.0 >= $LIBRSVG_REQUIRED -- libcanberra-gtk $UDEV_PKG" 2>&1` -+ libcanberra-gtk $HAL_PKG" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$CHEESE_PKG_ERRORS" >&5 -@@ -14200,7 +14200,7 @@ fi - dbus-glib-1 >= $DBUS_GLIB_REQUIRED \ - pangocairo >= $PANGOCAIRO_REQUIRED \ - librsvg-2.0 >= $LIBRSVG_REQUIRED -- libcanberra-gtk $UDEV_PKG) were not met: -+ libcanberra-gtk $HAL_PKG) were not met: - - $CHEESE_PKG_ERRORS - |