Prepare recipes for automake-1.13 (batch 1)

Prepare recipes for automake-1.13 (batch 1)

[Marko Lindqvist]

In practice there is three categories of changes in automake-1.13
that cause packages to break. From that follows that virtually all
problems fall to three categories, and all packages suffering from
problem of the same category get virtually identical fix.

* Long deprecated macros completely removed from automake-1.13,
  which errors out upon seeing them. For these I add patch,
  always called obsolete_automake_macros.patch, that replaces
  obsolete macro with proper one. Most of the patches are just
  AM_CONFIG_HEADER -> AC_CONFIG_HEADERS change.

* Trying to run help2man via "missing" when it doesn't exist.
  Old automake versions allowed "missing" to be used that way,
  1.13 aborts. I'm just removing the attempt to create manpages
  that way. Note that it never actually worked anyway -
  old automake just didn't abort when it failed.

* TESTS list cannot have $(srcdir) or $(top_srcdir) as part
  of the path. When it does, it's usually bug in the package,
  but unfortunately automake prevents it also when it's not.
  Solution applied here is to simply remove TESTS.


[PATCH 01/15] pkg-config: replace obsolete automake macros with
[PATCH 02/15] libtool: remove help2man dependency
[PATCH 03/15] bison: remove help2man dependency
[PATCH 04/15] file: replace obsolete automake macros with working
[PATCH 05/15] popt: disable tests
[PATCH 06/15] glib-2.0: replace obsolete automake macros with
[PATCH 07/15] libx11: disable tests
[PATCH 08/15] libpng: replace obsolete automake macros with working
[PATCH 09/15] libusb: replace obsolete automake macros with working
[PATCH 10/15] pixman: replace obsolete automake macros with working
[PATCH 11/15] libid3tag: replace obsolete automake macros with
[PATCH 12/15] libgcrypt: replace obsolete automake macros with
[PATCH 13/15] gnutls: replace obsolete automake macros with working
[PATCH 14/15] libtasn1: remove help2man dependency
[PATCH 15/15] flac: replace obsolete automake macros with working

[PATCH 01/15] pkg-config: replace obsolete automake macros with working ones

[Marko Lindqvist]

Add obsolete-automake-macros.patch that replaces automake macros
no longer supported by automake-1.13 with modern constructs.

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 .../pkgconfig-0.25/obsolete_automake_macros.patch  |   35 ++++++++++++++++++++
 meta/recipes-devtools/pkgconfig/pkgconfig.inc      |    4 ++-
 meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb  |    2 +-
 3 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-devtools/pkgconfig/pkgconfig-0.25/obsolete_automake_macros.patch

diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig-0.25/obsolete_automake_macros.patch b/meta/recipes-devtools/pkgconfig/pkgconfig-0.25/obsolete_automake_macros.patch
new file mode 100644
index 0000000..d0a7e0f
--- /dev/null
+++ b/meta/recipes-devtools/pkgconfig/pkgconfig-0.25/obsolete_automake_macros.patch
@@ -0,0 +1,35 @@
+Upstream-status: Fixed
+
+Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
+diff -Nurd pkg-config-0.25/configure.in pkg-config-0.25/configure.in
+--- pkg-config-0.25/configure.in	2010-05-28 18:55:09.000000000 +0300
++++ pkg-config-0.25/configure.in	2013-01-01 22:13:47.009573426 +0200
+@@ -4,7 +4,7 @@
+ AM_INIT_AUTOMAKE(pkg-config, 0.25)
+ AM_MAINTAINER_MODE
+
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+
+ AM_PROG_LIBTOOL
+
+diff -Nurd pkg-config-0.25/glib-1.2.10/configure.in pkg-config-0.25/glib-1.2.10/configure.in
+--- pkg-config-0.25/glib-1.2.10/configure.in	2009-12-06 22:43:59.000000000 +0200
++++ pkg-config-0.25/glib-1.2.10/configure.in	2013-01-01 22:23:36.701560486 +0200
+@@ -63,7 +63,7 @@
+ AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
+
+ # Specify a configuration file
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+
+ AC_DEFINE_UNQUOTED(GLIB_MAJOR_VERSION, $GLIB_MAJOR_VERSION)
+ AC_DEFINE_UNQUOTED(GLIB_MINOR_VERSION, $GLIB_MINOR_VERSION)
+@@ -154,7 +154,6 @@
+
+ # Checks for programs.
+ AC_PROG_CC
+-AM_PROG_CC_STDC
+ AC_PROG_INSTALL
+
+ changequote(,)dnl
diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig.inc b/meta/recipes-devtools/pkgconfig/pkgconfig.inc
index c54e325..a2d4700 100644
--- a/meta/recipes-devtools/pkgconfig/pkgconfig.inc
+++ b/meta/recipes-devtools/pkgconfig/pkgconfig.inc
@@ -15,7 +15,9 @@ DEPENDS_class-nativesdk = ""
 SRC_URI = "http://pkgconfig.freedesktop.org/releases/pkg-config-${PV}.tar.gz \
            file://autofoo.patch \
            file://glibconfig-sysdefs.h \
-           file://disable-legacy.patch"
+           file://disable-legacy.patch \
+           file://obsolete_automake_macros.patch \
+"
 
 S = "${WORKDIR}/pkg-config-${PV}/"
 
diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb b/meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb
index d0a2b1f..a269973 100644
--- a/meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb
+++ b/meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb
@@ -1,6 +1,6 @@
 require pkgconfig.inc
 
-PR = "r6"
+PR = "r7"
 
 SRC_URI[md5sum] = "a3270bab3f4b69b7dc6dbdacbcae9745"
 SRC_URI[sha256sum] = "3ba691ee2431f32ccb8efa131e59bf23e37f122dc66791309023ca6dcefcd10e"
-- 
1.7.10.4

[PATCH 02/15] libtool: remove help2man dependency

[Marko Lindqvist]

Remove manpage creation. It wasn't working because of help2man
missing when libtool is being built. This attempt to create
manpages without help2man turns from no-op to hard error with
automake-1.13.
Removed prefix-manpage-fix.patch as only code it touched is being
removed by new dont-depend-on-help2man.patch

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 meta/recipes-devtools/libtool/libtool-2.4.2.inc    |    4 ++--
 .../libtool/libtool/dont-depend-on-help2man.patch  |   24 ++++++++++++++++++++
 .../libtool/libtool/prefix-manpage-fix.patch       |   21 -----------------
 3 files changed, 26 insertions(+), 23 deletions(-)
 create mode 100644 meta/recipes-devtools/libtool/libtool/dont-depend-on-help2man.patch
 delete mode 100644 meta/recipes-devtools/libtool/libtool/prefix-manpage-fix.patch

diff --git a/meta/recipes-devtools/libtool/libtool-2.4.2.inc b/meta/recipes-devtools/libtool/libtool-2.4.2.inc
index 12a783a..bb4ddf0 100644
--- a/meta/recipes-devtools/libtool/libtool-2.4.2.inc
+++ b/meta/recipes-devtools/libtool/libtool-2.4.2.inc
@@ -8,11 +8,10 @@ LICENSE = "GPLv2 & LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
     file://libltdl/COPYING.LIB;md5=e3eda01d9815f8d24aae2dbd89b68b06"
 
-INC_PR = "r5"
+INC_PR = "r6"
 
 SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \
            file://trailingslash.patch \
-           file://prefix-manpage-fix.patch \
            file://rename-with-sysroot.patch \
            file://use-sysroot-in-libpath.patch \
            file://fix-final-rpath.patch \
@@ -20,6 +19,7 @@ SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \
            file://fix-rpath.patch \
 	   file://respect-fstack-protector.patch \
            file://norm-rpath.patch \
