* [PATCH 0/1] libx11-diet: update to 1.4.4
@ 2011-11-11 11:09 Xiaofeng Yan
2011-11-11 11:09 ` [PATCH 1/1] " Xiaofeng Yan
2013-10-29 19:34 ` [PATCH 0/1] " Saul Wold
0 siblings, 2 replies; 5+ messages in thread
From: Xiaofeng Yan @ 2011-11-11 11:09 UTC (permalink / raw)
To: openembedded-core
From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
Hi Saul,
I have modified my fault according to your suggestion.
Please review it again.
Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: xiaofeng/update_libx11-diet
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=xiaofeng/update_libx11-diet
Thanks,
Xiaofeng Yan <xiaofeng.yan@windriver.com>
---
Xiaofeng Yan (1):
libx11-diet: update to 1.4.4
.../xorg-lib/libx11-diet-1.3/include_fix.patch | 25 --------------
.../xorg-lib/libx11-diet-1.3/nodolt.patch | 14 --------
.../libx11-diet-1.3/x11_disable_makekeys.patch | 31 ------------------
.../X18NCMSstubs.diff | 1 +
.../fix-disable-xlocale.diff | 1 +
.../fix-utf8-wrong-define.patch | 2 +
.../libx11-diet-1.4.4/keysymdef_include.patch | 23 +++++++++++++
.../libx11-diet-1.4.4/x11_disable_makekeys.patch | 34 ++++++++++++++++++++
meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb | 25 --------------
.../recipes-graphics/xorg-lib/libx11-diet_1.4.4.bb | 28 ++++++++++++++++
10 files changed, 89 insertions(+), 95 deletions(-)
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet-1.3/include_fix.patch
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet-1.3/nodolt.patch
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet-1.3/x11_disable_makekeys.patch
rename meta/recipes-graphics/xorg-lib/{libx11-diet-1.3 => libx11-diet-1.4.4}/X18NCMSstubs.diff (99%)
rename meta/recipes-graphics/xorg-lib/{libx11-diet-1.3 => libx11-diet-1.4.4}/fix-disable-xlocale.diff (90%)
rename meta/recipes-graphics/xorg-lib/{libx11-diet-1.3 => libx11-diet-1.4.4}/fix-utf8-wrong-define.patch (88%)
create mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/keysymdef_include.patch
create mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/x11_disable_makekeys.patch
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb
create mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet_1.4.4.bb
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH 1/1] libx11-diet: update to 1.4.4 2011-11-11 11:09 [PATCH 0/1] libx11-diet: update to 1.4.4 Xiaofeng Yan @ 2011-11-11 11:09 ` Xiaofeng Yan 2011-11-13 21:53 ` Saul Wold 2013-10-29 19:34 ` [PATCH 0/1] " Saul Wold 1 sibling, 1 reply; 5+ messages in thread From: Xiaofeng Yan @ 2011-11-11 11:09 UTC (permalink / raw) To: openembedded-core From: Xiaofeng Yan <xiaofeng.yan@windriver.com> I remove patch "nodolt.patch" because it is no use in the new version \ and change patch "include_fix.patch" to "keysymdef_include.patch" from libx11-1.4.4. Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> --- .../xorg-lib/libx11-diet-1.3/include_fix.patch | 25 -------------- .../xorg-lib/libx11-diet-1.3/nodolt.patch | 14 -------- .../libx11-diet-1.3/x11_disable_makekeys.patch | 31 ------------------ .../X18NCMSstubs.diff | 1 + .../fix-disable-xlocale.diff | 1 + .../fix-utf8-wrong-define.patch | 2 + .../libx11-diet-1.4.4/keysymdef_include.patch | 23 +++++++++++++ .../libx11-diet-1.4.4/x11_disable_makekeys.patch | 34 ++++++++++++++++++++ meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb | 25 -------------- .../recipes-graphics/xorg-lib/libx11-diet_1.4.4.bb | 28 ++++++++++++++++ 10 files changed, 89 insertions(+), 95 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet-1.3/include_fix.patch delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet-1.3/nodolt.patch delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet-1.3/x11_disable_makekeys.patch rename meta/recipes-graphics/xorg-lib/{libx11-diet-1.3 => libx11-diet-1.4.4}/X18NCMSstubs.diff (99%) rename meta/recipes-graphics/xorg-lib/{libx11-diet-1.3 => libx11-diet-1.4.4}/fix-disable-xlocale.diff (90%) rename meta/recipes-graphics/xorg-lib/{libx11-diet-1.3 => libx11-diet-1.4.4}/fix-utf8-wrong-define.patch (88%) create mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/keysymdef_include.patch create mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/x11_disable_makekeys.patch delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb create mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet_1.4.4.bb diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/include_fix.patch b/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/include_fix.patch deleted file mode 100644 index b3bcbab..0000000 --- a/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/include_fix.patch +++ /dev/null @@ -1,25 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - ---- - configure.ac | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - ---- libX11-1.1.5.orig/configure.ac -+++ libX11-1.1.5/configure.ac -@@ -218,13 +218,13 @@ AC_SUBST(XDMCP_LIBS) - AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])], ) - - # - # Find keysymdef.h - # --AC_MSG_CHECKING([keysymdef.h]) --dir=`pkg-config --variable=includedir xproto` --KEYSYMDEF="$dir/X11/keysymdef.h" -+AC_ARG_WITH(keysymdef, -+ AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]), -+ KEYSYMDEF=$withval, KEYSYMDEF="") - if test -f "$KEYSYMDEF"; then - AC_MSG_RESULT([$KEYSYMDEF]) - else - AC_MSG_ERROR([Cannot find keysymdef.h]) - fi diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/nodolt.patch b/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/nodolt.patch deleted file mode 100644 index cc05fdc..0000000 --- a/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/nodolt.patch +++ /dev/null @@ -1,14 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -Index: libX11-1.2.1/configure.ac -=================================================================== ---- libX11-1.2.1.orig/configure.ac 2009-07-02 14:07:54.000000000 +0100 -+++ libX11-1.2.1/configure.ac 2009-07-02 14:08:01.000000000 +0100 -@@ -20,7 +20,6 @@ - - # Checks for programs. - AC_PROG_LIBTOOL --DOLT - AC_PROG_CC - XORG_CWARNFLAGS - diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/x11_disable_makekeys.patch b/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/x11_disable_makekeys.patch deleted file mode 100644 index 0445835..0000000 --- a/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/x11_disable_makekeys.patch +++ /dev/null @@ -1,31 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - ---- - src/util/Makefile.am | 17 ----------------- - 1 file changed, 17 deletions(-) - -Index: libX11-1.2.1/src/util/Makefile.am -=================================================================== ---- libX11-1.2.1.orig/src/util/Makefile.am 2008-10-07 18:18:19.000000000 +0100 -+++ libX11-1.2.1/src/util/Makefile.am 2009-07-02 14:04:38.000000000 +0100 -@@ -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 diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/X18NCMSstubs.diff b/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/X18NCMSstubs.diff similarity index 99% rename from meta/recipes-graphics/xorg-lib/libx11-diet-1.3/X18NCMSstubs.diff rename to meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/X18NCMSstubs.diff index 91ab180..be71d44 100644 --- a/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/X18NCMSstubs.diff +++ b/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/X18NCMSstubs.diff @@ -1,5 +1,6 @@ Upstream-Status: Pending +Upstream-Status: Inappropriate [configuration] Index: libX11-1.3/src/imConv.c =================================================================== --- libX11-1.3.orig/src/imConv.c diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/fix-disable-xlocale.diff b/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/fix-disable-xlocale.diff similarity index 90% rename from meta/recipes-graphics/xorg-lib/libx11-diet-1.3/fix-disable-xlocale.diff rename to meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/fix-disable-xlocale.diff index 7dcdd6a..a7c3984 100644 --- a/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/fix-disable-xlocale.diff +++ b/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/fix-disable-xlocale.diff @@ -1,5 +1,6 @@ Upstream-Status: Pending +Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> --- libX11-X11R7.0-1.0.0/src/Font.c.orig 2006-03-12 18:35:42.000000000 +0100 +++ libX11-X11R7.0-1.0.0/src/Font.c 2006-03-12 18:40:27.000000000 +0100 @@ -701,7 +701,11 @@ diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/fix-utf8-wrong-define.patch b/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/fix-utf8-wrong-define.patch similarity index 88% rename from meta/recipes-graphics/xorg-lib/libx11-diet-1.3/fix-utf8-wrong-define.patch rename to meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/fix-utf8-wrong-define.patch index 26d3349..c6347f5 100644 --- a/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/fix-utf8-wrong-define.patch +++ b/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/fix-utf8-wrong-define.patch @@ -1,5 +1,7 @@ Upstream-Status: Pending +Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> + # # Patch managed by http://www.holgerschurig.de/patcher.html # diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/keysymdef_include.patch b/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/keysymdef_include.patch new file mode 100644 index 0000000..d1bdab9 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/keysymdef_include.patch @@ -0,0 +1,23 @@ +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Martin Jansa <martin.jansa@gmail.com> + +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/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/x11_disable_makekeys.patch b/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/x11_disable_makekeys.patch new file mode 100644 index 0000000..ab48193 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/x11_disable_makekeys.patch @@ -0,0 +1,34 @@ +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> +--- + src/util/Makefile.am | 21 ----------------- + 1 file changed, 21 deletions(-) + +--- a/src/util/Makefile.am ++++ b/src/util/Makefile.am +@@ -1,24 +1,3 @@ + +-noinst_PROGRAMS=makekeys +- +-makekeys_CFLAGS = \ +- $(X11_CFLAGS) \ +- $(CWARNFLAGS) +- +-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/meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb b/meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb deleted file mode 100644 index de7edf1..0000000 --- a/meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb +++ /dev/null @@ -1,25 +0,0 @@ -require libx11.inc - -DESCRIPTION += " Support for XCB, UDC, XCMS and XLOCALE is disabled in \ -this version." - -LIC_FILES_CHKSUM = "file://COPYING;md5=597df7e9217e89ccaeb749f48ce2aeb0" - -PR = "r4" - -SRC_URI += "file://x11_disable_makekeys.patch \ - file://include_fix.patch \ - file://X18NCMSstubs.diff \ - file://fix-disable-xlocale.diff \ - file://fix-utf8-wrong-define.patch \ - file://nodolt.patch" - -SRC_URI[md5sum] = "0545089013213e90aac19b8f8045d32e" -SRC_URI[sha256sum] = "34656d022ff2f94430b534612821428fe15ade028d86a42907958167f2e497ac" - -DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ - libxdmcp xf86bigfontproto kbproto inputproto xproto-native" - - -EXTRA_OECONF += "--with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h --without-xcb --disable-udc --disable-xcms --disable-xlocale" -CFLAGS += "-D_GNU_SOURCE" diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_1.4.4.bb b/meta/recipes-graphics/xorg-lib/libx11-diet_1.4.4.bb new file mode 100644 index 0000000..1762829 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libx11-diet_1.4.4.bb @@ -0,0 +1,28 @@ +require libx11.inc + +DESCRIPTION += " Support for XCB, UDC, XCMS and XLOCALE is disabled in \ +this version." + +LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7" + +PR = "r0" + +SRC_URI += "file://x11_disable_makekeys.patch \ + file://X18NCMSstubs.diff \ + file://keysymdef_include.patch \ + file://fix-disable-xlocale.diff \ + file://fix-utf8-wrong-define.patch \ + " + + +SRC_URI[md5sum] = "ed7c382cbf8c13425b6a66bcac0ca5d9" +SRC_URI[sha256sum] = "7fe62180f08ef5f0a0062fb444591e349cae2ab5af6ad834599f5c654e6c840d" + +DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ + libxdmcp xf86bigfontproto kbproto inputproto xproto-native" + +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11" + +EXTRA_OECONF += "--without-xcb --disable-udc --disable-xcms --disable-xlocale --with-keysymdefdir=${STAGING_INCDIR}/X11" +CFLAGS += "-D_GNU_SOURCE" + -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 1/1] libx11-diet: update to 1.4.4 2011-11-11 11:09 ` [PATCH 1/1] " Xiaofeng Yan @ 2011-11-13 21:53 ` Saul Wold 0 siblings, 0 replies; 5+ messages in thread From: Saul Wold @ 2011-11-13 21:53 UTC (permalink / raw) To: Patches and discussions about the oe-core layer On 11/11/2011 03:09 AM, Xiaofeng Yan wrote: > From: Xiaofeng Yan<xiaofeng.yan@windriver.com> > > I remove patch "nodolt.patch" because it is no use in the new version \ > and change patch "include_fix.patch" to "keysymdef_include.patch" from libx11-1.4.4. > > Signed-off-by: Xiaofeng Yan<xiaofeng.yan@windriver.com> > --- > .../xorg-lib/libx11-diet-1.3/include_fix.patch | 25 -------------- > .../xorg-lib/libx11-diet-1.3/nodolt.patch | 14 -------- > .../libx11-diet-1.3/x11_disable_makekeys.patch | 31 ------------------ > .../X18NCMSstubs.diff | 1 + > .../fix-disable-xlocale.diff | 1 + > .../fix-utf8-wrong-define.patch | 2 + > .../libx11-diet-1.4.4/keysymdef_include.patch | 23 +++++++++++++ > .../libx11-diet-1.4.4/x11_disable_makekeys.patch | 34 ++++++++++++++++++++ > meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb | 25 -------------- > .../recipes-graphics/xorg-lib/libx11-diet_1.4.4.bb | 28 ++++++++++++++++ > 10 files changed, 89 insertions(+), 95 deletions(-) > delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet-1.3/include_fix.patch > delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet-1.3/nodolt.patch > delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet-1.3/x11_disable_makekeys.patch > rename meta/recipes-graphics/xorg-lib/{libx11-diet-1.3 => libx11-diet-1.4.4}/X18NCMSstubs.diff (99%) > rename meta/recipes-graphics/xorg-lib/{libx11-diet-1.3 => libx11-diet-1.4.4}/fix-disable-xlocale.diff (90%) > rename meta/recipes-graphics/xorg-lib/{libx11-diet-1.3 => libx11-diet-1.4.4}/fix-utf8-wrong-define.patch (88%) > create mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/keysymdef_include.patch > create mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/x11_disable_makekeys.patch > delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb > create mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet_1.4.4.bb > <SNIP> > diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_1.4.4.bb b/meta/recipes-graphics/xorg-lib/libx11-diet_1.4.4.bb > new file mode 100644 > index 0000000..1762829 > --- /dev/null > +++ b/meta/recipes-graphics/xorg-lib/libx11-diet_1.4.4.bb > @@ -0,0 +1,28 @@ > +require libx11.inc > + > +DESCRIPTION += " Support for XCB, UDC, XCMS and XLOCALE is disabled in \ > +this version." > + > +LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7" > + > +PR = "r0" > + > +SRC_URI += "file://x11_disable_makekeys.patch \ > + file://X18NCMSstubs.diff \ > + file://keysymdef_include.patch \ > + file://fix-disable-xlocale.diff \ > + file://fix-utf8-wrong-define.patch \ > + " > + > + > +SRC_URI[md5sum] = "ed7c382cbf8c13425b6a66bcac0ca5d9" > +SRC_URI[sha256sum] = "7fe62180f08ef5f0a0062fb444591e349cae2ab5af6ad834599f5c654e6c840d" > + > +DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ > + libxdmcp xf86bigfontproto kbproto inputproto xproto-native" > + > +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11" > + Why did you need to add FILESDIR here? Sau! > +EXTRA_OECONF += "--without-xcb --disable-udc --disable-xcms --disable-xlocale --with-keysymdefdir=${STAGING_INCDIR}/X11" > +CFLAGS += "-D_GNU_SOURCE" > + ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 0/1] libx11-diet: update to 1.4.4 2011-11-11 11:09 [PATCH 0/1] libx11-diet: update to 1.4.4 Xiaofeng Yan 2011-11-11 11:09 ` [PATCH 1/1] " Xiaofeng Yan @ 2013-10-29 19:34 ` Saul Wold 1 sibling, 0 replies; 5+ messages in thread From: Saul Wold @ 2013-10-29 19:34 UTC (permalink / raw) To: Patches and discussions about the oe-core layer; +Cc: Xiaofeng Yan On 11/11/2011 03:09 AM, Xiaofeng Yan wrote: > From: Xiaofeng Yan<xiaofeng.yan@windriver.com> > > Hi Saul, > > I have modified my fault according to your suggestion. > Please review it again. > > Pull URL: git://git.pokylinux.org/poky-contrib.git > Branch: xiaofeng/update_libx11-diet > Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=xiaofeng/update_libx11-diet > > Thanks, > Xiaofeng Yan<xiaofeng.yan@windriver.com> > --- > > > Xiaofeng Yan (1): > libx11-diet: update to 1.4.4 > > .../xorg-lib/libx11-diet-1.3/include_fix.patch | 25 -------------- > .../xorg-lib/libx11-diet-1.3/nodolt.patch | 14 -------- > .../libx11-diet-1.3/x11_disable_makekeys.patch | 31 ------------------ > .../X18NCMSstubs.diff | 1 + > .../fix-disable-xlocale.diff | 1 + > .../fix-utf8-wrong-define.patch | 2 + > .../libx11-diet-1.4.4/keysymdef_include.patch | 23 +++++++++++++ > .../libx11-diet-1.4.4/x11_disable_makekeys.patch | 34 ++++++++++++++++++++ > meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb | 25 -------------- > .../recipes-graphics/xorg-lib/libx11-diet_1.4.4.bb | 28 ++++++++++++++++ > 10 files changed, 89 insertions(+), 95 deletions(-) > delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet-1.3/include_fix.patch > delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet-1.3/nodolt.patch > delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet-1.3/x11_disable_makekeys.patch > rename meta/recipes-graphics/xorg-lib/{libx11-diet-1.3 => libx11-diet-1.4.4}/X18NCMSstubs.diff (99%) > rename meta/recipes-graphics/xorg-lib/{libx11-diet-1.3 => libx11-diet-1.4.4}/fix-disable-xlocale.diff (90%) > rename meta/recipes-graphics/xorg-lib/{libx11-diet-1.3 => libx11-diet-1.4.4}/fix-utf8-wrong-define.patch (88%) > create mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/keysymdef_include.patch > create mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/x11_disable_makekeys.patch > delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb > create mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet_1.4.4.bb > > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core Merged into OE-Core Thanks Sau! ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 0/1] libx11-diet: update to 1.4.4
@ 2011-11-15 10:07 Xiaofeng Yan
2011-11-15 10:07 ` [PATCH 1/1] " Xiaofeng Yan
0 siblings, 1 reply; 5+ messages in thread
From: Xiaofeng Yan @ 2011-11-15 10:07 UTC (permalink / raw)
To: openembedded-core
From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
Hi Saul,
I have modified my fault according to your suggestion.
Please review it again.
Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: xiaofeng/libx11-diet
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=xiaofeng/libx11-diet
Thanks,
Xiaofeng Yan <xiaofeng.yan@windriver.com>
---
Xiaofeng Yan (1):
libx11-diet: update to 1.4.4
.../xorg-lib/libx11-diet-1.3/include_fix.patch | 25 --------------
.../xorg-lib/libx11-diet-1.3/nodolt.patch | 14 --------
.../libx11-diet-1.3/x11_disable_makekeys.patch | 31 ------------------
.../X18NCMSstubs.diff | 1 +
.../fix-disable-xlocale.diff | 1 +
.../fix-utf8-wrong-define.patch | 2 +
.../libx11-diet-1.4.4/keysymdef_include.patch | 23 +++++++++++++
.../libx11-diet-1.4.4/x11_disable_makekeys.patch | 34 ++++++++++++++++++++
.../{libx11-diet_1.3.bb => libx11-diet_1.4.4.bb} | 17 +++++-----
9 files changed, 70 insertions(+), 78 deletions(-)
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet-1.3/include_fix.patch
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet-1.3/nodolt.patch
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet-1.3/x11_disable_makekeys.patch
rename meta/recipes-graphics/xorg-lib/{libx11-diet-1.3 => libx11-diet-1.4.4}/X18NCMSstubs.diff (99%)
rename meta/recipes-graphics/xorg-lib/{libx11-diet-1.3 => libx11-diet-1.4.4}/fix-disable-xlocale.diff (90%)
rename meta/recipes-graphics/xorg-lib/{libx11-diet-1.3 => libx11-diet-1.4.4}/fix-utf8-wrong-define.patch (88%)
create mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/keysymdef_include.patch
create mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/x11_disable_makekeys.patch
rename meta/recipes-graphics/xorg-lib/{libx11-diet_1.3.bb => libx11-diet_1.4.4.bb} (51%)
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH 1/1] libx11-diet: update to 1.4.4 2011-11-15 10:07 Xiaofeng Yan @ 2011-11-15 10:07 ` Xiaofeng Yan 0 siblings, 0 replies; 5+ messages in thread From: Xiaofeng Yan @ 2011-11-15 10:07 UTC (permalink / raw) To: openembedded-core From: Xiaofeng Yan <xiaofeng.yan@windriver.com> The main changes are as follow: * Remove patch "nodolt.patch" because it is no use in the new version * Change patch "include_fix.patch" to "keysymdef_include.patch" from libx11-1.4.4. * Remove --without-xcb from EXTRA_OECONF because xcb is a necessary item for new version. Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> --- .../xorg-lib/libx11-diet-1.3/include_fix.patch | 25 -------------- .../xorg-lib/libx11-diet-1.3/nodolt.patch | 14 -------- .../libx11-diet-1.3/x11_disable_makekeys.patch | 31 ------------------ .../X18NCMSstubs.diff | 1 + .../fix-disable-xlocale.diff | 1 + .../fix-utf8-wrong-define.patch | 2 + .../libx11-diet-1.4.4/keysymdef_include.patch | 23 +++++++++++++ .../libx11-diet-1.4.4/x11_disable_makekeys.patch | 34 ++++++++++++++++++++ .../{libx11-diet_1.3.bb => libx11-diet_1.4.4.bb} | 17 +++++----- 9 files changed, 70 insertions(+), 78 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet-1.3/include_fix.patch delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet-1.3/nodolt.patch delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet-1.3/x11_disable_makekeys.patch rename meta/recipes-graphics/xorg-lib/{libx11-diet-1.3 => libx11-diet-1.4.4}/X18NCMSstubs.diff (99%) rename meta/recipes-graphics/xorg-lib/{libx11-diet-1.3 => libx11-diet-1.4.4}/fix-disable-xlocale.diff (90%) rename meta/recipes-graphics/xorg-lib/{libx11-diet-1.3 => libx11-diet-1.4.4}/fix-utf8-wrong-define.patch (88%) create mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/keysymdef_include.patch create mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/x11_disable_makekeys.patch rename meta/recipes-graphics/xorg-lib/{libx11-diet_1.3.bb => libx11-diet_1.4.4.bb} (51%) diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/include_fix.patch b/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/include_fix.patch deleted file mode 100644 index b3bcbab..0000000 --- a/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/include_fix.patch +++ /dev/null @@ -1,25 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - ---- - configure.ac | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - ---- libX11-1.1.5.orig/configure.ac -+++ libX11-1.1.5/configure.ac -@@ -218,13 +218,13 @@ AC_SUBST(XDMCP_LIBS) - AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])], ) - - # - # Find keysymdef.h - # --AC_MSG_CHECKING([keysymdef.h]) --dir=`pkg-config --variable=includedir xproto` --KEYSYMDEF="$dir/X11/keysymdef.h" -+AC_ARG_WITH(keysymdef, -+ AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]), -+ KEYSYMDEF=$withval, KEYSYMDEF="") - if test -f "$KEYSYMDEF"; then - AC_MSG_RESULT([$KEYSYMDEF]) - else - AC_MSG_ERROR([Cannot find keysymdef.h]) - fi diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/nodolt.patch b/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/nodolt.patch deleted file mode 100644 index cc05fdc..0000000 --- a/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/nodolt.patch +++ /dev/null @@ -1,14 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -Index: libX11-1.2.1/configure.ac -=================================================================== ---- libX11-1.2.1.orig/configure.ac 2009-07-02 14:07:54.000000000 +0100 -+++ libX11-1.2.1/configure.ac 2009-07-02 14:08:01.000000000 +0100 -@@ -20,7 +20,6 @@ - - # Checks for programs. - AC_PROG_LIBTOOL --DOLT - AC_PROG_CC - XORG_CWARNFLAGS - diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/x11_disable_makekeys.patch b/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/x11_disable_makekeys.patch deleted file mode 100644 index 0445835..0000000 --- a/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/x11_disable_makekeys.patch +++ /dev/null @@ -1,31 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - ---- - src/util/Makefile.am | 17 ----------------- - 1 file changed, 17 deletions(-) - -Index: libX11-1.2.1/src/util/Makefile.am -=================================================================== ---- libX11-1.2.1.orig/src/util/Makefile.am 2008-10-07 18:18:19.000000000 +0100 -+++ libX11-1.2.1/src/util/Makefile.am 2009-07-02 14:04:38.000000000 +0100 -@@ -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 diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/X18NCMSstubs.diff b/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/X18NCMSstubs.diff similarity index 99% rename from meta/recipes-graphics/xorg-lib/libx11-diet-1.3/X18NCMSstubs.diff rename to meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/X18NCMSstubs.diff index 91ab180..be71d44 100644 --- a/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/X18NCMSstubs.diff +++ b/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/X18NCMSstubs.diff @@ -1,5 +1,6 @@ Upstream-Status: Pending +Upstream-Status: Inappropriate [configuration] Index: libX11-1.3/src/imConv.c =================================================================== --- libX11-1.3.orig/src/imConv.c diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/fix-disable-xlocale.diff b/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/fix-disable-xlocale.diff similarity index 90% rename from meta/recipes-graphics/xorg-lib/libx11-diet-1.3/fix-disable-xlocale.diff rename to meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/fix-disable-xlocale.diff index 7dcdd6a..a7c3984 100644 --- a/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/fix-disable-xlocale.diff +++ b/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/fix-disable-xlocale.diff @@ -1,5 +1,6 @@ Upstream-Status: Pending +Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> --- libX11-X11R7.0-1.0.0/src/Font.c.orig 2006-03-12 18:35:42.000000000 +0100 +++ libX11-X11R7.0-1.0.0/src/Font.c 2006-03-12 18:40:27.000000000 +0100 @@ -701,7 +701,11 @@ diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/fix-utf8-wrong-define.patch b/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/fix-utf8-wrong-define.patch similarity index 88% rename from meta/recipes-graphics/xorg-lib/libx11-diet-1.3/fix-utf8-wrong-define.patch rename to meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/fix-utf8-wrong-define.patch index 26d3349..c6347f5 100644 --- a/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/fix-utf8-wrong-define.patch +++ b/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/fix-utf8-wrong-define.patch @@ -1,5 +1,7 @@ Upstream-Status: Pending +Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> + # # Patch managed by http://www.holgerschurig.de/patcher.html # diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/keysymdef_include.patch b/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/keysymdef_include.patch new file mode 100644 index 0000000..d1bdab9 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/keysymdef_include.patch @@ -0,0 +1,23 @@ +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Martin Jansa <martin.jansa@gmail.com> + +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/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/x11_disable_makekeys.patch b/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/x11_disable_makekeys.patch new file mode 100644 index 0000000..ab48193 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/x11_disable_makekeys.patch @@ -0,0 +1,34 @@ +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> +--- + src/util/Makefile.am | 21 ----------------- + 1 file changed, 21 deletions(-) + +--- a/src/util/Makefile.am ++++ b/src/util/Makefile.am +@@ -1,24 +1,3 @@ + +-noinst_PROGRAMS=makekeys +- +-makekeys_CFLAGS = \ +- $(X11_CFLAGS) \ +- $(CWARNFLAGS) +- +-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/meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb b/meta/recipes-graphics/xorg-lib/libx11-diet_1.4.4.bb similarity index 51% rename from meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb rename to meta/recipes-graphics/xorg-lib/libx11-diet_1.4.4.bb index de7edf1..68b65ef 100644 --- a/meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb +++ b/meta/recipes-graphics/xorg-lib/libx11-diet_1.4.4.bb @@ -3,23 +3,24 @@ require libx11.inc DESCRIPTION += " Support for XCB, UDC, XCMS and XLOCALE is disabled in \ this version." -LIC_FILES_CHKSUM = "file://COPYING;md5=597df7e9217e89ccaeb749f48ce2aeb0" +LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7" -PR = "r4" +PR = "r0" SRC_URI += "file://x11_disable_makekeys.patch \ - file://include_fix.patch \ file://X18NCMSstubs.diff \ + file://keysymdef_include.patch \ file://fix-disable-xlocale.diff \ file://fix-utf8-wrong-define.patch \ - file://nodolt.patch" + " -SRC_URI[md5sum] = "0545089013213e90aac19b8f8045d32e" -SRC_URI[sha256sum] = "34656d022ff2f94430b534612821428fe15ade028d86a42907958167f2e497ac" -DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ +SRC_URI[md5sum] = "ed7c382cbf8c13425b6a66bcac0ca5d9" +SRC_URI[sha256sum] = "7fe62180f08ef5f0a0062fb444591e349cae2ab5af6ad834599f5c654e6c840d" + +DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto libxcb\ libxdmcp xf86bigfontproto kbproto inputproto xproto-native" -EXTRA_OECONF += "--with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h --without-xcb --disable-udc --disable-xcms --disable-xlocale" +EXTRA_OECONF += "--disable-udc --disable-xcms --disable-xlocale --with-keysymdefdir=${STAGING_INCDIR}/X11" CFLAGS += "-D_GNU_SOURCE" -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2013-10-29 19:34 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2011-11-11 11:09 [PATCH 0/1] libx11-diet: update to 1.4.4 Xiaofeng Yan 2011-11-11 11:09 ` [PATCH 1/1] " Xiaofeng Yan 2011-11-13 21:53 ` Saul Wold 2013-10-29 19:34 ` [PATCH 0/1] " Saul Wold -- strict thread matches above, loose matches on Subject: below -- 2011-11-15 10:07 Xiaofeng Yan 2011-11-15 10:07 ` [PATCH 1/1] " Xiaofeng Yan
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox