summaryrefslogtreecommitdiff
path: root/recipes/xorg-lib/libx11
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <marcin@juszkiewicz.com.pl>2009-10-09 16:49:36 +0200
committerMarcin Juszkiewicz <marcin@juszkiewicz.com.pl>2009-10-09 16:49:36 +0200
commitf39bf1b386f876aee67afe44006faafdf8db7705 (patch)
treeab46cae8efad660647ac037db6abcb7c3067aaa4 /recipes/xorg-lib/libx11
parent28dd4f870c5de61a1589d0e75c55a0d586aa9f64 (diff)
Revert "Add latest xorg stuff for xserver-1.7, script for easy recipe bump and xf86-video-glamo-kms"
This reverts commit 117ec4def4dff7abad394279698e1ddaef9407a7.
Diffstat (limited to 'recipes/xorg-lib/libx11')
-rw-r--r--recipes/xorg-lib/libx11/dolt-fix.patch21
-rw-r--r--recipes/xorg-lib/libx11/x11_disable_makekeys.1.6.3.patch24
2 files changed, 0 insertions, 45 deletions
diff --git a/recipes/xorg-lib/libx11/dolt-fix.patch b/recipes/xorg-lib/libx11/dolt-fix.patch
deleted file mode 100644
index ea1a8bd937..0000000000
--- a/recipes/xorg-lib/libx11/dolt-fix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -uNr libX11-1.2.99.901.orig/acinclude.m4 libX11-1.2.99.901/acinclude.m4
---- libX11-1.2.99.901.orig/acinclude.m4 2009-09-05 10:57:11.000000000 +0200
-+++ libX11-1.2.99.901/acinclude.m4 2009-09-05 10:59:14.000000000 +0200
-@@ -197,7 +197,7 @@
- cat <<__DOLTLIBTOOL__EOF__ > doltlibtool
- #!$DOLT_BASH
- __DOLTLIBTOOL__EOF__
-- cat <<'__DOLTLIBTOOL__EOF__' >>doltlibtool
-+ cat <<'__DOLTLIBTOOL__EOF__' | sed -e "s/@host_alias@/$host_alias/g" >>doltlibtool
- top_builddir_slash="${0%%doltlibtool}"
- : ${top_builddir_slash:=./}
- args=()
-@@ -213,7 +213,7 @@
- if $modeok && $tagok ; then
- . ${top_builddir_slash}doltcompile "${args@<:@@@:>@}"
- else
-- exec ${top_builddir_slash}libtool "$[]@"
-+ exec ${top_builddir_slash}@host_alias@-libtool "$[]@"
- fi
- __DOLTLIBTOOL__EOF__
-
diff --git a/recipes/xorg-lib/libx11/x11_disable_makekeys.1.6.3.patch b/recipes/xorg-lib/libx11/x11_disable_makekeys.1.6.3.patch
deleted file mode 100644
index 4358f79896..0000000000
--- a/recipes/xorg-lib/libx11/x11_disable_makekeys.1.6.3.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -uNr libX11-1.2.99.901.orig/src/util/Makefile.am libX11-1.2.99.901/src/util/Makefile.am
---- libX11-1.2.99.901.orig/src/util/Makefile.am 2009-08-12 13:21:19.000000000 +0200
-+++ libX11-1.2.99.901/src/util/Makefile.am 2009-08-12 13:22:21.000000000 +0200
-@@ -1,20 +1,3 @@
- # $XdotOrg: lib/X11/src/util/Makefile.am,v 1.4 2006-02-19 02:14:12 jamey Exp $
-
--noinst_PROGRAMS=makekeys
--
--makekeys_CFLAGS=$(X11_CFLAGS)
--
--CC = @CC_FOR_BUILD@
--
- EXTRA_DIST = mkks.sh
--
--if LINT
--# Check source code with tools like lint & sparse
--
--ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
--
--lint:
-- $(LINT) $(ALL_LINT_FLAGS) makekeys.c
--
--endif LINT