From patchwork Tue Jun 3 07:24:20 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Mads_Dor=C3=A9_Hansen?= X-Patchwork-Id: 355200 X-Patchwork-Delegate: jacob.kjaergaard@prevas.dk Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hugin.dotsrc.org (hugin.dotsrc.org [IPv6:2001:878:346::102]) by ozlabs.org (Postfix) with ESMTP id 33DE61400A4 for ; Tue, 3 Jun 2014 17:24:31 +1000 (EST) Received: from hugin.dotsrc.org (localhost [127.0.0.1]) by hugin.dotsrc.org (Postfix) with ESMTP id 126FB3F8BB for ; Tue, 3 Jun 2014 09:24:26 +0200 (CEST) X-Original-To: dev@oe-lite.org Delivered-To: dev@oe-lite.org Received: from ispc7.dotserv.com (ispc7.dotserv.com [178.20.216.17]) by hugin.dotsrc.org (Postfix) with ESMTPS id E890E3F8BB for ; Tue, 3 Jun 2014 09:24:24 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by ispc7.dotserv.com (Postfix) with ESMTP id 4AB7B6383A for ; Tue, 3 Jun 2014 09:24:24 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at ispc7.dotserv.com Received: from ispc7.dotserv.com ([127.0.0.1]) by localhost (ispc7.dotserv.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id alTMz2eRZhEy for ; Tue, 3 Jun 2014 09:24:20 +0200 (CEST) Received: from localhost.localdomain (unknown [195.215.105.114]) (Authenticated sender: dore@madsdore.dk) by ispc7.dotserv.com (Postfix) with ESMTPSA id 72F4E6407F for ; Tue, 3 Jun 2014 09:24:20 +0200 (CEST) From: =?UTF-8?q?Mads=20Dor=C3=A9?= To: dev@oe-lite.org Subject: [xorg] Added libx11 version 1.4.99.902 to fix build problem on Linux Mint 17. Date: Tue, 3 Jun 2014 09:24:20 +0200 Message-Id: <1401780260-8512-1-git-send-email-dore@madsdore.dk> X-Mailer: git-send-email 2.0.0 X-BeenThere: dev@oe-lite.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: OE-lite development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dev-bounces@oe-lite.org Errors-To: dev-bounces@oe-lite.org From: mdh --- .../libx11-1.4.99.902/disable_makekeys.patch | 30 ++++++++++++++++++++++ .../xorg-lib/libx11-1.4.99.902/disable_tests.patch | 12 +++++++++ .../libx11-1.4.99.902/keysymdef_include.patch | 23 +++++++++++++++++ recipes/xorg-lib/libx11_1.4.99.902.oe | 20 +++++++++++++++ recipes/xorg-lib/libx11_1.4.99.902.oe.sig | 1 + 5 files changed, 86 insertions(+) create mode 100644 recipes/xorg-lib/libx11-1.4.99.902/disable_makekeys.patch create mode 100644 recipes/xorg-lib/libx11-1.4.99.902/disable_tests.patch create mode 100644 recipes/xorg-lib/libx11-1.4.99.902/keysymdef_include.patch create mode 100644 recipes/xorg-lib/libx11_1.4.99.902.oe create mode 100644 recipes/xorg-lib/libx11_1.4.99.902.oe.sig diff --git a/recipes/xorg-lib/libx11-1.4.99.902/disable_makekeys.patch b/recipes/xorg-lib/libx11-1.4.99.902/disable_makekeys.patch new file mode 100644 index 0000000..ed1308c --- /dev/null +++ b/recipes/xorg-lib/libx11-1.4.99.902/disable_makekeys.patch @@ -0,0 +1,30 @@ +--- libX11-1.4.99.902/src/util/Makefile.am.orig 2014-06-02 14:59:20.350075680 +0200 ++++ libX11-1.4.99.902/src/util/Makefile.am 2014-06-02 14:59:49.622076858 +0200 +@@ -1,27 +1 @@ +- +-noinst_PROGRAMS=makekeys +- +-makekeys_CFLAGS = \ +- $(X11_CFLAGS) \ +- $(CWARNFLAGS) +- +-makekeys_CPPFLAGS = \ +- -I$(top_srcdir)/include +- +-CC = @CC_FOR_BUILD@ +-CPPFLAGS = @CPPFLAGS_FOR_BUILD@ +-CFLAGS = @CFLAGS_FOR_BUILD@ +-LDFLAGS = @LDFLAGS_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 diff --git a/recipes/xorg-lib/libx11-1.4.99.902/disable_tests.patch b/recipes/xorg-lib/libx11-1.4.99.902/disable_tests.patch new file mode 100644 index 0000000..a150931 --- /dev/null +++ b/recipes/xorg-lib/libx11-1.4.99.902/disable_tests.patch @@ -0,0 +1,12 @@ +diff -Nurd libX11-1.4.99.902/nls/Makefile.am libX11-1.5.0/nls/Makefile.am +--- libX11-1.4.99.902/nls/Makefile.am 2012-06-02 09:37:18.000000000 +0300 ++++ libX11-1.4.99.902/nls/Makefile.am 2013-01-02 16:10:24.960156131 +0200 +@@ -36,11 +36,6 @@ + < locale.dir.l1 > locale.dir.l2 + cat locale.dir.l2 locale.dir.l1 > locale.dir + +-if HAVE_PERL +-TESTS_ENVIRONMENT = $(PERL) +-TESTS = $(srcdir)/compose-check.pl +-endif HAVE_PERL +- diff --git a/recipes/xorg-lib/libx11-1.4.99.902/keysymdef_include.patch b/recipes/xorg-lib/libx11-1.4.99.902/keysymdef_include.patch new file mode 100644 index 0000000..d1bdab9 --- /dev/null +++ b/recipes/xorg-lib/libx11-1.4.99.902/keysymdef_include.patch @@ -0,0 +1,23 @@ +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Martin Jansa + +diff -uNr libX11-1.3.6.orig//configure.ac libX11-1.3.6/configure.ac +--- libX11-1.3.6.orig//configure.ac 2010-09-20 08:04:16.000000000 +0200 ++++ libX11-1.3.6/configure.ac 2010-09-28 16:29:26.000000000 +0200 +@@ -355,7 +355,14 @@ + # Find keysymdef.h + # + AC_MSG_CHECKING([keysym definitions]) +-KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11 ++AC_ARG_WITH(keysymdefdir, ++ AC_HELP_STRING([--with-keysymdefdir=DIR], [The location of keysymdef.h]), ++ KEYSYMDEFDIR=$withval, KEYSYMDEFDIR="") ++ ++if test x$KEYSYMDEFDIR = x; then ++ KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11 ++fi ++ + FILES="keysymdef.h XF86keysym.h Sunkeysym.h DECkeysym.h HPkeysym.h" + for i in $FILES; do + if test -f "$KEYSYMDEFDIR/$i"; then diff --git a/recipes/xorg-lib/libx11_1.4.99.902.oe b/recipes/xorg-lib/libx11_1.4.99.902.oe new file mode 100644 index 0000000..7cc8178 --- /dev/null +++ b/recipes/xorg-lib/libx11_1.4.99.902.oe @@ -0,0 +1,20 @@ +require libx11.inc +inherit gettext + +RECIPE_TYPES = "sdk machine native" + +EXTRA_OECONF += "--with-keysymdefdir=${HOST_SYSROOT}${includedir}/X11" + +#removed xtrans - removed xslt support elsewhere too +DEPENDS += "xtrans util-macros libxdmcp libxau \ + bigreqsproto xproto xextproto xcmiscproto \ + xf86bigfontproto kbproto inputproto libxcb" +DEPENDS_${PN} += "xproto libxcb libxau libxdmcp libdl" +# "libxau libxdmcp" +RDEPENDS_${PN} += "libxcb libxau libxdmcp libdl libc" + +SRC_URI += " file://disable_tests.patch \ + file://keysymdef_include.patch \ + file://disable_makekeys.patch \ + " + diff --git a/recipes/xorg-lib/libx11_1.4.99.902.oe.sig b/recipes/xorg-lib/libx11_1.4.99.902.oe.sig new file mode 100644 index 0000000..5aa9594 --- /dev/null +++ b/recipes/xorg-lib/libx11_1.4.99.902.oe.sig @@ -0,0 +1 @@ +afe75b7c2c54e354f726fd36251bcfec1e1f833a libX11-1.4.99.902.tar.bz2