1 |
commit: e72bae8bfa8c12488dfc02f60a2bce5c76bde88e |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Mar 2 07:14:12 2016 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Mar 2 07:14:12 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e72bae8b |
7 |
|
8 |
dev-libs/wayland: Try to avoid maintenance mode autotools regen |
9 |
|
10 |
while still trying to avoid full eautoreconf call and autotools build deps |
11 |
|
12 |
Gentoo-bug: 576198 |
13 |
|
14 |
...uild-fix-configure-disable-dtd-validation.patch | 70 +++++++++++++++------- |
15 |
1 file changed, 47 insertions(+), 23 deletions(-) |
16 |
|
17 |
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 |
18 |
index 4d9795b..7b55e2f 100644 |
19 |
--- a/dev-libs/wayland/files/1.10.0-build-fix-configure-disable-dtd-validation.patch |
20 |
+++ b/dev-libs/wayland/files/1.10.0-build-fix-configure-disable-dtd-validation.patch |
21 |
@@ -57,6 +57,53 @@ index e850abc..49e25a6 100644 |
22 |
src/dtddata.o: protocol/wayland.dtd |
23 |
|
24 |
if USE_HOST_SCANNER |
25 |
+diff --git a/configure.ac b/configure.ac |
26 |
+index f54a8b9..b27f34b 100644 |
27 |
+--- a/configure.ac |
28 |
++++ b/configure.ac |
29 |
+@@ -76,7 +76,7 @@ AC_ARG_ENABLE([dtd-validation], |
30 |
+ [AC_HELP_STRING([--disable-dtd-validation], |
31 |
+ [Disable DTD validation of the protocol])], |
32 |
+ [], |
33 |
+- [enable_dtdvalidation=yes]) |
34 |
++ [enable_dtd_validation=yes]) |
35 |
+ |
36 |
+ AM_CONDITIONAL(USE_HOST_SCANNER, test "x$with_host_scanner" = xyes) |
37 |
+ |
38 |
+@@ -112,7 +112,8 @@ PKG_CHECK_MODULES(EXPAT, [expat], [], |
39 |
+ AC_SUBST(EXPAT_LIBS) |
40 |
+ ]) |
41 |
+ |
42 |
+-if test "x$enable_dtdvalidation" = "xyes"; then |
43 |
++AM_CONDITIONAL([DTD_VALIDATION], [test "x$enable_dtd_validation" = "xyes"]) |
44 |
++if test "x$enable_dtd_validation" = "xyes"; then |
45 |
+ PKG_CHECK_MODULES(LIBXML, [libxml-2.0]) |
46 |
+ AC_DEFINE(HAVE_LIBXML, 1, [libxml-2.0 is available]) |
47 |
+ AC_CONFIG_LINKS([src/wayland.dtd.embed:protocol/wayland.dtd]) |
48 |
+diff --git a/aclocal.m4 b/aclocal.m4 |
49 |
+index 71ca3dc..86eace8 100644 |
50 |
+--- a/aclocal.m4 |
51 |
++++ b/aclocal.m4 |
52 |
+@@ -1327,6 +1327,7 @@ AC_SUBST([am__tar]) |
53 |
+ AC_SUBST([am__untar]) |
54 |
+ ]) # _AM_PROG_TAR |
55 |
+ |
56 |
++#timestamp update to avoid regen |
57 |
+ m4_include([m4/libtool.m4]) |
58 |
+ m4_include([m4/ltoptions.m4]) |
59 |
+ m4_include([m4/ltsugar.m4]) |
60 |
+diff --git a/config.h.in b/config.h.in |
61 |
+index 1400592..33f0e99 100644 |
62 |
+--- a/config.h.in |
63 |
++++ b/config.h.in |
64 |
+@@ -15,6 +15,7 @@ |
65 |
+ /* Define to 1 if you have the <inttypes.h> header file. */ |
66 |
+ #undef HAVE_INTTYPES_H |
67 |
+ |
68 |
++/* Timestamp update */ |
69 |
+ /* libxml-2.0 is available */ |
70 |
+ #undef HAVE_LIBXML |
71 |
+ |
72 |
diff --git a/Makefile.in b/Makefile.in |
73 |
index 6d9ffb2..32e6d51 100644 |
74 |
--- a/Makefile.in |
75 |
@@ -124,29 +171,6 @@ index 6d9ffb2..32e6d51 100644 |
76 |
@ENABLE_LIBRARIES_TRUE@lib_LTLIBRARIES = libwayland-server.la \ |
77 |
@ENABLE_LIBRARIES_TRUE@ libwayland-client.la \ |
78 |
@ENABLE_LIBRARIES_TRUE@ libwayland-cursor.la |
79 |
-diff --git a/configure.ac b/configure.ac |
80 |
-index f54a8b9..b27f34b 100644 |
81 |
---- a/configure.ac |
82 |
-+++ b/configure.ac |
83 |
-@@ -76,7 +76,7 @@ AC_ARG_ENABLE([dtd-validation], |
84 |
- [AC_HELP_STRING([--disable-dtd-validation], |
85 |
- [Disable DTD validation of the protocol])], |
86 |
- [], |
87 |
-- [enable_dtdvalidation=yes]) |
88 |
-+ [enable_dtd_validation=yes]) |
89 |
- |
90 |
- AM_CONDITIONAL(USE_HOST_SCANNER, test "x$with_host_scanner" = xyes) |
91 |
- |
92 |
-@@ -112,7 +112,8 @@ PKG_CHECK_MODULES(EXPAT, [expat], [], |
93 |
- AC_SUBST(EXPAT_LIBS) |
94 |
- ]) |
95 |
- |
96 |
--if test "x$enable_dtdvalidation" = "xyes"; then |
97 |
-+AM_CONDITIONAL([DTD_VALIDATION], [test "x$enable_dtd_validation" = "xyes"]) |
98 |
-+if test "x$enable_dtd_validation" = "xyes"; then |
99 |
- PKG_CHECK_MODULES(LIBXML, [libxml-2.0]) |
100 |
- AC_DEFINE(HAVE_LIBXML, 1, [libxml-2.0 is available]) |
101 |
- AC_CONFIG_LINKS([src/wayland.dtd.embed:protocol/wayland.dtd]) |
102 |
diff --git a/configure b/configure |
103 |
index 83e4971..6340d4f 100755 |
104 |
--- a/configure |