summaryrefslogtreecommitdiffstats
path: root/package/x11r7/xlib_libX11
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2009-03-14 14:59:14 +0000
committerPeter Korsgaard <jacmet@sunsite.dk>2009-03-14 14:59:14 +0000
commit59b0aa7a7ee327688a77dd5d01d0b2032f6535a2 (patch)
tree734ec30ae8cf8acb65d94e98001d8947d437db3f /package/x11r7/xlib_libX11
parentbe245ad9c75863569add2d4b6a92922c3a680514 (diff)
downloadbuildroot-novena-59b0aa7a7ee327688a77dd5d01d0b2032f6535a2.tar.gz
buildroot-novena-59b0aa7a7ee327688a77dd5d01d0b2032f6535a2.zip
x11r7: update to 7.4
Patch by Dan Lykowski <lykowdk@gmail.com>, closes #181. Minor fixups for kdrive by me.
Diffstat (limited to 'package/x11r7/xlib_libX11')
-rw-r--r--package/x11r7/xlib_libX11/xlib_libX11-1.1.5-makekeys-nocc.patch (renamed from package/x11r7/xlib_libX11/xlib_libX11-1.1.3-makekeys-nocc.patch)12
-rw-r--r--package/x11r7/xlib_libX11/xlib_libX11.mk2
2 files changed, 8 insertions, 6 deletions
diff --git a/package/x11r7/xlib_libX11/xlib_libX11-1.1.3-makekeys-nocc.patch b/package/x11r7/xlib_libX11/xlib_libX11-1.1.5-makekeys-nocc.patch
index cefb1a513..df0825d9c 100644
--- a/package/x11r7/xlib_libX11/xlib_libX11-1.1.3-makekeys-nocc.patch
+++ b/package/x11r7/xlib_libX11/xlib_libX11-1.1.5-makekeys-nocc.patch
@@ -1,6 +1,7 @@
---- a/src/util/Makefile.in.orig 2008-01-30 10:54:59.000000000 -0500
-+++ b/src/util/Makefile.in 2008-01-30 10:54:16.000000000 -0500
-@@ -50,8 +50,7 @@ PROGRAMS = $(noinst_PROGRAMS)
+diff -urN xlib_libX11-1.1.5.orig/src/util/Makefile.in xlib_libX11-1.1.5/src/util/Makefile.in
+--- xlib_libX11-1.1.5.orig/src/util/Makefile.in 2009-01-31 19:59:12.000000000 -0800
++++ xlib_libX11-1.1.5/src/util/Makefile.in 2009-01-31 19:59:53.000000000 -0800
+@@ -50,9 +50,8 @@
makekeys_SOURCES = makekeys.c
makekeys_OBJECTS = makekeys-makekeys.$(OBJEXT)
makekeys_LDADD = $(LDADD)
@@ -9,9 +10,10 @@
- $(LDFLAGS) -o $@
+HOST_CC = gcc
+makekeys_LINK = $(HOST_CC) $(makekeys_CFLAGS) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@
- DEFAULT_INCLUDES = -I. -I$(top_builddir)/src -I$(top_builddir)/include/X11@am__isrc@
+ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include/X11
depcomp = $(SHELL) $(top_srcdir)/depcomp
-@@ -307,18 +307,18 @@ distclean-compile:
+ am__depfiles_maybe = depfiles
+@@ -311,18 +310,18 @@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
makekeys-makekeys.o: makekeys.c
diff --git a/package/x11r7/xlib_libX11/xlib_libX11.mk b/package/x11r7/xlib_libX11/xlib_libX11.mk
index 9e464d5d0..e5619668d 100644
--- a/package/x11r7/xlib_libX11/xlib_libX11.mk
+++ b/package/x11r7/xlib_libX11/xlib_libX11.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XLIB_LIBX11_VERSION = 1.1.3
+XLIB_LIBX11_VERSION = 1.1.5
XLIB_LIBX11_SOURCE = libX11-$(XLIB_LIBX11_VERSION).tar.bz2
XLIB_LIBX11_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBX11_AUTORECONF = NO