+           file://dont-depend-on-help2man.patch \
           "
 
 SRC_URI[md5sum] = "d2f3b7d4627e69e13514a40e72a24d50"
diff --git a/meta/recipes-devtools/libtool/libtool/dont-depend-on-help2man.patch b/meta/recipes-devtools/libtool/libtool/dont-depend-on-help2man.patch
new file mode 100644
index 0000000..b86ade6
--- /dev/null
+++ b/meta/recipes-devtools/libtool/libtool/dont-depend-on-help2man.patch
@@ -0,0 +1,24 @@
+Upstream-status: Inappropriate
+
+Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
+diff -Nurd libtool-2.4.2/Makefile.am libtool-2.4.2/Makefile.am
+--- libtool-2.4.2/Makefile.am	2011-10-17 13:17:04.000000000 +0300
++++ libtool-2.4.2/Makefile.am	2013-01-01 22:03:36.865586811 +0200
+@@ -327,17 +327,6 @@
+	cd $(srcdir)/doc && \
+	  $(MAKEINFO) --no-headers $(MAKEINFOFLAGS) -o notes.txt notes.texi
+
+-dist_man1_MANS		= $(srcdir)/doc/libtool.1 $(srcdir)/doc/libtoolize.1
+-MAINTAINERCLEANFILES	+= $(dist_man1_MANS)
+-update_mans = \
+-  PATH=".$(PATH_SEPARATOR)$$PATH"; export PATH; \
+-  $(HELP2MAN) --output=$@
+-$(srcdir)/doc/libtool.1: $(srcdir)/$(auxdir)/ltmain.sh
+-	$(update_mans) --help-option=--help-all libtool
+-$(srcdir)/doc/libtoolize.1: $(srcdir)/libtoolize.in
+-	$(update_mans) libtoolize
+-
+-
+ ## ------------- ##
+ ## Installation. ##
+ ## ------------- ##
diff --git a/meta/recipes-devtools/libtool/libtool/prefix-manpage-fix.patch b/meta/recipes-devtools/libtool/libtool/prefix-manpage-fix.patch
deleted file mode 100644
index 879778c..0000000
--- a/meta/recipes-devtools/libtool/libtool/prefix-manpage-fix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Upstream-Status: Inappropriate [embedded specific]
-
-For cross environment, it not possible to run the generated executable.
-nstead use the build version of libtool to generate the man pages. 
-
-Date: 2010/07/09
-Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
-
-Index: libtool-2.4.2/Makefile.am
-===================================================================
---- libtool-2.4.2.orig/Makefile.am
-+++ libtool-2.4.2/Makefile.am
-@@ -333,7 +333,7 @@ update_mans = \
-   PATH=".$(PATH_SEPARATOR)$$PATH"; export PATH; \
-   $(HELP2MAN) --output=$@
- $(srcdir)/doc/libtool.1: $(srcdir)/$(auxdir)/ltmain.sh
--	$(update_mans) --help-option=--help-all libtool
-+	$(update_mans) --help-option=--help-all ${build_alias}-libtool
- $(srcdir)/doc/libtoolize.1: $(srcdir)/libtoolize.in
- 	$(update_mans) libtoolize
- 
-- 
1.7.10.4

[PATCH 03/15] bison: remove help2man dependency

[Marko Lindqvist]

Remove manpage creation. It wasn't working because of help2man
missing when bison is being built. This attempt to create
manpages without help2man turns from no-op to hard error with
automake-1.13.

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 .../bison/bison/dont-depend-on-help2man.patch      |   32 ++++++++++++++++++++
 meta/recipes-devtools/bison/bison_2.7.bb           |    7 +++--
 2 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-devtools/bison/bison/dont-depend-on-help2man.patch

diff --git a/meta/recipes-devtools/bison/bison/dont-depend-on-help2man.patch b/meta/recipes-devtools/bison/bison/dont-depend-on-help2man.patch
new file mode 100644
index 0000000..66b1e37
--- /dev/null
+++ b/meta/recipes-devtools/bison/bison/dont-depend-on-help2man.patch
@@ -0,0 +1,32 @@
+Upstream-status: Inappropriate
+
+Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
+diff -Nurd bison-2.7/doc/Makefile.am bison-2.7/doc/Makefile.am
+--- bison-2.7/doc/Makefile.am	2012-12-09 17:51:03.000000000 +0200
++++ bison-2.7/doc/Makefile.am	2013-01-02 06:49:50.804894071 +0200
+@@ -52,15 +52,11 @@
+ ## Man Pages.  ##
+ ## ----------- ##
+
+-dist_man_MANS = $(srcdir)/bison.1
+-
+-EXTRA_DIST += $(dist_man_MANS:.1=.x) common.x
+-MAINTAINERCLEANFILES += $(dist_man_MANS)
++EXTRA_DIST += bison.x common.x
+
+ # Depend on configure to get version number changes.
+ common_dep = $(top_srcdir)/configure $(srcdir)/common.x
+ srcsrcdir = $(top_srcdir)/bin
+-$(srcdir)/bison.1:      $(common_dep) $(top_srcdir)/src/getargs.c
+
+ # Differences to ignore when comparing the man page (the date).
+ remove_time_stamp = \
+@@ -94,8 +90,6 @@
+	fi
+	$(AM_V_at)rm -f $@*.t
+
+-nodist_man_MANS = yacc.1
+-
+ ## ------------------------------ ##
+ ## Graphviz examples generation.  ##
+ ## ------------------------------ ##
diff --git a/meta/recipes-devtools/bison/bison_2.7.bb b/meta/recipes-devtools/bison/bison_2.7.bb
index 9fb3884..ee2effb 100644
--- a/meta/recipes-devtools/bison/bison_2.7.bb
+++ b/meta/recipes-devtools/bison/bison_2.7.bb
@@ -9,9 +9,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 SECTION = "devel"
 DEPENDS = "bison-native flex-native"
 
+PR = "r1"
+
 BASE_SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.gz \
-	   file://m4.patch \
-	  "
+	        file://m4.patch \
+                file://dont-depend-on-help2man.patch \
+	       "
 
 SRC_URI = "${BASE_SRC_URI} \
            file://fix_cross_manpage_building.patch \
-- 
1.7.10.4

[PATCH 04/15] file: replace obsolete automake macros with working ones

[Marko Lindqvist]

Add obsolete-automake-macros.patch that replaces automake macros
no longer supported by automake-1.13 with modern constructs.

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 .../file/file/obsolete_automake_macros.patch            |   15 +++++++++++++++
 meta/recipes-devtools/file/file_5.11.bb                 |    3 ++-
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-devtools/file/file/obsolete_automake_macros.patch

diff --git a/meta/recipes-devtools/file/file/obsolete_automake_macros.patch b/meta/recipes-devtools/file/file/obsolete_automake_macros.patch
new file mode 100644
index 0000000..61ee062
--- /dev/null
+++ b/meta/recipes-devtools/file/file/obsolete_automake_macros.patch
@@ -0,0 +1,15 @@
+Upstream-status: Not sent
+
+Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
+diff -Nurd file-5.11/configure.ac file-5.11/configure.ac
+--- file-5.11/configure.ac	2012-02-21 21:16:29.000000000 +0200
++++ file-5.11/configure.ac	2013-01-02 07:18:23.004856505 +0200
+@@ -3,7 +3,7 @@
+ AM_INIT_AUTOMAKE()
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ AC_CONFIG_MACRO_DIR([m4])
+
+ AC_MSG_CHECKING(for builtin ELF support)
diff --git a/meta/recipes-devtools/file/file_5.11.bb b/meta/recipes-devtools/file/file_5.11.bb
index be6a863..52ae460 100644
--- a/meta/recipes-devtools/file/file_5.11.bb
+++ b/meta/recipes-devtools/file/file_5.11.bb
@@ -10,10 +10,11 @@ LIC_FILES_CHKSUM = "file://COPYING;beginline=2;md5=6a7382872edb68d33e1a9398b6e03
 
 DEPENDS = "zlib file-native"
 DEPENDS_class-native = "zlib-native"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "ftp://ftp.astron.com/pub/file/file-${PV}.tar.gz \
            file://fix_version_check.patch \
+           file://obsolete_automake_macros.patch \
            file://dump \
            file://filesystems"
 
