[Buildroot] [PATCH 1/2] package/libxml2: fix breakage due to unordered patches

[Buildroot] [PATCH 1/2] package/libxml2: fix breakage due to unordered patches

[Yann E. MORIN]

Depending on the locale, the patches may get sorted in different order
because they are not numbered. Also, even with the C locale (LC_ALL=C),
the second patch that gets applied is error-xpath.patch, but it depends
on other xpath patches to be applied first.

Rename the patches so they are numbered and they get applied in order.
Even then, some patches apply with offsets.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
CC: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 ....8-000-allocation-error-copying-entities.patch} |    0
 ....patch => libxml2-2.7.8-010-xpath-memory.patch} |    0
 ...patch => libxml2-2.7.8-020-xpath-freeing.patch} |    0
 ...atch => libxml2-2.7.8-021-xpath-freeing2.patch} |    0
 ... libxml2-2.7.8-030-reallocation-failures.patch} |    0
 ...tch => libxml2-2.7.8-040-hardening-xpath.patch} |    0
 ...h.patch => libxml2-2.7.8-050-error-xpath.patch} |    0
 ... => libxml2-2.7.8-060-hash-randomization.patch} |    0
 8 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/package/libxml2/libxml2-2.7.8-allocation-error-copying-entities.patch b/package/libxml2/libxml2-2.7.8-000-allocation-error-copying-entities.patch
similarity index 100%
rename from package/libxml2/libxml2-2.7.8-allocation-error-copying-entities.patch
rename to package/libxml2/libxml2-2.7.8-000-allocation-error-copying-entities.patch
diff --git a/package/libxml2/libxml2-2.7.8-xpath-memory.patch b/package/libxml2/libxml2-2.7.8-010-xpath-memory.patch
similarity index 100%
rename from package/libxml2/libxml2-2.7.8-xpath-memory.patch
rename to package/libxml2/libxml2-2.7.8-010-xpath-memory.patch
diff --git a/package/libxml2/libxml2-2.7.8-xpath-freeing.patch b/package/libxml2/libxml2-2.7.8-020-xpath-freeing.patch
similarity index 100%
rename from package/libxml2/libxml2-2.7.8-xpath-freeing.patch
rename to package/libxml2/libxml2-2.7.8-020-xpath-freeing.patch
diff --git a/package/libxml2/libxml2-2.7.8-xpath-freeing2.patch b/package/libxml2/libxml2-2.7.8-021-xpath-freeing2.patch
similarity index 100%
rename from package/libxml2/libxml2-2.7.8-xpath-freeing2.patch
rename to package/libxml2/libxml2-2.7.8-021-xpath-freeing2.patch
diff --git a/package/libxml2/libxml2-2.7.8-reallocation-failures.patch b/package/libxml2/libxml2-2.7.8-030-reallocation-failures.patch
similarity index 100%
rename from package/libxml2/libxml2-2.7.8-reallocation-failures.patch
rename to package/libxml2/libxml2-2.7.8-030-reallocation-failures.patch
diff --git a/package/libxml2/libxml2-2.7.8-hardening-xpath.patch b/package/libxml2/libxml2-2.7.8-040-hardening-xpath.patch
similarity index 100%
rename from package/libxml2/libxml2-2.7.8-hardening-xpath.patch
rename to package/libxml2/libxml2-2.7.8-040-hardening-xpath.patch
diff --git a/package/libxml2/libxml2-2.7.8-error-xpath.patch b/package/libxml2/libxml2-2.7.8-050-error-xpath.patch
similarity index 100%
rename from package/libxml2/libxml2-2.7.8-error-xpath.patch
rename to package/libxml2/libxml2-2.7.8-050-error-xpath.patch
diff --git a/package/libxml2/libxml2-2.7.8-hash-randomization.patch b/package/libxml2/libxml2-2.7.8-060-hash-randomization.patch
similarity index 100%
rename from package/libxml2/libxml2-2.7.8-hash-randomization.patch
rename to package/libxml2/libxml2-2.7.8-060-hash-randomization.patch
-- 
1.7.2.5

[Buildroot] [PATCH 2/2] package/giblib: fix breakage

[Yann E. MORIN]

Fix two things in the giblib package:

1- fix prefix breakage
   - s/STAGING/STAGING_DIR/ (Thomas)
   - prefix is .../usr, not .../usr/lib or .../usr/bin

