1 |
maksbotan 13/10/27 12:06:04 |
2 |
|
3 |
Added: |
4 |
0005_enable_gtk_docs_in_broken_autotools-utils-eclass.patch |
5 |
0004_add_icoutils_configure_drop_automagic.patch |
6 |
0002_add_gentooway_to_remove_la_files.patch |
7 |
0103_disable_php_bindings_makefile.patch |
8 |
0001_add_gentoo_names_to_configure.patch |
9 |
Log: |
10 |
Add missing patches for 1.24, bug #489334. |
11 |
|
12 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key F8DBDADE) |
13 |
|
14 |
Revision Changes Path |
15 |
1.1 app-emulation/libguestfs/files/1.24/0005_enable_gtk_docs_in_broken_autotools-utils-eclass.patch |
16 |
|
17 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libguestfs/files/1.24/0005_enable_gtk_docs_in_broken_autotools-utils-eclass.patch?rev=1.1&view=markup |
18 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libguestfs/files/1.24/0005_enable_gtk_docs_in_broken_autotools-utils-eclass.patch?rev=1.1&content-type=text/plain |
19 |
|
20 |
Index: 0005_enable_gtk_docs_in_broken_autotools-utils-eclass.patch |
21 |
=================================================================== |
22 |
diff --git a/configure.ac b/configure.ac |
23 |
--- a/configure.ac |
24 |
+++ b/configure.ac |
25 |
@@ -1491,11 +1491,12 @@ |
26 |
]) |
27 |
|
28 |
# check for gtk-doc |
29 |
-m4_ifdef([GTK_DOC_CHECK], [ |
30 |
- GTK_DOC_CHECK([1.14],[--flavour no-tmpl]) |
31 |
-],[ |
32 |
- AM_CONDITIONAL([ENABLE_GTK_DOC], false) |
33 |
-]) |
34 |
+#m4_ifdef([GTK_DOC_CHECK], [ |
35 |
+# GTK_DOC_CHECK([1.14],[--flavour no-tmpl]) |
36 |
+#],[ |
37 |
+# AM_CONDITIONAL([ENABLE_GTK_DOC], false) |
38 |
+#]) |
39 |
+GTK_DOC_CHECK([1.14],[--flavour no-tmpl]) |
40 |
|
41 |
dnl Library versioning. |
42 |
MAX_PROC_NR=`cat $srcdir/src/MAX_PROC_NR` |
43 |
|
44 |
|
45 |
|
46 |
1.1 app-emulation/libguestfs/files/1.24/0004_add_icoutils_configure_drop_automagic.patch |
47 |
|
48 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libguestfs/files/1.24/0004_add_icoutils_configure_drop_automagic.patch?rev=1.1&view=markup |
49 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libguestfs/files/1.24/0004_add_icoutils_configure_drop_automagic.patch?rev=1.1&content-type=text/plain |
50 |
|
51 |
Index: 0004_add_icoutils_configure_drop_automagic.patch |
52 |
=================================================================== |
53 |
diff --git a/configure.ac b/configure.ac |
54 |
--- a/configure.ac |
55 |
+++ b/configure.ac |
56 |
@@ -621,28 +621,36 @@ |
57 |
fi |
58 |
|
59 |
dnl Check for netpbm programs (optional). |
60 |
-AC_CHECK_PROGS([PBMTEXT],[pbmtext],[no]) |
61 |
-AC_CHECK_PROGS([PNMTOPNG],[pnmtopng],[no]) |
62 |
-AC_CHECK_PROGS([BMPTOPNM],[bmptopnm],[no]) |
63 |
-AC_CHECK_PROGS([PAMCUT],[pamcut],[no]) |
64 |
-if test "x$PBMTEXT" != "xno"; then |
65 |
- AC_DEFINE_UNQUOTED([PBMTEXT],["$PBMTEXT"],[Name of pbmtext program.]) |
66 |
-fi |
67 |
-if test "x$PNMTOPNG" != "xno"; then |
68 |
- AC_DEFINE_UNQUOTED([PNMTOPNG],["$PNMTOPNG"],[Name of pnmtopng program.]) |
69 |
-fi |
70 |
-if test "x$BMPTOPNM" != "xno"; then |
71 |
- AC_DEFINE_UNQUOTED([BMPTOPNM],["$BMPTOPNM"],[Name of bmptopnm program.]) |
72 |
-fi |
73 |
-if test "x$PAMCUT" != "xno"; then |
74 |
- AC_DEFINE_UNQUOTED([PAMCUT],["$PAMCUT"],[Name of pamcut program.]) |
75 |
-fi |
76 |
+AC_ARG_ENABLE([icoutils], |
77 |
+ AS_HELP_STRING([with-icoutils], [ Enable ico and bmp icon file inspection]), |
78 |
+ [enable_icoutils=no], |
79 |
+ [enable_icoutils=yes]) |
80 |
+AS_IF([test "enable_icoutils" != "xno"], |
81 |
+ [ |
82 |
+ AC_CHECK_PROGS([PBMTEXT],[pbmtext],[no]) |
83 |
+ AC_CHECK_PROGS([PNMTOPNG],[pnmtopng],[no]) |
84 |
+ AC_CHECK_PROGS([BMPTOPNM],[bmptopnm],[no]) |
85 |
+ AC_CHECK_PROGS([PAMCUT],[pamcut],[no]) |
86 |
+ if test "x$PBMTEXT" != "xno"; then |
87 |
+ AC_DEFINE_UNQUOTED([PBMTEXT],["$PBMTEXT"],[Name of pbmtext program.]) |
88 |
+ fi |
89 |
+ if test "x$PNMTOPNG" != "xno"; then |
90 |
+ AC_DEFINE_UNQUOTED([PNMTOPNG],["$PNMTOPNG"],[Name of pnmtopng program.]) |
91 |
+ fi |
92 |
+ if test "x$BMPTOPNM" != "xno"; then |
93 |
+ AC_DEFINE_UNQUOTED([BMPTOPNM],["$BMPTOPNM"],[Name of bmptopnm program.]) |
94 |
+ fi |
95 |
+ if test "x$PAMCUT" != "xno"; then |
96 |
+ AC_DEFINE_UNQUOTED([PAMCUT],["$PAMCUT"],[Name of pamcut program.]) |
97 |
+ fi |
98 |
|
99 |
dnl Check for icoutils (optional). |
100 |
AC_CHECK_PROGS([WRESTOOL],[wrestool],[no]) |
101 |
if test "x$WRESTOOL" != "xno"; then |
102 |
- AC_DEFINE_UNQUOTED([WRESTOOL],["$WRESTOOL"],[Name of wrestool program.]) |
103 |
+ AC_DEFINE_UNQUOTED([WRESTOOL],["$WRESTOOL"],[Name of wrestool program.]) |
104 |
fi |
105 |
+], |
106 |
+[]) |
107 |
|
108 |
dnl Check for QEMU for running binaries on this $host_cpu, fall |
109 |
dnl back to basic 'qemu'. Allow the user to override it. |
110 |
|
111 |
|
112 |
|
113 |
1.1 app-emulation/libguestfs/files/1.24/0002_add_gentooway_to_remove_la_files.patch |
114 |
|
115 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libguestfs/files/1.24/0002_add_gentooway_to_remove_la_files.patch?rev=1.1&view=markup |
116 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libguestfs/files/1.24/0002_add_gentooway_to_remove_la_files.patch?rev=1.1&content-type=text/plain |
117 |
|
118 |
Index: 0002_add_gentooway_to_remove_la_files.patch |
119 |
=================================================================== |
120 |
diff --git a/configure.ac b/configure.ac |
121 |
--- a/configure.ac |
122 |
+++ b/configure.ac |
123 |
@@ -1487,8 +1487,10 @@ |
124 |
|
125 |
dnl Replace libtool with a wrapper that clobbers dependency_libs in *.la files |
126 |
dnl http://lists.fedoraproject.org/pipermail/devel/2010-November/146343.html |
127 |
-LIBTOOL='bash $(top_srcdir)/libtool-kill-dependency_libs.sh $(top_builddir)/libtool' |
128 |
-AC_SUBST([LIBTOOL]) |
129 |
+dnl LIBTOOL='bash $(top_srcdir)/libtool-kill-dependency_libs.sh $(top_builddir)/libtool' |
130 |
+dnl AC_SUBST([LIBTOOL]) |
131 |
+LT_INIT |
132 |
+ |
133 |
|
134 |
dnl Produce output files. |
135 |
AC_CONFIG_HEADERS([config.h]) |
136 |
|
137 |
|
138 |
|
139 |
1.1 app-emulation/libguestfs/files/1.24/0103_disable_php_bindings_makefile.patch |
140 |
|
141 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libguestfs/files/1.24/0103_disable_php_bindings_makefile.patch?rev=1.1&view=markup |
142 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libguestfs/files/1.24/0103_disable_php_bindings_makefile.patch?rev=1.1&content-type=text/plain |
143 |
|
144 |
Index: 0103_disable_php_bindings_makefile.patch |
145 |
=================================================================== |
146 |
diff --git a/Makefile.am b/Makefile.am |
147 |
--- a/Makefile.am |
148 |
+++ b/Makefile.am |
149 |
@@ -88,9 +88,6 @@ |
150 |
if HAVE_HASKELL |
151 |
SUBDIRS += haskell |
152 |
endif |
153 |
-if HAVE_PHP |
154 |
-SUBDIRS += php |
155 |
-endif |
156 |
if HAVE_ERLANG |
157 |
SUBDIRS += erlang erlang/examples |
158 |
endif |
159 |
|
160 |
|
161 |
|
162 |
1.1 app-emulation/libguestfs/files/1.24/0001_add_gentoo_names_to_configure.patch |
163 |
|
164 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libguestfs/files/1.24/0001_add_gentoo_names_to_configure.patch?rev=1.1&view=markup |
165 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libguestfs/files/1.24/0001_add_gentoo_names_to_configure.patch?rev=1.1&content-type=text/plain |
166 |
|
167 |
Index: 0001_add_gentoo_names_to_configure.patch |
168 |
=================================================================== |
169 |
diff --git a/configure.ac b/configure.ac |
170 |
--- a/configure.ac |
171 |
+++ b/configure.ac |
172 |
@@ -482,6 +482,11 @@ |
173 |
DISTRO=UBUNTU |
174 |
fi |
175 |
fi |
176 |
+ |
177 |
+if test -f /etc/gentoo-release; then |
178 |
+ DISTRO=GENTOO |
179 |
+fi |
180 |
+ |
181 |
if test -f /etc/arch-release; then |
182 |
DISTRO=ARCHLINUX |
183 |
fi |