-- 
1.7.10.4

[PATCH 05/15] popt: disable tests

[Marko Lindqvist]

Use of $(top_srcdir) in TESTS is an error causing automake-1.13
to abort. Disable the tests completely.

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 meta/recipes-support/popt/popt/disable_tests.patch |   21 ++++++++++++++++++++
 meta/recipes-support/popt/popt_1.16.bb             |    3 ++-
 2 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-support/popt/popt/disable_tests.patch

diff --git a/meta/recipes-support/popt/popt/disable_tests.patch b/meta/recipes-support/popt/popt/disable_tests.patch
new file mode 100644
index 0000000..d9f6324
--- /dev/null
+++ b/meta/recipes-support/popt/popt/disable_tests.patch
@@ -0,0 +1,21 @@
+Use of $(top_srcdir) in TESTS is an error which causes
+automake-1.13 to abort. Just remove tests.
+
+Upstream-status: Not sent
+
+Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
+diff -Nurd popt-1.16/Makefile.am popt-1.16/Makefile.am
+--- popt-1.16/Makefile.am	2010-05-04 23:55:54.000000000 +0300
++++ popt-1.16/Makefile.am	2013-01-02 13:34:29.540361391 +0200
+@@ -34,11 +34,6 @@
+
+ noinst_SCRIPTS = testit.sh
+
+-TESTS_ENVIRONMENT = \
+-test1="$(top_builddir)/test1"
+-
+-TESTS = $(top_srcdir)/testit.sh
+-
+ include_HEADERS = popt.h
+
+ usrlibdir = $(libdir)
diff --git a/meta/recipes-support/popt/popt_1.16.bb b/meta/recipes-support/popt/popt_1.16.bb
index 91b0d60..aa4e379 100644
--- a/meta/recipes-support/popt/popt_1.16.bb
+++ b/meta/recipes-support/popt/popt_1.16.bb
@@ -4,11 +4,12 @@ SECTION = "libs"
 
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=cb0613c30af2a8249b8dcc67d3edb06d"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://rpm5.org/files/popt/popt-${PV}.tar.gz \
            file://pkgconfig_fix.patch \
            file://popt_fix_for_automake-1.12.patch \
+           file://disable_tests.patch \
           "
 
 SRC_URI[md5sum] = "3743beefa3dd6247a73f8f7a32c14c33"
-- 
1.7.10.4

[PATCH 06/15] glib-2.0: replace obsolete automake macros with working ones

[Marko Lindqvist]

Add obsolete-automake-macros.patch that replaces automake macros
no longer supported by automake-1.13 with modern constructs.

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 .../glib-2.0/glib-2.0/obsolete_automake_macros.patch      |   13 +++++++++++++
 meta/recipes-core/glib-2.0/glib-2.0_2.34.3.bb             |    3 ++-
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/obsolete_automake_macros.patch

diff --git a/meta/recipes-core/glib-2.0/glib-2.0/obsolete_automake_macros.patch b/meta/recipes-core/glib-2.0/glib-2.0/obsolete_automake_macros.patch
new file mode 100644
index 0000000..3e1f24a
--- /dev/null
+++ b/meta/recipes-core/glib-2.0/glib-2.0/obsolete_automake_macros.patch
@@ -0,0 +1,13 @@
+Upstream-status: Submitted (https://bugzilla.gnome.org/show_bug.cgi?id=691011)
+
+Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
+diff -Nurd glib-2.34.3/configure.ac glib-2.34.3/configure.ac
+--- glib-2.34.3/configure.ac	2012-11-26 19:10:04.000000000 +0200
++++ glib-2.34.3/configure.ac	2013-01-02 15:49:27.832183712 +0200
+@@ -291,7 +291,6 @@
+ AM_CONDITIONAL(HAVE_CXX, [test "$CXX" != ""])
+ AC_LANG_RESTORE
+
+-AM_PROG_CC_STDC
+ AM_PROG_CC_C_O
+ AC_PROG_INSTALL
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.34.3.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.34.3.bb
index 9854585..e1d44e2 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.34.3.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.34.3.bb
@@ -1,6 +1,6 @@
 require glib.inc
 
-PR = "r0"
+PR = "r1"
 PE = "1"
 
 DEPENDS += "libffi python-argparse-native zlib"
@@ -12,6 +12,7 @@ SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]
 SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
            file://configure-libtool.patch \
            file://glib-2.0_fix_for_x32.patch \
+           file://obsolete_automake_macros.patch \
            file://Makefile-ptest.patch \
            file://run-ptest \
           "
-- 
1.7.10.4

[PATCH 07/15] libx11: disable tests

[Marko Lindqvist]

Use of $(srcdir) in TESTS is an error causing automake-1.13
to abort. Disable the tests completely.

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 .../xorg-lib/libx11/disable_tests.patch               |   17 +++++++++++++++++
 meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb        |    6 ++++--
 2 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-graphics/xorg-lib/libx11/disable_tests.patch

diff --git a/meta/recipes-graphics/xorg-lib/libx11/disable_tests.patch b/meta/recipes-graphics/xorg-lib/libx11/disable_tests.patch
new file mode 100644
index 0000000..ec61751
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11/disable_tests.patch
@@ -0,0 +1,17 @@
+Upstream-status: Not sent
+
+Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
+diff -Nurd libX11-1.5.0/nls/Makefile.am libX11-1.5.0/nls/Makefile.am
+--- libX11-1.5.0/nls/Makefile.am	2012-06-02 09:37:18.000000000 +0300
++++ libX11-1.5.0/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
+-
+
+ # Per-locale data files
diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb b/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb
index 94e2051..7f18824 100644
--- a/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb
@@ -1,11 +1,13 @@
 require libx11.inc
 inherit gettext
 
-PR = "${INC_PR}.2"
+PR = "${INC_PR}.3"
 
 BBCLASSEXTEND = "native nativesdk"
 
-SRC_URI += "file://keysymdef_include.patch"
+SRC_URI += "file://keysymdef_include.patch \
+            file://disable_tests.patch \
+           "
 
 SRC_URI[md5sum] = "78b4b3bab4acbdf0abcfca30a8c70cc6"
 SRC_URI[sha256sum] = "c382efd7e92bfc3cef39a4b7f1ecf2744ba4414a705e3bc1e697f75502bd4d86"
-- 
1.7.10.4

[PATCH 08/15] libpng: replace obsolete automake macros with working ones

[Marko Lindqvist]

Add obsolete-automake-macros.patch that replaces automake macros
no longer supported by automake-1.13 with modern constructs.

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 .../libpng/libpng-1.5.13/obsolete_automake_macros.patch |   15 +++++++++++++++
 meta/recipes-multimedia/libpng/libpng_1.5.13.bb         |    6 ++++--
 2 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-multimedia/libpng/libpng-1.5.13/obsolete_automake_macros.patch

