diff options
| author | Martin.Jansa <Martin.Jansa@gmail.com> | 2009-10-29 11:10:21 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2009-12-22 13:16:52 +0100 |
| commit | fba77bf1ca0257e3e795b9c514b3420fc9cf5fed (patch) | |
| tree | 94e7816a6d0f78ca6771e74cde6ce9dd63df3710 /recipes/xorg-lib/libx11 | |
| parent | 4a29ef0bc8969754420c94a063d32f298ab16466 (diff) | |
xorg: add recipes for X11R7.5 release
* Update conf/distro/include/preferred-xorg-versions-X11R7.5.inc
* Only recipe versions specified in X11R7.5 and available at
http://www.x.org/releases/X11R7.5/src/
Diffstat (limited to 'recipes/xorg-lib/libx11')
| -rw-r--r-- | recipes/xorg-lib/libx11/dolt-fix.patch | 21 | ||||
| -rw-r--r-- | recipes/xorg-lib/libx11/x11_disable_makekeys.1.6.3.patch | 24 |
2 files changed, 45 insertions, 0 deletions
diff --git a/recipes/xorg-lib/libx11/dolt-fix.patch b/recipes/xorg-lib/libx11/dolt-fix.patch new file mode 100644 index 0000000000..ea1a8bd937 --- /dev/null +++ b/recipes/xorg-lib/libx11/dolt-fix.patch @@ -0,0 +1,21 @@ +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 new file mode 100644 index 0000000000..4358f79896 --- /dev/null +++ b/recipes/xorg-lib/libx11/x11_disable_makekeys.1.6.3.patch @@ -0,0 +1,24 @@ +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 |