1 |
maksbotan 13/10/01 17:51:39 |
2 |
|
3 |
Added: 0004_add_icoutils_configure_drop_automagic.patch |
4 |
0002_add_gentooway_to_remove_la_files.patch |
5 |
0103_disable_php_bindings_makefile.patch |
6 |
0001_add_gentoo_names_to_configure.patch |
7 |
0005_enable_gtk_docs_in_broken_autotools-utils-eclass.patch |
8 |
0003_add_doc_more_option.patch |
9 |
Log: |
10 |
Bump to 1.22.26, thanks to slepnoga |
11 |
|
12 |
(Portage version: 2.2.6/cvs/Linux x86_64, signed Manifest commit with key F8DBDADE) |
13 |
|
14 |
Revision Changes Path |
15 |
1.1 app-emulation/libguestfs/files/1.22/0004_add_icoutils_configure_drop_automagic.patch |
16 |
|
17 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libguestfs/files/1.22/0004_add_icoutils_configure_drop_automagic.patch?rev=1.1&view=markup |
18 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libguestfs/files/1.22/0004_add_icoutils_configure_drop_automagic.patch?rev=1.1&content-type=text/plain |
19 |
|
20 |
Index: 0004_add_icoutils_configure_drop_automagic.patch |
21 |
=================================================================== |
22 |
diff --git a/configure.ac b/configure.ac |
23 |
--- a/configure.ac |
24 |
+++ b/configure.ac |
25 |
@@ -621,28 +621,36 @@ |
26 |
fi |
27 |
|
28 |
dnl Check for netpbm programs (optional). |
29 |
-AC_CHECK_PROGS([PBMTEXT],[pbmtext],[no]) |
30 |
-AC_CHECK_PROGS([PNMTOPNG],[pnmtopng],[no]) |
31 |
-AC_CHECK_PROGS([BMPTOPNM],[bmptopnm],[no]) |
32 |
-AC_CHECK_PROGS([PAMCUT],[pamcut],[no]) |
33 |
-if test "x$PBMTEXT" != "xno"; then |
34 |
- AC_DEFINE_UNQUOTED([PBMTEXT],["$PBMTEXT"],[Name of pbmtext program.]) |
35 |
-fi |
36 |
-if test "x$PNMTOPNG" != "xno"; then |
37 |
- AC_DEFINE_UNQUOTED([PNMTOPNG],["$PNMTOPNG"],[Name of pnmtopng program.]) |
38 |
-fi |
39 |
-if test "x$BMPTOPNM" != "xno"; then |
40 |
- AC_DEFINE_UNQUOTED([BMPTOPNM],["$BMPTOPNM"],[Name of bmptopnm program.]) |
41 |
-fi |
42 |
-if test "x$PAMCUT" != "xno"; then |
43 |
- AC_DEFINE_UNQUOTED([PAMCUT],["$PAMCUT"],[Name of pamcut program.]) |
44 |
-fi |
45 |
+AC_ARG_ENABLE([icoutils], |
46 |
+ AS_HELP_STRING([with-icoutils], [ Enable ico and bmp icon file inspection]), |
47 |
+ [enable_icoutils=no], |
48 |
+ [enable_icoutils=yes]) |
49 |
+AS_IF([test "enable_icoutils" != "xno"], |
50 |
+ [ |
51 |
+ AC_CHECK_PROGS([PBMTEXT],[pbmtext],[no]) |
52 |
+ AC_CHECK_PROGS([PNMTOPNG],[pnmtopng],[no]) |
53 |
+ AC_CHECK_PROGS([BMPTOPNM],[bmptopnm],[no]) |
54 |
+ AC_CHECK_PROGS([PAMCUT],[pamcut],[no]) |
55 |
+ if test "x$PBMTEXT" != "xno"; then |
56 |
+ AC_DEFINE_UNQUOTED([PBMTEXT],["$PBMTEXT"],[Name of pbmtext program.]) |
57 |
+ fi |
58 |
+ if test "x$PNMTOPNG" != "xno"; then |
59 |
+ AC_DEFINE_UNQUOTED([PNMTOPNG],["$PNMTOPNG"],[Name of pnmtopng program.]) |
60 |
+ fi |
61 |
+ if test "x$BMPTOPNM" != "xno"; then |
62 |
+ AC_DEFINE_UNQUOTED([BMPTOPNM],["$BMPTOPNM"],[Name of bmptopnm program.]) |
63 |
+ fi |
64 |
+ if test "x$PAMCUT" != "xno"; then |
65 |
+ AC_DEFINE_UNQUOTED([PAMCUT],["$PAMCUT"],[Name of pamcut program.]) |
66 |
+ fi |
67 |
|
68 |
dnl Check for icoutils (optional). |
69 |
AC_CHECK_PROGS([WRESTOOL],[wrestool],[no]) |
70 |
if test "x$WRESTOOL" != "xno"; then |
71 |
- AC_DEFINE_UNQUOTED([WRESTOOL],["$WRESTOOL"],[Name of wrestool program.]) |
72 |
+ AC_DEFINE_UNQUOTED([WRESTOOL],["$WRESTOOL"],[Name of wrestool program.]) |
73 |
fi |
74 |
+], |
75 |
+[]) |
76 |
|
77 |
dnl Check for QEMU for running binaries on this $host_cpu, fall |
78 |
dnl back to basic 'qemu'. Allow the user to override it. |
79 |
|
80 |
|
81 |
|
82 |
1.1 app-emulation/libguestfs/files/1.22/0002_add_gentooway_to_remove_la_files.patch |
83 |
|
84 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libguestfs/files/1.22/0002_add_gentooway_to_remove_la_files.patch?rev=1.1&view=markup |
85 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libguestfs/files/1.22/0002_add_gentooway_to_remove_la_files.patch?rev=1.1&content-type=text/plain |
86 |
|
87 |
Index: 0002_add_gentooway_to_remove_la_files.patch |
88 |
=================================================================== |
89 |
diff --git a/configure.ac b/configure.ac |
90 |
--- a/configure.ac |
91 |
+++ b/configure.ac |
92 |
@@ -1487,8 +1487,10 @@ |
93 |
|
94 |
dnl Replace libtool with a wrapper that clobbers dependency_libs in *.la files |
95 |
dnl http://lists.fedoraproject.org/pipermail/devel/2010-November/146343.html |
96 |
-LIBTOOL='bash $(top_srcdir)/libtool-kill-dependency_libs.sh $(top_builddir)/libtool' |
97 |
-AC_SUBST([LIBTOOL]) |
98 |
+dnl LIBTOOL='bash $(top_srcdir)/libtool-kill-dependency_libs.sh $(top_builddir)/libtool' |
99 |
+dnl AC_SUBST([LIBTOOL]) |
100 |
+LT_INIT |
101 |
+ |
102 |
|
103 |
dnl Produce output files. |
104 |
AC_CONFIG_HEADERS([config.h]) |
105 |
|
106 |
|
107 |
|
108 |
1.1 app-emulation/libguestfs/files/1.22/0103_disable_php_bindings_makefile.patch |
109 |
|
110 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libguestfs/files/1.22/0103_disable_php_bindings_makefile.patch?rev=1.1&view=markup |
111 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libguestfs/files/1.22/0103_disable_php_bindings_makefile.patch?rev=1.1&content-type=text/plain |
112 |
|
113 |
Index: 0103_disable_php_bindings_makefile.patch |
114 |
=================================================================== |
115 |
diff --git a/Makefile.am b/Makefile.am |
116 |
--- a/Makefile.am |
117 |
+++ b/Makefile.am |
118 |
@@ -88,9 +88,6 @@ |
119 |
if HAVE_HASKELL |
120 |
SUBDIRS += haskell |
121 |
endif |
122 |
-if HAVE_PHP |
123 |
-SUBDIRS += php |
124 |
-endif |
125 |
if HAVE_ERLANG |
126 |
SUBDIRS += erlang erlang/examples |
127 |
endif |
128 |
|
129 |
|
130 |
|
131 |
1.1 app-emulation/libguestfs/files/1.22/0001_add_gentoo_names_to_configure.patch |
132 |
|
133 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libguestfs/files/1.22/0001_add_gentoo_names_to_configure.patch?rev=1.1&view=markup |
134 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libguestfs/files/1.22/0001_add_gentoo_names_to_configure.patch?rev=1.1&content-type=text/plain |
135 |
|
136 |
Index: 0001_add_gentoo_names_to_configure.patch |
137 |
=================================================================== |
138 |
diff --git a/configure.ac b/configure.ac |
139 |
--- a/configure.ac |
140 |
+++ b/configure.ac |
141 |
@@ -482,6 +482,11 @@ |
142 |
DISTRO=UBUNTU |
143 |
fi |
144 |
fi |
145 |
+ |
146 |
+if test -f /etc/gentoo-release; then |
147 |
+ DISTRO=GENTOO |
148 |
+fi |
149 |
+ |
150 |
if test -f /etc/arch-release; then |
151 |
DISTRO=ARCHLINUX |
152 |
fi |
153 |
|
154 |
|
155 |
|
156 |
1.1 app-emulation/libguestfs/files/1.22/0005_enable_gtk_docs_in_broken_autotools-utils-eclass.patch |
157 |
|
158 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libguestfs/files/1.22/0005_enable_gtk_docs_in_broken_autotools-utils-eclass.patch?rev=1.1&view=markup |
159 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libguestfs/files/1.22/0005_enable_gtk_docs_in_broken_autotools-utils-eclass.patch?rev=1.1&content-type=text/plain |
160 |
|
161 |
Index: 0005_enable_gtk_docs_in_broken_autotools-utils-eclass.patch |
162 |
=================================================================== |
163 |
diff --git a/configure.ac b/configure.ac |
164 |
--- a/configure.ac |
165 |
+++ b/configure.ac |
166 |
@@ -1491,11 +1491,12 @@ |
167 |
]) |
168 |
|
169 |
# check for gtk-doc |
170 |
-m4_ifdef([GTK_DOC_CHECK], [ |
171 |
- GTK_DOC_CHECK([1.14],[--flavour no-tmpl]) |
172 |
-],[ |
173 |
- AM_CONDITIONAL([ENABLE_GTK_DOC], false) |
174 |
-]) |
175 |
+#m4_ifdef([GTK_DOC_CHECK], [ |
176 |
+# GTK_DOC_CHECK([1.14],[--flavour no-tmpl]) |
177 |
+#],[ |
178 |
+# AM_CONDITIONAL([ENABLE_GTK_DOC], false) |
179 |
+#]) |
180 |
+GTK_DOC_CHECK([1.14],[--flavour no-tmpl]) |
181 |
|
182 |
dnl Library versioning. |
183 |
MAX_PROC_NR=`cat $srcdir/src/MAX_PROC_NR` |
184 |
|
185 |
|
186 |
|
187 |
1.1 app-emulation/libguestfs/files/1.22/0003_add_doc_more_option.patch |
188 |
|
189 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libguestfs/files/1.22/0003_add_doc_more_option.patch?rev=1.1&view=markup |
190 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libguestfs/files/1.22/0003_add_doc_more_option.patch?rev=1.1&content-type=text/plain |
191 |
|
192 |
Index: 0003_add_doc_more_option.patch |
193 |
=================================================================== |
194 |
diff --git a/configure.ac b/configure.ac |
195 |
--- a/configure.ac |
196 |
+++ b/configure.ac |
197 |
@@ -521,7 +521,7 @@ |
198 |
dnl Check for functions not available in earlier versions of Augeas. |
199 |
AC_CHECK_FUNCS([aug_load aug_defvar aug_defnode]) |
200 |
LIBS="$old_LIBS" |
201 |
-],[AC_MSG_WARN([augeas not found, some core features will be disabled])]) |
202 |
+],[AC_MSG_ERROR([augeas not found, some core features will be disabled])]) |
203 |
|
204 |
dnl Check for libselinux (optional). |
205 |
AC_CHECK_HEADERS([selinux/selinux.h]) |
206 |
@@ -594,11 +594,19 @@ |
207 |
|
208 |
dnl Check for optional xmllint. |
209 |
AC_CHECK_PROG([XMLLINT],[xmllint],[xmllint],[no]) |
210 |
+AS_IF([test "xXMLLINT" = "xno"], [AC_MSG_ERROR([xmllint not installed])],[]) |
211 |
+ |
212 |
AM_CONDITIONAL([HAVE_XMLLINT],[test "x$XMLLINT" != "xno"]) |
213 |
|
214 |
dnl po4a for translating man pages and POD files (optional). |
215 |
AC_CHECK_PROG([PO4A],[po4a],[po4a],[no]) |
216 |
-AM_CONDITIONAL([HAVE_PO4A], [test "x$PO4A" != "xno"]) |
217 |
+ |
218 |
+AC_ARG_ENABLE([doc], |
219 |
+ AS_HELP_STRING([--enable-doc], [Enable generation translating man pages and doc]), |
220 |
+ [enable_doc=no], |
221 |
+ [enable_doc=yes]) |
222 |
+AS_IF([test "xPO4A" = "xno"], [AC_MSG_WARN([po4a not installed])],[]) |
223 |
+AM_CONDITIONAL([HAVE_PO4A],[test "x$PO4A" != "xno" && test "x$enable_doc" != "xno"]) |
224 |
|
225 |
dnl Check for db_dump, db_load (optional). |
226 |
AC_CHECK_PROGS([DB_DUMP], |