diff --git a/meta/recipes-multimedia/libpng/libpng-1.5.13/obsolete_automake_macros.patch b/meta/recipes-multimedia/libpng/libpng-1.5.13/obsolete_automake_macros.patch
new file mode 100644
index 0000000..0115442
--- /dev/null
+++ b/meta/recipes-multimedia/libpng/libpng-1.5.13/obsolete_automake_macros.patch
@@ -0,0 +1,15 @@
+Upstream-status: Submitted
+
+Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
+diff -Nurd libpng-1.5.13/configure.ac libpng-1.5.13/configure.ac
+--- libpng-1.5.13/configure.ac	2012-09-27 14:21:22.000000000 +0300
++++ libpng-1.5.13/configure.ac	2013-01-02 16:50:27.876103410 +0200
+@@ -31,7 +31,7 @@
+ dnl End of version number stuff
+
+ AC_CONFIG_SRCDIR([pngget.c])
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+
+ # Checks for programs.
+ AC_LANG([C])
diff --git a/meta/recipes-multimedia/libpng/libpng_1.5.13.bb b/meta/recipes-multimedia/libpng/libpng_1.5.13.bb
index 04bb932..b9f64f6 100644
--- a/meta/recipes-multimedia/libpng/libpng_1.5.13.bb
+++ b/meta/recipes-multimedia/libpng/libpng_1.5.13.bb
@@ -6,10 +6,12 @@ LICENSE = "Libpng"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=00b5b35853278d508806c2e5860e82cb \
                     file://png.h;beginline=207;endline=321;md5=50e583fb60bb36f37ab5023b2a3715d1"
 DEPENDS = "zlib"
-PR = "r1"
+PR = "r2"
 LIBV = "15"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/project/libpng/libpng${LIBV}/${PV}/libpng-${PV}.tar.xz"
+SRC_URI = "${SOURCEFORGE_MIRROR}/project/libpng/libpng${LIBV}/${PV}/libpng-${PV}.tar.xz \
+           file://obsolete_automake_macros.patch \
+          "
 
 SRC_URI[md5sum] = "0b607a685da977f1bfc96e1c47055183"
 SRC_URI[sha256sum] = "b843f9cb01d10ae22acd9aaf58aceaa4a6aeb9cf78943b41588004b271257aee"
-- 
1.7.10.4

[PATCH 09/15] libusb: replace obsolete automake macros with working ones

[Marko Lindqvist]

Add obsolete-automake-macros.patch that replaces automake macros
no longer supported by automake-1.13 with modern constructs.

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 .../libusb-compat-0.1.4/obsolete_automake_macros.patch  |   15 +++++++++++++++
 meta/recipes-support/libusb/libusb-compat_0.1.4.bb      |    3 ++-
 .../libusb/libusb1-1.0.9/obsolete_automake_macros.patch |   15 +++++++++++++++
 meta/recipes-support/libusb/libusb1_1.0.9.bb            |    6 ++++--
 4 files changed, 36 insertions(+), 3 deletions(-)
 create mode 100644 meta/recipes-support/libusb/libusb-compat-0.1.4/obsolete_automake_macros.patch
 create mode 100644 meta/recipes-support/libusb/libusb1-1.0.9/obsolete_automake_macros.patch

diff --git a/meta/recipes-support/libusb/libusb-compat-0.1.4/obsolete_automake_macros.patch b/meta/recipes-support/libusb/libusb-compat-0.1.4/obsolete_automake_macros.patch
new file mode 100644
index 0000000..2ec6fda
--- /dev/null
+++ b/meta/recipes-support/libusb/libusb-compat-0.1.4/obsolete_automake_macros.patch
@@ -0,0 +1,15 @@
+Upstream-status: Not sent
+
+Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
+diff -Nurd libusb-compat-0.1.4/configure.ac libusb-compat-0.1.4/configure.ac
+--- libusb-compat-0.1.4/configure.ac	2012-04-24 08:45:46.000000000 +0300
++++ libusb-compat-0.1.4/configure.ac	2013-01-02 16:41:30.440115202 +0200
+@@ -1,7 +1,7 @@
+ AC_INIT([libusb-compat], [0.1.4])
+ AM_INIT_AUTOMAKE
+ AC_CONFIG_SRCDIR([libusb/core.c])
+-AM_CONFIG_HEADER([config.h])
++AC_CONFIG_HEADERS([config.h])
+ AC_CONFIG_MACRO_DIR([m4])
+
+ AC_PREREQ([2.50])
diff --git a/meta/recipes-support/libusb/libusb-compat_0.1.4.bb b/meta/recipes-support/libusb/libusb-compat_0.1.4.bb
index 24df017..d743072 100644
--- a/meta/recipes-support/libusb/libusb-compat_0.1.4.bb
+++ b/meta/recipes-support/libusb/libusb-compat_0.1.4.bb
@@ -16,9 +16,10 @@ PROVIDES = "libusb virtual/libusb0"
 BBCLASSEXTEND = "native nativesdk"
 
 PE = "1"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-compat-${PV}.tar.bz2 \
+           file://obsolete_automake_macros.patch \
           "
 #           file://0.1.0-beta1-gcc3.4-fix.patch"
 
diff --git a/meta/recipes-support/libusb/libusb1-1.0.9/obsolete_automake_macros.patch b/meta/recipes-support/libusb/libusb1-1.0.9/obsolete_automake_macros.patch
new file mode 100644
index 0000000..9b1d40d
--- /dev/null
+++ b/meta/recipes-support/libusb/libusb1-1.0.9/obsolete_automake_macros.patch
@@ -0,0 +1,15 @@
+Upstream-status: Submitted
+
+Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
+diff -Nurd libusb-1.0.9/configure.ac libusb-1.0.9/configure.ac
+--- libusb-1.0.9/configure.ac	2012-04-20 09:44:27.000000000 +0300
++++ libusb-1.0.9/configure.ac	2013-01-02 16:36:44.152121483 +0200
+@@ -31,7 +31,7 @@
+
+ AC_CONFIG_SRCDIR([libusb/core.c])
+ AC_CONFIG_MACRO_DIR([m4])
+-AM_CONFIG_HEADER([config.h])
++AC_CONFIG_HEADERS([config.h])
+ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
+
+ AC_PREREQ([2.50])
diff --git a/meta/recipes-support/libusb/libusb1_1.0.9.bb b/meta/recipes-support/libusb/libusb1_1.0.9.bb
index e002374..012ac27 100644
--- a/meta/recipes-support/libusb/libusb1_1.0.9.bb
+++ b/meta/recipes-support/libusb/libusb1_1.0.9.bb
@@ -8,9 +8,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
 
 BBCLASSEXTEND = "native nativesdk"
 
-PR = "r0"
+PR = "r1"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.bz2"
+SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.bz2 \
+           file://obsolete_automake_macros.patch \
+          "
 
 SRC_URI[md5sum] = "7f5a02375ad960d4e33a6dae7d63cfcb"
 SRC_URI[sha256sum] = "e920eedc2d06b09606611c99ec7304413c6784cba6e33928e78243d323195f9b"
-- 
1.7.10.4

[PATCH 10/15] pixman: replace obsolete automake macros with working ones

[Marko Lindqvist]

Add obsolete-automake-macros.patch that replaces automake macros
no longer supported by automake-1.13 with modern constructs.

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 .../xorg-lib/pixman/obsolete_automake_macros.patch       |   14 ++++++++++++++
 meta/recipes-graphics/xorg-lib/pixman_0.28.2.bb          |    3 ++-
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-graphics/xorg-lib/pixman/obsolete_automake_macros.patch

