[gentoo-commits] repo/gentoo:master commit in: dev-libs/wayland/files/

[gentoo-commits] repo/gentoo:master commit in: dev-libs/wayland/files/

[Mart Raudsepp]

commit:     e72bae8bfa8c12488dfc02f60a2bce5c76bde88e
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Wed Mar  2 07:14:12 2016 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Wed Mar  2 07:14:12 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e72bae8b

dev-libs/wayland: Try to avoid maintenance mode autotools regen

while still trying to avoid full eautoreconf call and autotools build deps

Gentoo-bug: 576198

 ...uild-fix-configure-disable-dtd-validation.patch | 70 +++++++++++++++-------
 1 file changed, 47 insertions(+), 23 deletions(-)

diff --git a/dev-libs/wayland/files/1.10.0-build-fix-configure-disable-dtd-validation.patch b/dev-libs/wayland/files/1.10.0-build-fix-configure-disable-dtd-validation.patch
index 4d9795b..7b55e2f 100644
--- a/dev-libs/wayland/files/1.10.0-build-fix-configure-disable-dtd-validation.patch
+++ b/dev-libs/wayland/files/1.10.0-build-fix-configure-disable-dtd-validation.patch
@@ -57,6 +57,53 @@ index e850abc..49e25a6 100644
  src/dtddata.o: protocol/wayland.dtd
  
  if USE_HOST_SCANNER
+diff --git a/configure.ac b/configure.ac
+index f54a8b9..b27f34b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -76,7 +76,7 @@ AC_ARG_ENABLE([dtd-validation],
+ 	      [AC_HELP_STRING([--disable-dtd-validation],
+ 			      [Disable DTD validation of the protocol])],
+ 	      [],
+-	      [enable_dtdvalidation=yes])
++	      [enable_dtd_validation=yes])
+ 
+ AM_CONDITIONAL(USE_HOST_SCANNER, test "x$with_host_scanner" = xyes)
+ 
+@@ -112,7 +112,8 @@ PKG_CHECK_MODULES(EXPAT, [expat], [],
+ 	 AC_SUBST(EXPAT_LIBS)
+ 	])
+ 
+-if test "x$enable_dtdvalidation" = "xyes"; then
++AM_CONDITIONAL([DTD_VALIDATION], [test "x$enable_dtd_validation" = "xyes"])
++if test "x$enable_dtd_validation" = "xyes"; then
+ 	PKG_CHECK_MODULES(LIBXML, [libxml-2.0])
+ 	AC_DEFINE(HAVE_LIBXML, 1, [libxml-2.0 is available])
+ 	AC_CONFIG_LINKS([src/wayland.dtd.embed:protocol/wayland.dtd])
+diff --git a/aclocal.m4 b/aclocal.m4
+index 71ca3dc..86eace8 100644
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -1327,6 +1327,7 @@ AC_SUBST([am__tar])
+ AC_SUBST([am__untar])
+ ]) # _AM_PROG_TAR
+ 
++#timestamp update to avoid regen
+ m4_include([m4/libtool.m4])
+ m4_include([m4/ltoptions.m4])
+ m4_include([m4/ltsugar.m4])
+diff --git a/config.h.in b/config.h.in
+index 1400592..33f0e99 100644
+--- a/config.h.in
++++ b/config.h.in
+@@ -15,6 +15,7 @@
+ /* Define to 1 if you have the <inttypes.h> header file. */
+ #undef HAVE_INTTYPES_H
+ 
++/* Timestamp update */
+ /* libxml-2.0 is available */
+ #undef HAVE_LIBXML
+ 
 diff --git a/Makefile.in b/Makefile.in
 index 6d9ffb2..32e6d51 100644
 --- a/Makefile.in
@@ -124,29 +171,6 @@ index 6d9ffb2..32e6d51 100644
  @ENABLE_LIBRARIES_TRUE@lib_LTLIBRARIES = libwayland-server.la \
  @ENABLE_LIBRARIES_TRUE@	libwayland-client.la \
  @ENABLE_LIBRARIES_TRUE@	libwayland-cursor.la
-diff --git a/configure.ac b/configure.ac
-index f54a8b9..b27f34b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -76,7 +76,7 @@ AC_ARG_ENABLE([dtd-validation],
- 	      [AC_HELP_STRING([--disable-dtd-validation],
- 			      [Disable DTD validation of the protocol])],
- 	      [],
--	      [enable_dtdvalidation=yes])
-+	      [enable_dtd_validation=yes])
- 
- AM_CONDITIONAL(USE_HOST_SCANNER, test "x$with_host_scanner" = xyes)
- 
-@@ -112,7 +112,8 @@ PKG_CHECK_MODULES(EXPAT, [expat], [],
- 	 AC_SUBST(EXPAT_LIBS)
- 	])
- 
--if test "x$enable_dtdvalidation" = "xyes"; then
-+AM_CONDITIONAL([DTD_VALIDATION], [test "x$enable_dtd_validation" = "xyes"])
-+if test "x$enable_dtd_validation" = "xyes"; then
- 	PKG_CHECK_MODULES(LIBXML, [libxml-2.0])
- 	AC_DEFINE(HAVE_LIBXML, 1, [libxml-2.0 is available])
- 	AC_CONFIG_LINKS([src/wayland.dtd.embed:protocol/wayland.dtd])
 diff --git a/configure b/configure
 index 83e4971..6340d4f 100755
 --- a/configure