diff --git a/packages/x11/lib/libX11/patches/20_libX11_remove-xdmcp.diff b/packages/x11/lib/libX11/patches/20_libX11_remove-xdmcp.diff deleted file mode 100644 index ccc8672222..0000000000 --- a/packages/x11/lib/libX11/patches/20_libX11_remove-xdmcp.diff +++ /dev/null @@ -1,134 +0,0 @@ -diff -Naur libX11-1.2.2.orig/configure libX11-1.2.2/configure ---- libX11-1.2.2.orig/configure 2009-07-10 17:23:15.000000000 +0200 -+++ libX11-1.2.2/configure 2009-07-10 17:30:00.000000000 +0200 -@@ -13006,116 +13006,10 @@ - case "$ac_cv_use_xcb" in - no) - X11_REQUIRES="xau xcmiscproto bigreqsproto" -- X11_EXTRA_DEPS="xau xdmcp" -+ X11_EXTRA_DEPS="xau" - - pkg_failed=no --{ $as_echo "$as_me:$LINENO: checking for XDMCP" >&5 --$as_echo_n "checking for XDMCP... " >&6; } - --if test -n "$XDMCP_CFLAGS"; then -- pkg_cv_XDMCP_CFLAGS="$XDMCP_CFLAGS" -- elif test -n "$PKG_CONFIG"; then -- if test -n "$PKG_CONFIG" && \ -- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xdmcp\"") >&5 -- ($PKG_CONFIG --exists --print-errors "xdmcp") 2>&5 -- ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -- pkg_cv_XDMCP_CFLAGS=`$PKG_CONFIG --cflags "xdmcp" 2>/dev/null` --else -- pkg_failed=yes --fi -- else -- pkg_failed=untried --fi --if test -n "$XDMCP_LIBS"; then -- pkg_cv_XDMCP_LIBS="$XDMCP_LIBS" -- elif test -n "$PKG_CONFIG"; then -- if test -n "$PKG_CONFIG" && \ -- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xdmcp\"") >&5 -- ($PKG_CONFIG --exists --print-errors "xdmcp") 2>&5 -- ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -- pkg_cv_XDMCP_LIBS=`$PKG_CONFIG --libs "xdmcp" 2>/dev/null` --else -- pkg_failed=yes --fi -- else -- pkg_failed=untried --fi -- -- -- --if test $pkg_failed = yes; then -- --if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -- _pkg_short_errors_supported=yes --else -- _pkg_short_errors_supported=no --fi -- if test $_pkg_short_errors_supported = yes; then -- XDMCP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xdmcp" 2>&1` -- else -- XDMCP_PKG_ERRORS=`$PKG_CONFIG --print-errors "xdmcp" 2>&1` -- fi -- # Put the nasty error message in config.log where it belongs -- echo "$XDMCP_PKG_ERRORS" >&5 -- -- { { $as_echo "$as_me:$LINENO: error: Package requirements (xdmcp) were not met: -- --$XDMCP_PKG_ERRORS -- --Consider adjusting the PKG_CONFIG_PATH environment variable if you --installed software in a non-standard prefix. -- --Alternatively, you may set the environment variables XDMCP_CFLAGS --and XDMCP_LIBS to avoid the need to call pkg-config. --See the pkg-config man page for more details. --" >&5 --$as_echo "$as_me: error: Package requirements (xdmcp) were not met: -- --$XDMCP_PKG_ERRORS -- --Consider adjusting the PKG_CONFIG_PATH environment variable if you --installed software in a non-standard prefix. -- --Alternatively, you may set the environment variables XDMCP_CFLAGS --and XDMCP_LIBS to avoid the need to call pkg-config. --See the pkg-config man page for more details. --" >&2;} -- { (exit 1); exit 1; }; } --elif test $pkg_failed = untried; then -- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 --$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it --is in your PATH or set the PKG_CONFIG environment variable to the full --path to pkg-config. -- --Alternatively, you may set the environment variables XDMCP_CFLAGS --and XDMCP_LIBS to avoid the need to call pkg-config. --See the pkg-config man page for more details. -- --To get pkg-config, see . --See \`config.log' for more details." >&5 --$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it --is in your PATH or set the PKG_CONFIG environment variable to the full --path to pkg-config. -- --Alternatively, you may set the environment variables XDMCP_CFLAGS --and XDMCP_LIBS to avoid the need to call pkg-config. --See the pkg-config man page for more details. -- --To get pkg-config, see . --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; }; } --else -- XDMCP_CFLAGS=$pkg_cv_XDMCP_CFLAGS -- XDMCP_LIBS=$pkg_cv_XDMCP_LIBS -- { $as_echo "$as_me:$LINENO: result: yes" >&5 --$as_echo "yes" >&6; } -- : --fi - { $as_echo "$as_me:$LINENO: checking for XdmcpWrap in -lXdmcp" >&5 - $as_echo_n "checking for XdmcpWrap in -lXdmcp... " >&6; } - if test "${ac_cv_lib_Xdmcp_XdmcpWrap+set}" = set; then -diff -Naur libX11-1.2.2.orig/src/ConnDis.c libX11-1.2.2/src/ConnDis.c ---- libX11-1.2.2.orig/src/ConnDis.c 2009-07-10 17:23:15.000000000 +0200 -+++ libX11-1.2.2/src/ConnDis.c 2009-07-10 17:30:25.000000000 +0200 -@@ -39,7 +39,9 @@ - #include - #include - #include -+#ifdef HASXDMAUTH - #include -+#endif - #include - #include - #include diff --git a/packages/x11/lib/libX11/url b/packages/x11/lib/libX11/url index c449439220..c493bde772 100644 --- a/packages/x11/lib/libX11/url +++ b/packages/x11/lib/libX11/url @@ -1 +1 @@ -http://xorg.freedesktop.org/archive/individual/lib/libX11-1.2.99.901.tar.bz2 \ No newline at end of file +http://sources.openelec.tv/svn/libX11-20090905.tar.bz2 \ No newline at end of file