diff --git a/meta/recipes-graphics/xorg-lib/pixman/obsolete_automake_macros.patch b/meta/recipes-graphics/xorg-lib/pixman/obsolete_automake_macros.patch
new file mode 100644
index 0000000..aa45ad4
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/pixman/obsolete_automake_macros.patch
@@ -0,0 +1,14 @@
+Upstream-Status: Submitted
+
+Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
+diff -Nurd pixman-0.28.2/configure.ac pixman-0.28.2/configure.ac
+--- pixman-0.28.2/configure.ac	2012-12-10 13:46:36.000000000 +0200
++++ pixman-0.28.2/configure.ac	2013-01-03 06:31:07.574848073 +0200
+@@ -64,7 +64,7 @@
+ # Suppress verbose compile lines
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+
+ AC_CANONICAL_HOST
diff --git a/meta/recipes-graphics/xorg-lib/pixman_0.28.2.bb b/meta/recipes-graphics/xorg-lib/pixman_0.28.2.bb
index 4ec0490..59c2691 100644
--- a/meta/recipes-graphics/xorg-lib/pixman_0.28.2.bb
+++ b/meta/recipes-graphics/xorg-lib/pixman_0.28.2.bb
@@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=14096c769ae0cbb5fcb94ec468be11b3 \
 DEPENDS += "zlib libpng"
 BBCLASSEXTEND = "native nativesdk"
 
-PR = "r0"
+PR = "r1"
 
 PE = "1"
 
@@ -31,6 +31,7 @@ EXTRA_OECONF_class-native = "--disable-gtk"
 SRC_URI += "\
             file://0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch \
             file://Generic-C-implementation-of-pixman_blt-with-overlapp.patch \
+            file://obsolete_automake_macros.patch \
 "
 
 SRC_URI[md5sum] = "f6e3294c4edb7b6bca8459e604286348"
-- 
1.7.10.4

[PATCH 11/15] libid3tag: replace obsolete automake macros with working ones

[Marko Lindqvist]

Add obsolete-automake-macros.patch that replaces automake macros
no longer supported by automake-1.13 with modern constructs.

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 .../libid3tag/libid3tag/obsolete_automake_macros.patch   |   14 ++++++++++++++
 meta/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb   |    6 ++++--
 2 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-multimedia/libid3tag/libid3tag/obsolete_automake_macros.patch