2- fix the imlib2 breakage
   - imlib2 sets IMLIB2_(LIBS|CFLAGS), not IMLIB_(LIBS|CFLAGS)
   - autoreconf the package, install missing files
     Note that both configure.ac and configure.in are present in the
     package, so both are fixed, although only configure.ac is used
     (configure.in is the legacy name).

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
CC: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/giblib/giblib.mk    |    6 ++-
 package/giblib/giblib.patch |  119 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 123 insertions(+), 2 deletions(-)

diff --git a/package/giblib/giblib.mk b/package/giblib/giblib.mk
index 8288b74..75012ea 100644
--- a/package/giblib/giblib.mk
+++ b/package/giblib/giblib.mk
@@ -8,7 +8,9 @@ GIBLIB_SOURCE = giblib-$(GIBLIB_VERSION).tar.gz
 GIBLIB_SITE = http://linuxbrit.co.uk/downloads/
 GIBLIB_INSTALL_STAGING = YES
 GIBLIB_DEPENDENCIES = imlib2
-GIBLIB_CONF_OPT = --with-imlib2-prefix=$(STAGING)/usr/lib \
-		  --with-imlib2-exec-prefix=$(STAGING)/usr/bin
+GIBLIB_AUTORECONF = YES
+GIBLIB_AUTORECONF_OPT = --install
+GIBLIB_CONF_OPT = --with-imlib2-prefix=$(STAGING_DIR)/usr \
+		  --with-imlib2-exec-prefix=$(STAGING_DIR)/usr
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/giblib/giblib.patch b/package/giblib/giblib.patch
new file mode 100644
index 0000000..f149f07
--- /dev/null
+++ b/package/giblib/giblib.patch
@@ -0,0 +1,119 @@
+diff --git a/configure.ac b/configure.ac
+index 6807d86..c8874f0 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -18,16 +18,10 @@ AM_MAINTAINER_MODE
+ AM_WITH_DMALLOC
+ 
+ AC_PATH_GENERIC(imlib2, 1.0.0, [
+-  AC_SUBST(IMLIB_LIBS)
+-  AC_SUBST(IMLIB_CFLAGS) ],
++  AC_SUBST(IMLIB2_LIBS)
++  AC_SUBST(IMLIB2_CFLAGS) ],
+   AC_MSG_ERROR(Cannot find imlib2: Is imlib2-config in the path?) )
+ 
+-dnl the above doesn't work for some reason :/
+-IMLIB_LIBS=`imlib2-config --libs`
+-IMLIB_CFLAGS=`imlib2-config --cflags`
+-AC_SUBST(IMLIB_LIBS)
+-AC_SUBST(IMLIB_CFLAGS)
+-
+ LIBS="$LIBS -lm"
+ CFLAGS="$CFLAGS -Wall"
+ 
+@@ -48,7 +42,7 @@ $PACKAGE $VERSION
+ Configuration:
+ --------------
+ 
+-Imlib2 libs:	$IMLIB_LIBS
+-Imlib2 cflags:  $IMLIB_CFLAGS
++Imlib2 libs:	$IMLIB2_LIBS
++Imlib2 cflags:  $IMLIB2_CFLAGS
+ CFLAGS:			$CFLAGS
+ "
+diff --git a/configure.in b/configure.in
+index 432cb16..6999095 100644
+--- a/configure.in
++++ b/configure.in
+@@ -17,16 +17,10 @@ AM_MAINTAINER_MODE
+ AM_WITH_DMALLOC
+ 
+ AC_PATH_GENERIC(imlib2, 1.0.0, [
+-  AC_SUBST(IMLIB_LIBS)
+-  AC_SUBST(IMLIB_CFLAGS) ],
++  AC_SUBST(IMLIB2_LIBS)
++  AC_SUBST(IMLIB2_CFLAGS) ],
+   AC_MSG_ERROR(Cannot find imlib2: Is imlib2-config in the path?) )
+ 
+-dnl the above doesn't work for some reason :/
+-IMLIB_LIBS=`imlib2-config --libs`
+-IMLIB_CFLAGS=`imlib2-config --cflags`
+-AC_SUBST(IMLIB_LIBS)
+-AC_SUBST(IMLIB_CFLAGS)
+-
+ LIBS="$LIBS -lm"
+ CFLAGS="$CFLAGS -Wall"
+ 
+@@ -45,7 +39,7 @@ $PACKAGE $VERSION
+ Configuration:
+ --------------
+ 
+-Imlib2 libs:	$IMLIB_LIBS
+-Imlib2 cflags:  $IMLIB_CFLAGS
++Imlib2 libs:	$IMLIB2_LIBS
++Imlib2 cflags:  $IMLIB2_CFLAGS
+ CFLAGS:			$CFLAGS
+ "
+diff --git a/giblib-config.in b/giblib-config.in
+index f3a7db6..cef1620 100644
+--- a/giblib-config.in
++++ b/giblib-config.in
+@@ -42,11 +42,11 @@ while test $# -gt 0; do
+       if test @includedir@ != /usr/include ; then
+         includes=-I at includedir@
+       fi
+-      echo $includes -I$prefix/include/giblib @IMLIB_CFLAGS@
++      echo $includes -I$prefix/include/giblib @IMLIB2_CFLAGS@
+       ;;
+     --libs)
+       libdirs=-L at libdir@
+-      echo $libdirs -lgiblib @LDFLAGS@ @IMLIB_LIBS@
++      echo $libdirs -lgiblib @LDFLAGS@ @IMLIB2_LIBS@
+       ;;
+     *)
+       echo "${usage}" 1>&2
+diff --git a/giblib.pc.in b/giblib.pc.in
+index df520ae..783e6e1 100644
+--- a/giblib.pc.in
++++ b/giblib.pc.in
+@@ -6,6 +6,6 @@ includedir=@includedir@
+ Name: giblib
+ Description: wrapper library for imlib2, and other stuff
+ Version: @VERSION@
+-Libs: -L${libdir} -lgiblib @LDFLAGS@ @IMLIB_LIBS@
+-Cflags: -I${includedir} -I${includedir}/giblib @IMLIB_CFLAGS@
++Libs: -L${libdir} -lgiblib @LDFLAGS@ @IMLIB2_LIBS@
++Cflags: -I${includedir} -I${includedir}/giblib @IMLIB2_CFLAGS@
+ 
+diff --git a/giblib/Makefile.am b/giblib/Makefile.am
+index d1edc09..49d8ac4 100644
+--- a/giblib/Makefile.am
++++ b/giblib/Makefile.am
+@@ -3,7 +3,7 @@ MAINTAINERCLEANFILES = Makefile.in
+ 
+ INCLUDES = \
+ -I. -I$(top_srcdir) \
+--DPREFIX=\""$(prefix)"\" @IMLIB_CFLAGS@
++-DPREFIX=\""$(prefix)"\" @IMLIB2_CFLAGS@
+ 
+ lib_LTLIBRARIES = libgiblib.la
+ 
+@@ -24,7 +24,7 @@ libgiblib_la_SOURCES = \
+     gib_utils.c gib_utils.h \
+ 	gib_queue.c gib_queue.h
+ 
+-libgiblib_la_LIBADD = @IMLIB_LIBS@
++libgiblib_la_LIBADD = @IMLIB2_LIBS@
+ libgiblib_la_DEPENDENCIES = giblib_config.h
+ libgiblib_la_LDFLAGS = -version-info 1:6:0
+ 
-- 
1.7.2.5

[Buildroot] [PATCH 2/2] package/giblib: fix breakage

[Thomas Petazzoni]

Le Wed, 14 Mar 2012 23:08:21 +0100,
"Yann E. MORIN" <yann.morin.1998@free.fr> a ?crit :

> diff --git a/package/giblib/giblib.patch b/package/giblib/giblib.patch

Probably needs a better name, and a header with a description +
Signed-off-by.

Otherwise, looks good.

Thomas
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

[Buildroot] [PATCH 1/2] package/libxml2: fix breakage due to unordered patches

[Peter Korsgaard]

>>>>> "Yann" == Yann E MORIN <yann.morin.1998@free.fr> writes:

 Yann> Depending on the locale, the patches may get sorted in different order
 Yann> because they are not numbered. Also, even with the C locale (LC_ALL=C),
 Yann> the second patch that gets applied is error-xpath.patch, but it depends
 Yann> on other xpath patches to be applied first.

 Yann> Rename the patches so they are numbered and they get applied in order.
 Yann> Even then, some patches apply with offsets.

Sorry, I already fixed that locally and pushed - Thanks.

-- 
Bye, Peter Korsgaard