diff --git a/meta/recipes-multimedia/libid3tag/libid3tag/obsolete_automake_macros.patch b/meta/recipes-multimedia/libid3tag/libid3tag/obsolete_automake_macros.patch
new file mode 100644
index 0000000..2ecd478
--- /dev/null
+++ b/meta/recipes-multimedia/libid3tag/libid3tag/obsolete_automake_macros.patch
@@ -0,0 +1,14 @@
+Upstream-Status: Submitted (https://sourceforge.net/tracker/?func=detail&aid=3599280&group_id=12349&atid=112349)
+
+Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
+diff -Nurd libid3tag-0.15.1b/configure.ac libid3tag-0.15.1b/configure.ac
+--- libid3tag-0.15.1b/configure.ac	2004-01-24 01:22:46.000000000 +0200
++++ libid3tag-0.15.1b/configure.ac	2013-01-03 06:41:02.734835014 +0200
+@@ -28,7 +28,7 @@
+
+ AM_INIT_AUTOMAKE
+
+-AM_CONFIG_HEADER([config.h])
++AC_CONFIG_HEADERS([config.h])
+
+ dnl System type.
diff --git a/meta/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb b/meta/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb
index dbcf2da..d81f58b 100644
--- a/meta/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb
+++ b/meta/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb
@@ -7,10 +7,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
 			file://version.h;beginline=1;endline=8;md5=86ac68b67f054b7afde9e149bbc3fe63"
 SECTION = "libs"
 DEPENDS = "zlib gperf-native"
-PR = "r6"
+PR = "r7"
 
 SRC_URI = "ftp://ftp.mars.org/pub/mpeg/libid3tag-${PV}.tar.gz \
-           file://addpkgconfig.patch"
+           file://addpkgconfig.patch \
+           file://obsolete_automake_macros.patch \
+"
 
 SRC_URI[md5sum] = "e5808ad997ba32c498803822078748c3"
 SRC_URI[sha256sum] = "63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151"
-- 
1.7.10.4

[PATCH 12/15] libgcrypt: replace obsolete automake macros with working ones

[Marko Lindqvist]

Add obsolete-automake-macros.patch that replaces automake macros
no longer supported by automake-1.13 with modern constructs.

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 .../libgcrypt-1.5.0/obsolete_automake_macros.patch      |   15 +++++++++++++++
 meta/recipes-support/libgcrypt/libgcrypt_1.5.0.bb       |    4 +++-
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-support/libgcrypt/libgcrypt-1.5.0/obsolete_automake_macros.patch

diff --git a/meta/recipes-support/libgcrypt/libgcrypt-1.5.0/obsolete_automake_macros.patch b/meta/recipes-support/libgcrypt/libgcrypt-1.5.0/obsolete_automake_macros.patch
new file mode 100644
index 0000000..31b63e4
--- /dev/null
+++ b/meta/recipes-support/libgcrypt/libgcrypt-1.5.0/obsolete_automake_macros.patch
@@ -0,0 +1,15 @@
+Upstream-Status: Submitted (https://bugs.g10code.com/gnupg/issue1459)
+
+Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
+diff -Nurd libgcrypt-1.5.0/configure.ac libgcrypt-1.5.0/configure.ac
+--- libgcrypt-1.5.0/configure.ac	2011-06-29 11:53:22.000000000 +0300
++++ libgcrypt-1.5.0/configure.ac	2013-01-03 07:12:26.854793677 +0200
+@@ -59,7 +59,7 @@
+
+ AC_CONFIG_SRCDIR([src/libgcrypt.vers])
+ AM_INIT_AUTOMAKE([])
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ AC_CONFIG_MACRO_DIR([m4])
+ AC_CONFIG_LIBOBJ_DIR([compat])
+ AC_CANONICAL_HOST
diff --git a/meta/recipes-support/libgcrypt/libgcrypt_1.5.0.bb b/meta/recipes-support/libgcrypt/libgcrypt_1.5.0.bb
index e552f79..058c2d5 100644
--- a/meta/recipes-support/libgcrypt/libgcrypt_1.5.0.bb
+++ b/meta/recipes-support/libgcrypt/libgcrypt_1.5.0.bb
@@ -1,6 +1,8 @@
 require libgcrypt.inc
 
-PR = "r1"
+PR = "r2"
+
+SRC_URI += "file://obsolete_automake_macros.patch"
 
 SRC_URI[md5sum] = "78f8f8bec4580f75b25816f7896d0389"
 SRC_URI[sha256sum] = "cc98b1f64c9ae3b0185099cef4ac6c436a849095edf87f34157f0bb10e187990"
-- 
1.7.10.4

[PATCH 13/15] gnutls: replace obsolete automake macros with working ones

[Marko Lindqvist]

Add obsolete-automake-macros.patch that replaces automake macros
no longer supported by automake-1.13 with modern constructs.

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 .../gnutls/gnutls/obsolete_automake_macros.patch   |   39 ++++++++++++++++++++
 meta/recipes-support/gnutls/gnutls_2.12.21.bb      |    3 +-
 2 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-support/gnutls/gnutls/obsolete_automake_macros.patch

diff --git a/meta/recipes-support/gnutls/gnutls/obsolete_automake_macros.patch b/meta/recipes-support/gnutls/gnutls/obsolete_automake_macros.patch
new file mode 100644
index 0000000..be01303
--- /dev/null
+++ b/meta/recipes-support/gnutls/gnutls/obsolete_automake_macros.patch
@@ -0,0 +1,39 @@
+Upstream-Status: Submitted (https://savannah.gnu.org/support/index.php?108219)
+
+Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
+diff -Nurd gnutls-2.12.21/configure.ac gnutls-2.12.21/configure.ac
+--- gnutls-2.12.21/configure.ac	2013-01-03 07:52:42.182740682 +0200
++++ gnutls-2.12.21/configure.ac	2013-01-03 07:53:41.662739378 +0200
+@@ -29,7 +29,7 @@
+ AM_INIT_AUTOMAKE([1.10 no-dist-gzip dist-bzip2 -Wall -Wno-override])
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+ m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) # required by automake 1.12
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+
+ AC_MSG_RESULT([***
+ *** Checking for compilation programs...
+diff -Nurd gnutls-2.12.21/lib/configure.ac gnutls-2.12.21/lib/configure.ac
+--- gnutls-2.12.21/lib/configure.ac	2013-01-03 07:52:42.182740682 +0200
++++ gnutls-2.12.21/lib/configure.ac	2013-01-03 08:07:38.150721027 +0200
+@@ -29,7 +29,7 @@
+ AM_INIT_AUTOMAKE([1.10 -Wall -Wno-override])
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+ m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) # required by automake 1.12
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+
+ AC_PROG_CC
+ lgl_EARLY
+diff -Nurd gnutls-2.12.21/libextra/configure.ac gnutls-2.12.21/libextra/configure.ac
+--- gnutls-2.12.21/libextra/configure.ac	2013-01-03 07:52:42.182740682 +0200
++++ gnutls-2.12.21/libextra/configure.ac	2013-01-03 08:10:56.654716669 +0200
+@@ -29,7 +29,7 @@
+ AM_INIT_AUTOMAKE([1.10 -Wall -Wno-override])
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+ m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) # required by automake 1.12
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+
+ AC_PROG_CC
+ xgl_EARLY
diff --git a/meta/recipes-support/gnutls/gnutls_2.12.21.bb b/meta/recipes-support/gnutls/gnutls_2.12.21.bb
index 6b2ef3a..7b4426b 100644
--- a/meta/recipes-support/gnutls/gnutls_2.12.21.bb
+++ b/meta/recipes-support/gnutls/gnutls_2.12.21.bb
@@ -1,12 +1,13 @@
 require gnutls.inc
 
-PR = "${INC_PR}.3"
+PR = "${INC_PR}.4"
 
 SRC_URI += "file://gnutls-openssl.patch \
             file://correct_rpl_gettimeofday_signature.patch \
             file://configure-fix.patch \
             file://gnutls_fix_for_automake_1.12.1.patch \
             file://avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch \
+            file://obsolete_automake_macros.patch \
             ${@['', 'file://fix-gettext-version.patch'][bb.data.inherits_class('native', d) or (not ((d.getVar("INCOMPATIBLE_LICENSE", True) or "").find("GPLv3") != -1))]} \
             file://remove-gets.patch \
            "
-- 
1.7.10.4

[PATCH 14/15] libtasn1: remove help2man dependency

[Marko Lindqvist]

Remove manpage creation. It wasn't working because of help2man
missing when libtasn1 is being built. This attempt to create
manpages without help2man turns from no-op to hard error with
automake-1.13.

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 .../gnutls/libtasn1/dont-depend-on-help2man.patch        |   14 ++++++++++++++
 meta/recipes-support/gnutls/libtasn1_2.14.bb             |    3 ++-
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-support/gnutls/libtasn1/dont-depend-on-help2man.patch

diff --git a/meta/recipes-support/gnutls/libtasn1/dont-depend-on-help2man.patch b/meta/recipes-support/gnutls/libtasn1/dont-depend-on-help2man.patch
new file mode 100644
index 0000000..2ac89f3
--- /dev/null
+++ b/meta/recipes-support/gnutls/libtasn1/dont-depend-on-help2man.patch
@@ -0,0 +1,14 @@
+Upstream-Status: Inappropriate
+
+Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
+diff -Nurd libtasn1-2.14/doc/Makefile.am libtasn1-2.14/doc/Makefile.am
+--- libtasn1-2.14/doc/Makefile.am	2012-09-24 15:08:42.000000000 +0300
++++ libtasn1-2.14/doc/Makefile.am	2013-01-03 07:35:26.702763403 +0200
+@@ -31,7 +31,7 @@
+ AM_MAKEINFOHTMLFLAGS = $(AM_MAKEINFOFLAGS) \
+	--no-split --number-sections --css-include=texinfo.css
+
+-dist_man_MANS = $(gdoc_MANS) asn1Parser.1 asn1Coding.1 asn1Decoding.1
++dist_man_MANS = $(gdoc_MANS)
+
+ HELP2MAN_OPTS = --info-page libtasn1
diff --git a/meta/recipes-support/gnutls/libtasn1_2.14.bb b/meta/recipes-support/gnutls/libtasn1_2.14.bb
index 3f49bfa..68d5ddf 100644
--- a/meta/recipes-support/gnutls/libtasn1_2.14.bb
+++ b/meta/recipes-support/gnutls/libtasn1_2.14.bb
@@ -8,10 +8,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
                     file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \
                     file://README;endline=8;md5=c3803a3e8ca5ab5eb1e5912faa405351"
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "${GNU_MIRROR}/libtasn1/libtasn1-${PV}.tar.gz \
            file://libtasn1_fix_for_automake_1.12.patch \
+           file://dont-depend-on-help2man.patch \
            "
 
 SRC_URI[md5sum] = "a08c5936f9672da9b05691785499bcc3"
-- 
1.7.10.4

[PATCH 15/15] flac: replace obsolete automake macros with working ones

[Marko Lindqvist]

Add obsolete-automake-macros.patch that replaces automake macros
no longer supported by automake-1.13 with modern constructs.

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 .../flac/flac-1.2.1/obsolete_automake_macros.patch       |   14 ++++++++++++++
 meta/recipes-multimedia/flac/flac_1.2.1.bb               |    6 ++++--
 2 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-multimedia/flac/flac-1.2.1/obsolete_automake_macros.patch

diff --git a/meta/recipes-multimedia/flac/flac-1.2.1/obsolete_automake_macros.patch b/meta/recipes-multimedia/flac/flac-1.2.1/obsolete_automake_macros.patch
new file mode 100644
index 0000000..7d7504d
--- /dev/null
+++ b/meta/recipes-multimedia/flac/flac-1.2.1/obsolete_automake_macros.patch
@@ -0,0 +1,14 @@
+Upstream-Status: Submitted (https://sourceforge.net/p/flac/support-requests/146/)
+
+Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
+diff -Nurd flac-1.2.1/configure.in flac-1.2.1/configure.in
+--- flac-1.2.1/configure.in	2007-09-13 18:48:42.000000000 +0300
++++ flac-1.2.1/configure.in	2013-01-03 08:20:07.454704587 +0200
+@@ -44,7 +44,7 @@
+ AC_CHECK_SIZEOF(void*,0)
+
+ #@@@ new name is AC_CONFIG_HEADERS
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+
+ AC_C_BIGENDIAN
diff --git a/meta/recipes-multimedia/flac/flac_1.2.1.bb b/meta/recipes-multimedia/flac/flac_1.2.1.bb
index 903de6d..7fd7a03 100644
--- a/meta/recipes-multimedia/flac/flac_1.2.1.bb
+++ b/meta/recipes-multimedia/flac/flac_1.2.1.bb
@@ -14,14 +14,16 @@ LIC_FILES_CHKSUM = "file://COPYING.FDL;md5=ad1419ecc56e060eccf8184a87c4285f \
                     file://include/FLAC/all.h;beginline=64;endline=69;md5=64474f2b22e9e77b28d8b8b25c983a48"
 DEPENDS = "libogg"
 
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/flac/flac-${PV}.tar.gz \
            file://disable-xmms-plugin.patch \
            file://flac-gcc43-fixes.patch \
            file://xmms.m4 \
            file://0001-No-AltiVec-on-SPE.patch \
-           file://asm-pic.patch"
+           file://asm-pic.patch \
+           file://obsolete_automake_macros.patch \
+"
 
 SRC_URI[md5sum] = "153c8b15a54da428d1f0fadc756c22c7"
 SRC_URI[sha256sum] = "9635a44bceb478bbf2ee8a785cf6986fba525afb5fad1fd4bba73cf71f2d3edf"
-- 
1.7.10.4

Re: [PATCH 05/15] popt: disable tests

[Ross Burton]

On Thursday, 3 January 2013 at 20:36, Marko Lindqvist wrote:
> Use of $(top_srcdir) in TESTS is an error causing automake-1.13
> to abort. Disable the tests completely.
> +Upstream-status: Not sent

Is the real fix as simple as removing the $(top_srcdir) line, or is there a more complicate reason as to why we can't fix this properly and submit it upstream?

Ross 

Re: [PATCH 05/15] popt: disable tests

[Marko Lindqvist]

On 3 January 2013 23:22, Ross Burton <ross.burton@intel.com> wrote:
> On Thursday, 3 January 2013 at 20:36, Marko Lindqvist wrote:
>> Use of $(top_srcdir) in TESTS is an error causing automake-1.13
>> to abort. Disable the tests completely.
>> +Upstream-status: Not sent
>
> Is the real fix as simple as removing the $(top_srcdir) line, or is there a more complicate reason as to why we can't fix this properly and submit it upstream?
>
> Ross

 No, it's not that simple. Actually need to use $(top_srcdir) just
indicates the real problem, which is that test script lives in
srctree. Given that fix to problems of that category easily take
significant amount of work, and oe does not need the tests, I think
it's ok to leave these to upstream (should file bugreports, of
course).


 - ML

Re: [PATCH 05/15] popt: disable tests

[Marko Lindqvist]

On 3 January 2013 23:49, Marko Lindqvist <cazfi74@gmail.com> wrote:
> On 3 January 2013 23:22, Ross Burton <ross.burton@intel.com> wrote:
>> On Thursday, 3 January 2013 at 20:36, Marko Lindqvist wrote:
>>> Use of $(top_srcdir) in TESTS is an error causing automake-1.13
>>> to abort. Disable the tests completely.
>>> +Upstream-status: Not sent

 This should be "Inappropriate" of course, not "Not sent" as if it's
proper patch I've not yet sent for some reason.

 Many other Upstream-Status could be already changed from "Submitted"
to "Accepted" or "Fixed", but those one can find out following the
ticket numbers already there.


 - ML

Re: Prepare recipes for automake-1.13 (batch 1)

[Saul Wold]

On 01/03/2013 12:36 PM, Marko Lindqvist wrote:
> In practice there is three categories of changes in automake-1.13
> that cause packages to break. From that follows that virtually all
> problems fall to three categories, and all packages suffering from
> problem of the same category get virtually identical fix.
>
> * Long deprecated macros completely removed from automake-1.13,
>    which errors out upon seeing them. For these I add patch,
>    always called obsolete_automake_macros.patch, that replaces
>    obsolete macro with proper one. Most of the patches are just
>    AM_CONFIG_HEADER -> AC_CONFIG_HEADERS change.
>
> * Trying to run help2man via "missing" when it doesn't exist.
>    Old automake versions allowed "missing" to be used that way,
>    1.13 aborts. I'm just removing the attempt to create manpages
>    that way. Note that it never actually worked anyway -
>    old automake just didn't abort when it failed.
>
> * TESTS list cannot have $(srcdir) or $(top_srcdir) as part
>    of the path. When it does, it's usually bug in the package,
>    but unfortunately automake prevents it also when it's not.
>    Solution applied here is to simply remove TESTS.
>
>
> [PATCH 01/15] pkg-config: replace obsolete automake macros with
> [PATCH 02/15] libtool: remove help2man dependency
> [PATCH 03/15] bison: remove help2man dependency
> [PATCH 04/15] file: replace obsolete automake macros with working
> [PATCH 05/15] popt: disable tests
> [PATCH 06/15] glib-2.0: replace obsolete automake macros with
> [PATCH 07/15] libx11: disable tests
> [PATCH 08/15] libpng: replace obsolete automake macros with working
> [PATCH 09/15] libusb: replace obsolete automake macros with working
> [PATCH 10/15] pixman: replace obsolete automake macros with working
> [PATCH 11/15] libid3tag: replace obsolete automake macros with
> [PATCH 12/15] libgcrypt: replace obsolete automake macros with
> [PATCH 13/15] gnutls: replace obsolete automake macros with working
> [PATCH 14/15] libtasn1: remove help2man dependency
> [PATCH 15/15] flac: replace obsolete automake macros with working
>
I am reviewing these and will included them next week based on my reviews.

Any chance for the future, you can share a branch from either the Yocto 
Project Git (via poky-contrib) or an OE Git (via oe-core-contrib), 
please contact Michael@yoctoproject.org or Richard for git access. Or
you can use github or ...

Thanks
	Sau!
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>

Re: [PATCH 04/15] file: replace obsolete automake macros with working ones

[Saul Wold]

On 01/03/2013 12:36 PM, Marko Lindqvist wrote:
> Add obsolete-automake-macros.patch that replaces automake macros
> no longer supported by automake-1.13 with modern constructs.
>
> Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
> ---
>   .../file/file/obsolete_automake_macros.patch            |   15 +++++++++++++++
>   meta/recipes-devtools/file/file_5.11.bb                 |    3 ++-
>   2 files changed, 17 insertions(+), 1 deletion(-)
>   create mode 100644 meta/recipes-devtools/file/file/obsolete_automake_macros.patch
>
> diff --git a/meta/recipes-devtools/file/file/obsolete_automake_macros.patch b/meta/recipes-devtools/file/file/obsolete_automake_macros.patch
> new file mode 100644
> index 0000000..61ee062
> --- /dev/null
> +++ b/meta/recipes-devtools/file/file/obsolete_automake_macros.patch
> @@ -0,0 +1,15 @@
> +Upstream-status: Not sent
> +
What does "Not sent" mean here?  Is it Pending? You plan to submit it?

Also the correct Tag is "Upstream-Status" both caps.

Sau!

> +Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
> +diff -Nurd file-5.11/configure.ac file-5.11/configure.ac
> +--- file-5.11/configure.ac	2012-02-21 21:16:29.000000000 +0200
> ++++ file-5.11/configure.ac	2013-01-02 07:18:23.004856505 +0200
> +@@ -3,7 +3,7 @@
> + AM_INIT_AUTOMAKE()
> + m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
> +
> +-AM_CONFIG_HEADER(config.h)
> ++AC_CONFIG_HEADERS(config.h)
> + AC_CONFIG_MACRO_DIR([m4])
> +
> + AC_MSG_CHECKING(for builtin ELF support)
> diff --git a/meta/recipes-devtools/file/file_5.11.bb b/meta/recipes-devtools/file/file_5.11.bb
> index be6a863..52ae460 100644
> --- a/meta/recipes-devtools/file/file_5.11.bb
> +++ b/meta/recipes-devtools/file/file_5.11.bb
> @@ -10,10 +10,11 @@ LIC_FILES_CHKSUM = "file://COPYING;beginline=2;md5=6a7382872edb68d33e1a9398b6e03
>
>   DEPENDS = "zlib file-native"
>   DEPENDS_class-native = "zlib-native"
> -PR = "r0"
> +PR = "r1"
>
>   SRC_URI = "ftp://ftp.astron.com/pub/file/file-${PV}.tar.gz \
>              file://fix_version_check.patch \
> +           file://obsolete_automake_macros.patch \
>              file://dump \
>              file://filesystems"
>
>

Re: Prepare recipes for automake-1.13 (batch 1)

[Saul Wold]

On 01/03/2013 12:36 PM, Marko Lindqvist wrote:
> In practice there is three categories of changes in automake-1.13
> that cause packages to break. From that follows that virtually all
> problems fall to three categories, and all packages suffering from
> problem of the same category get virtually identical fix.
>
So these need the automake-1.13 update first?  I have the 1.12 version 
but have not seen the 1.13 version yet.

Just want to confirm that.

Thanks
     Sau!

> * Long deprecated macros completely removed from automake-1.13,
>    which errors out upon seeing them. For these I add patch,
>    always called obsolete_automake_macros.patch, that replaces
>    obsolete macro with proper one. Most of the patches are just
>    AM_CONFIG_HEADER -> AC_CONFIG_HEADERS change.
>
> * Trying to run help2man via "missing" when it doesn't exist.
>    Old automake versions allowed "missing" to be used that way,
>    1.13 aborts. I'm just removing the attempt to create manpages
>    that way. Note that it never actually worked anyway -
>    old automake just didn't abort when it failed.
>
> * TESTS list cannot have $(srcdir) or $(top_srcdir) as part
>    of the path. When it does, it's usually bug in the package,
>    but unfortunately automake prevents it also when it's not.
>    Solution applied here is to simply remove TESTS.
>
>
> [PATCH 01/15] pkg-config: replace obsolete automake macros with
> [PATCH 02/15] libtool: remove help2man dependency
> [PATCH 03/15] bison: remove help2man dependency
> [PATCH 04/15] file: replace obsolete automake macros with working
> [PATCH 05/15] popt: disable tests
> [PATCH 06/15] glib-2.0: replace obsolete automake macros with
> [PATCH 07/15] libx11: disable tests
> [PATCH 08/15] libpng: replace obsolete automake macros with working
> [PATCH 09/15] libusb: replace obsolete automake macros with working
> [PATCH 10/15] pixman: replace obsolete automake macros with working
> [PATCH 11/15] libid3tag: replace obsolete automake macros with
> [PATCH 12/15] libgcrypt: replace obsolete automake macros with
> [PATCH 13/15] gnutls: replace obsolete automake macros with working
> [PATCH 14/15] libtasn1: remove help2man dependency
> [PATCH 15/15] flac: replace obsolete automake macros with working
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>

Re: Prepare recipes for automake-1.13 (batch 1)

[Marko Lindqvist]

On 5 January 2013 00:21, Saul Wold <sgw@linux.intel.com> wrote:
> On 01/03/2013 12:36 PM, Marko Lindqvist wrote:
>>
>> In practice there is three categories of changes in automake-1.13
>> that cause packages to break. From that follows that virtually all
>> problems fall to three categories, and all packages suffering from
>> problem of the same category get virtually identical fix.
>>
> So these need the automake-1.13 update first?  I have the 1.12 version but
> have not seen the 1.13 version yet.
>
> Just want to confirm that.

 No, the other way around. These are needed in place before we can
even consider automake-1.13. They are compatible with several versions
back.

 From the amount of problematic packages openembedded-core alone
(there's going to be several batches of fixes) I don't think we can
make the actual switch to automake-1.13 any time soon. World would
explode.


 - ML

Re: Prepare recipes for automake-1.13 (batch 1)

[Marko Lindqvist]

On 5 January 2013 00:42, Marko Lindqvist <cazfi74@gmail.com> wrote:
> On 5 January 2013 00:21, Saul Wold <sgw@linux.intel.com> wrote:
>> On 01/03/2013 12:36 PM, Marko Lindqvist wrote:
>>>
>>> In practice there is three categories of changes in automake-1.13
>>> that cause packages to break. From that follows that virtually all
>>> problems fall to three categories, and all packages suffering from
>>> problem of the same category get virtually identical fix.
>>>
>> So these need the automake-1.13 update first?  I have the 1.12 version but
>> have not seen the 1.13 version yet.
>>
>> Just want to confirm that.
>
>  No, the other way around. These are needed in place before we can
> even consider automake-1.13. They are compatible with several versions
> back.

 I've of course tested them with both automake-1.13 openembedded
(patch for this update not submitted. If someone else needs it, I can
of course send it) and against current master automake 1.12.


 - ML

Re: Prepare recipes for automake-1.13 (batch 1)

[Saul Wold]

On 01/04/2013 03:11 PM, Marko Lindqvist wrote:
> On 5 January 2013 00:42, Marko Lindqvist <cazfi74@gmail.com> wrote:
>> On 5 January 2013 00:21, Saul Wold <sgw@linux.intel.com> wrote:
>>> On 01/03/2013 12:36 PM, Marko Lindqvist wrote:
>>>>
>>>> In practice there is three categories of changes in automake-1.13
>>>> that cause packages to break. From that follows that virtually all
>>>> problems fall to three categories, and all packages suffering from
>>>> problem of the same category get virtually identical fix.
>>>>
>>> So these need the automake-1.13 update first?  I have the 1.12 version but
>>> have not seen the 1.13 version yet.
>>>
>>> Just want to confirm that.
>>
>>   No, the other way around. These are needed in place before we can
>> even consider automake-1.13. They are compatible with several versions
>> back.
>
>   I've of course tested them with both automake-1.13 openembedded
> (patch for this update not submitted. If someone else needs it, I can
> of course send it) and against current master automake 1.12.
>
>
Ok got it, and ack on the Git repo for now email patches are fine, I 
need to sort out the current batch (which pre-dates these) and then I 
can concentrate on the next set.

Sau!

>   - ML
>
>

Re: [PATCH 04/15] file: replace obsolete automake macros with working ones

[Marko Lindqvist]

On 4 January 2013 20:23, Marko Lindqvist <cazfi74@gmail.com> wrote:
> On 4 January 2013 20:08, Saul Wold <sgw@linux.intel.com> wrote:
>> On 01/03/2013 12:36 PM, Marko Lindqvist wrote:
>>>
>>> Add obsolete-automake-macros.patch that replaces automake macros
>>> no longer supported by automake-1.13 with modern constructs.
>>>
>>> Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
>>> ---
>>>   .../file/file/obsolete_automake_macros.patch            |   15
>>> +++++++++++++++
>>>   meta/recipes-devtools/file/file_5.11.bb                 |    3 ++-
>>>   2 files changed, 17 insertions(+), 1 deletion(-)
>>>   create mode 100644
>>> meta/recipes-devtools/file/file/obsolete_automake_macros.patch
>>>
>>> diff --git
>>> a/meta/recipes-devtools/file/file/obsolete_automake_macros.patch
>>> b/meta/recipes-devtools/file/file/obsolete_automake_macros.patch
>>> new file mode 100644
>>> index 0000000..61ee062
>>> --- /dev/null
>>> +++ b/meta/recipes-devtools/file/file/obsolete_automake_macros.patch
>>> @@ -0,0 +1,15 @@
>>> +Upstream-status: Not sent
>>> +
>>
>> What does "Not sent" mean here?  Is it Pending? You plan to submit it?
>
>  It meant that I'm about to send it. I sent all the other such patches
> to upstreams (and updated Upstream-Statuses) as a last thing before I
> sent patch series to oe. But with "file" I noticed that they had
> released new version just while I were working. So I left it to wait
> for me to check if patch is still needed upstream. It isn't - simply
> updating to new upstream version could be solution for oe. I'm only a
> bit worried about release announcement wording that release with such
> big internal changes is for the adventurous - others should stick to
> previous release.

 Checking "file" mailing list now a couple of days after the release
it seems the warning was in order - many reggressions reported. So I
guess we stick to patching old 5.11 version.


 - ML