summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2016-03-28 19:59:53 +0300
committerEfraim Flashner <efraim@flashner.co.il>2016-04-06 23:15:59 +0300
commit0ea4079f345a3b1583ba5d55f83f1f947b9a12fd (patch)
treeb7b0b7fcac0317715b06dd373782ff88549459df /gnu
parent17946534a4d49f375530f0af80b797172066b1fc (diff)
gnu: abiword: Update to 3.0.1.
* gnu/packages/abiword.scm (abiword): Update to 3.0.1. [source]: Remove 4 patches. [arguments]: Disable tests. [inputs]: Add libxslt, replace gtk+-2 with gtk+. [native-inputs]: Add libtool. * gnu/packages/patches/abiword-link-plugins-against-backend.patch, gnu/packages/patches/abiword-no-include-glib-internal-headers.patch, gnu/packages/patches/abiword-pass-no-undefined-to-linker.patch, gnu/packages/patches/abiword-use-proper-png-api.patch: Remove files. * gnu-system.am (dist_patch_DATA): Remove them.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/abiword.scm27
-rw-r--r--gnu/packages/patches/abiword-link-plugins-against-backend.patch639
-rw-r--r--gnu/packages/patches/abiword-no-include-glib-internal-headers.patch13
-rw-r--r--gnu/packages/patches/abiword-pass-no-undefined-to-linker.patch608
-rw-r--r--gnu/packages/patches/abiword-use-proper-png-api.patch175
5 files changed, 17 insertions, 1445 deletions
diff --git a/gnu/packages/abiword.scm b/gnu/packages/abiword.scm
index c6f259a2dd3..cac4881f1fc 100644
--- a/gnu/packages/abiword.scm
+++ b/gnu/packages/abiword.scm
@@ -1,5 +1,6 @@
1;;; GNU Guix --- Functional package management for GNU 1;;; GNU Guix --- Functional package management for GNU
2;;; Copyright © 2014 Marek Benc <merkur32@gmail.com> 2;;; Copyright © 2014 Marek Benc <merkur32@gmail.com>
3;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
3;;; 4;;;
4;;; This file is part of GNU Guix. 5;;; This file is part of GNU Guix.
5;;; 6;;;
@@ -22,6 +23,7 @@
22 #:use-module (guix download) 23 #:use-module (guix download)
23 #:use-module (guix build-system gnu) 24 #:use-module (guix build-system gnu)
24 #:use-module (gnu packages) 25 #:use-module (gnu packages)
26 #:use-module (gnu packages autotools)
25 #:use-module (gnu packages boost) 27 #:use-module (gnu packages boost)
26 #:use-module (gnu packages compression) 28 #:use-module (gnu packages compression)
27 #:use-module (gnu packages enchant) 29 #:use-module (gnu packages enchant)
@@ -41,7 +43,7 @@
41(define-public abiword 43(define-public abiword
42 (package 44 (package
43 (name "abiword") 45 (name "abiword")
44 (version "2.8.6") 46 (version "3.0.1")
45 (source 47 (source
46 (origin 48 (origin
47 (method url-fetch) 49 (method url-fetch)
@@ -49,15 +51,11 @@
49 (string-append "http://abisource.org/downloads/" name "/" version 51 (string-append "http://abisource.org/downloads/" name "/" version
50 "/source/" name "-" version ".tar.gz")) 52 "/source/" name "-" version ".tar.gz"))
51 (sha256 53 (sha256
52 (base32 "059sd2apxdmcacc4pll880i7vm18h0kyjsq299m1mz3c7ak8k46r")) 54 (base32 "1ik591rx15nn3n1297cwykl8wvrlgj78i528id9wbidgy3xzd570"))
53 (patches 55 (patches
54 (list 56 (list
55 (search-patch "abiword-wmf-version-lookup-fix.patch") 57 (search-patch "abiword-wmf-version-lookup-fix.patch")
56 (search-patch "abiword-no-include-glib-internal-headers.patch") 58 (search-patch "abiword-explictly-cast-bools.patch")))))
57 (search-patch "abiword-explictly-cast-bools.patch")
58 (search-patch "abiword-use-proper-png-api.patch")
59 (search-patch "abiword-pass-no-undefined-to-linker.patch")
60 (search-patch "abiword-link-plugins-against-backend.patch")))))
61 59
62 (build-system gnu-build-system) 60 (build-system gnu-build-system)
63 (arguments ;; NOTE: rsvg is disabled, since Abiword 61 (arguments ;; NOTE: rsvg is disabled, since Abiword
@@ -65,7 +63,7 @@
65 (list 63 (list
66 "--enable-clipart" ;; TODO: The following plugins have unresolved 64 "--enable-clipart" ;; TODO: The following plugins have unresolved
67 "--enable-templates" ;; dependencies: aiksaurus, grammar, wpg, gda, 65 "--enable-templates" ;; dependencies: aiksaurus, grammar, wpg, gda,
68 (string-append ;; wordperfect, psion, mathview, goffice. 66 (string-append ;; wordperfect, psion, mathview, goffice, epub.
69 "--enable-plugins=" 67 "--enable-plugins="
70 "applix " "babelfish " "bmp " "clarisworks " "collab " "command " 68 "applix " "babelfish " "bmp " "clarisworks " "collab " "command "
71 "docbook " "eml " "freetranslation " "garble " "gdict " "gimp " 69 "docbook " "eml " "freetranslation " "garble " "gdict " "gimp "
@@ -73,14 +71,21 @@
73 "loadbindings " "mht " "mif " "mswrite " "opendocument " 71 "loadbindings " "mht " "mif " "mswrite " "opendocument "
74 "openwriter " "openxml " "opml " "ots " "paint " "passepartout " 72 "openwriter " "openxml " "opml " "ots " "paint " "passepartout "
75 "pdb " "pdf " "presentation " "s5 " "sdw " "t602 " "urldict " 73 "pdb " "pdf " "presentation " "s5 " "sdw " "t602 " "urldict "
76 "wikipedia " "wmf " "wml " "xslfo")))) 74 "wikipedia " "wmf " "wml " "xslfo"))
75 ;; tests fail with: Gtk-CRITICAL **: gtk_settings_get_for_screen:
76 ;; assertion 'GDK_IS_SCREEN (screen)' failed
77 ;; GLib-GObject-CRITICAL **: g_object_get_qdata:
78 ;; assertion 'G_IS_OBJECT (object)' failed
79 ;; Manually starting the X server before the test phase did not help
80 ;; the tests to pass.
81 #:tests? #f))
77 (inputs 82 (inputs
78 `(("boost" ,boost) 83 `(("boost" ,boost)
79 ("enchant" ,enchant) 84 ("enchant" ,enchant)
80 ("fontconfig" ,fontconfig) 85 ("fontconfig" ,fontconfig)
81 ("fribidi" ,fribidi) 86 ("fribidi" ,fribidi)
82 ("glib" ,glib) 87 ("glib" ,glib)
83 ("gtk+" ,gtk+-2) 88 ("gtk+" ,gtk+)
84 ("libglade" ,libglade) 89 ("libglade" ,libglade)
85 ("libgsf" ,libgsf) 90 ("libgsf" ,libgsf)
86 ("libjpeg" ,libjpeg) 91 ("libjpeg" ,libjpeg)
@@ -88,6 +93,7 @@
88 ("librsvg" ,librsvg) 93 ("librsvg" ,librsvg)
89 ("libwmf" ,libwmf) 94 ("libwmf" ,libwmf)
90 ("libxml2" ,libxml2) 95 ("libxml2" ,libxml2)
96 ("libxslt" ,libxslt)
91 ("ots" ,ots) 97 ("ots" ,ots)
92 ("popt" ,popt) 98 ("popt" ,popt)
93 ("readline" ,readline) 99 ("readline" ,readline)
@@ -96,6 +102,7 @@
96 (native-inputs 102 (native-inputs
97 `(("intltool" ,intltool) 103 `(("intltool" ,intltool)
98 ("glib:bin" ,glib "bin") 104 ("glib:bin" ,glib "bin")
105 ("libtool" ,libtool)
99 ("pkg-config" ,pkg-config))) 106 ("pkg-config" ,pkg-config)))
100 (home-page "http://abisource.org/") 107 (home-page "http://abisource.org/")
101 (synopsis "Word processing program") 108 (synopsis "Word processing program")
diff --git a/gnu/packages/patches/abiword-link-plugins-against-backend.patch b/gnu/packages/patches/abiword-link-plugins-against-backend.patch
deleted file mode 100644
index fb8fbfc98b4..00000000000
--- a/gnu/packages/patches/abiword-link-plugins-against-backend.patch
+++ /dev/null
@@ -1,639 +0,0 @@
1Link plugins against libabiword. This is because --no-undefined is passed to
2the linker when linking and without libabiword, it would fail.
3
4--- a/plugins/aiksaurus/Makefile.in 2014-09-06 11:25:35.000000000 +0200
5+++ b/plugins/aiksaurus/Makefile.in 2014-09-06 14:58:36.480413350 +0200
6@@ -422,7 +422,8 @@
7 plugin_LTLIBRARIES = aiksaurus.la
8 aiksaurus_la_LIBADD = \
9 $(platform_lib) \
10- xp/libxp.la
11+ xp/libxp.la \
12+ @top_builddir@/src/libabiword-2.8.la
13
14 aiksaurus_la_LDFLAGS = \
15 $(AIKSAURUS_LIBS) \
16
17--- a/plugins/applix/Makefile.in 2014-09-06 11:25:35.000000000 +0200
18+++ b/plugins/applix/Makefile.in 2014-09-06 14:58:54.416413938 +0200
19@@ -425,7 +425,8 @@
20 @APPLIX_BUILTIN_FALSE@plugindir = $(ABIWORD_PLUGINSDIR)
21 @APPLIX_BUILTIN_FALSE@plugin_LTLIBRARIES = applix.la
22 applix_la_LIBADD = \
23- xp/libxp.la
24+ xp/libxp.la \
25+ @top_builddir@/src/libabiword-2.8.la
26
27 applix_la_LDFLAGS = \
28 $(APPLIX_LIBS) \
29
30--- a/plugins/babelfish/Makefile.in 2014-09-06 11:25:35.000000000 +0200
31+++ b/plugins/babelfish/Makefile.in 2014-09-06 14:59:09.220414422 +0200
32@@ -425,7 +425,8 @@
33 @BABELFISH_BUILTIN_FALSE@plugindir = $(ABIWORD_PLUGINSDIR)
34 @BABELFISH_BUILTIN_FALSE@plugin_LTLIBRARIES = babelfish.la
35 babelfish_la_LIBADD = \
36- xp/libxp.la
37+ xp/libxp.la \
38+ @top_builddir@/src/libabiword-2.8.la
39
40 babelfish_la_LDFLAGS = \
41 $(BABELFISH_LIBS) \
42
43--- a/plugins/bmp/Makefile.in 2014-09-06 11:25:35.000000000 +0200
44+++ b/plugins/bmp/Makefile.in 2014-09-06 14:59:53.928415886 +0200
45@@ -425,7 +425,8 @@
46 @BMP_BUILTIN_FALSE@plugindir = $(ABIWORD_PLUGINSDIR)
47 @BMP_BUILTIN_FALSE@plugin_LTLIBRARIES = bmp.la
48 bmp_la_LIBADD = \
49- xp/libxp.la
50+ xp/libxp.la \
51+ @top_builddir@/src/libabiword-2.8.la
52
53 bmp_la_LDFLAGS = \
54 $(BMP_LIBS) \
55
56--- a/plugins/clarisworks/Makefile.in 2014-09-06 11:25:35.000000000 +0200
57+++ b/plugins/clarisworks/Makefile.in 2014-09-06 15:00:06.148416286 +0200
58@@ -427,7 +427,8 @@
59 @CLARISWORKS_BUILTIN_FALSE@plugindir = $(ABIWORD_PLUGINSDIR)
60 @CLARISWORKS_BUILTIN_FALSE@plugin_LTLIBRARIES = clarisworks.la
61 clarisworks_la_LIBADD = \
62- xp/libxp.la
63+ xp/libxp.la \
64+ @top_builddir@/src/libabiword-2.8.la
65
66 clarisworks_la_LDFLAGS = \
67 $(CLARISWORKS_LIBS) \
68
69--- a/plugins/collab/Makefile.in 2014-09-06 11:25:35.000000000 +0200
70+++ b/plugins/collab/Makefile.in 2014-09-06 15:02:04.000420145 +0200
71@@ -428,7 +428,8 @@
72 @TOOLKIT_COCOA_FALSE@plugin_LTLIBRARIES = collab.la
73 @TOOLKIT_COCOA_FALSE@collab_la_LIBADD = \
74 @TOOLKIT_COCOA_FALSE@ backends/libbackends.la \
75-@TOOLKIT_COCOA_FALSE@ core/libcore.la
76+@TOOLKIT_COCOA_FALSE@ core/libcore.la \
77+@TOOLKIT_COCOA_FALSE@ @top_builddir@/src/libabiword-2.8.la
78
79 @TOOLKIT_COCOA_FALSE@collab_la_LDFLAGS = \
80 @TOOLKIT_COCOA_FALSE@ $(COLLAB_LIBS) \
81
82--- a/plugins/command/Makefile.in 2014-09-06 11:25:35.000000000 +0200
83+++ b/plugins/command/Makefile.in 2014-09-06 15:02:41.208421363 +0200
84@@ -420,7 +420,8 @@
85 @TOOLKIT_COCOA_FALSE@plugindir = $(ABIWORD_PLUGINSDIR)
86 @TOOLKIT_COCOA_FALSE@plugin_LTLIBRARIES = command.la
87 @TOOLKIT_COCOA_FALSE@command_la_LIBADD = \
88-@TOOLKIT_COCOA_FALSE@ xp/libxp.la
89+@TOOLKIT_COCOA_FALSE@ xp/libxp.la \
90+@TOOLKIT_COCOA_FALSE@ @top_builddir@/src/libabiword-2.8.la
91
92 @TOOLKIT_COCOA_FALSE@command_la_LDFLAGS = \
93 @TOOLKIT_COCOA_FALSE@ $(COMMAND_LIBS) \
94
95--- a/plugins/docbook/Makefile.in 2014-09-06 11:25:35.000000000 +0200
96+++ b/plugins/docbook/Makefile.in 2014-09-06 15:02:52.128421720 +0200
97@@ -425,7 +425,8 @@
98 @DOCBOOK_BUILTIN_FALSE@plugindir = $(ABIWORD_PLUGINSDIR)
99 @DOCBOOK_BUILTIN_FALSE@plugin_LTLIBRARIES = docbook.la
100 docbook_la_LIBADD = \
101- xp/libxp.la
102+ xp/libxp.la \
103+ @top_builddir@/src/libabiword-2.8.la
104
105 docbook_la_LDFLAGS = \
106 $(DOCBOOK_LIBS) \
107
108--- a/plugins/eml/Makefile.in 2014-09-06 11:25:35.000000000 +0200
109+++ b/plugins/eml/Makefile.in 2014-09-06 15:03:02.760422068 +0200
110@@ -425,7 +425,8 @@
111 @EML_BUILTIN_FALSE@plugindir = $(ABIWORD_PLUGINSDIR)
112 @EML_BUILTIN_FALSE@plugin_LTLIBRARIES = eml.la
113 eml_la_LIBADD = \
114- xp/libxp.la
115+ xp/libxp.la \
116+ @top_builddir@/src/libabiword-2.8.la
117
118 eml_la_LDFLAGS = \
119 $(EML_LIBS) \
120
121--- a/plugins/freetranslation/Makefile.in 2014-09-06 11:25:35.000000000 +0200
122+++ b/plugins/freetranslation/Makefile.in 2014-09-06 15:03:17.656422556 +0200
123@@ -427,7 +427,8 @@
124 @FREETRANSLATION_BUILTIN_FALSE@plugindir = $(ABIWORD_PLUGINSDIR)
125 @FREETRANSLATION_BUILTIN_FALSE@plugin_LTLIBRARIES = freetranslation.la
126 freetranslation_la_LIBADD = \
127- xp/libxp.la
128+ xp/libxp.la \
129+ @top_builddir@/src/libabiword-2.8.la
130
131 freetranslation_la_LDFLAGS = \
132 $(FREETRANSLATION_LIBS) \
133
134--- a/plugins/garble/Makefile.in 2014-09-06 11:25:35.000000000 +0200
135+++ b/plugins/garble/Makefile.in 2014-09-06 15:03:48.192423556 +0200
136@@ -427,7 +427,8 @@
137 @TOOLKIT_COCOA_FALSE@plugin_LTLIBRARIES = garble.la
138 @TOOLKIT_COCOA_FALSE@garble_la_LIBADD = \
139 @TOOLKIT_COCOA_FALSE@ xp/libxp.la \
140-@TOOLKIT_COCOA_FALSE@ $(GARBLE_LIBS) $(PNG_LIBS) -ljpeg
141+@TOOLKIT_COCOA_FALSE@ $(GARBLE_LIBS) $(PNG_LIBS) -ljpeg \
142+@TOOLKIT_COCOA_FALSE@ @top_builddir@/src/libabiword-2.8.la
143
144 @TOOLKIT_COCOA_FALSE@garble_la_LDFLAGS = \
145 @TOOLKIT_COCOA_FALSE@ $(GARBLE_LIBS) \
146
147--- a/plugins/gda/Makefile.in 2014-09-06 11:25:35.000000000 +0200
148+++ b/plugins/gda/Makefile.in 2014-09-06 15:04:08.012424205 +0200
149@@ -419,7 +419,8 @@
150 plugindir = $(ABIWORD_PLUGINSDIR)
151 plugin_LTLIBRARIES = gda.la
152 gda_la_LIBADD = \
153- unix/libunix.la
154+ unix/libunix.la \
155+ @top_builddir@/src/libabiword-2.8.la
156
157 gda_la_LDFLAGS = \
158 $(GDA_LIBS) \
159
160--- a/plugins/gdict/Makefile.in 2014-09-06 11:25:35.000000000 +0200
161+++ b/plugins/gdict/Makefile.in 2014-09-06 15:04:37.888425183 +0200
162@@ -423,7 +423,8 @@
163 @GDICT_BUILTIN_FALSE@@TOOLKIT_GTK_TRUE@plugindir = $(ABIWORD_PLUGINSDIR)
164 @GDICT_BUILTIN_FALSE@@TOOLKIT_GTK_TRUE@plugin_LTLIBRARIES = gdict.la
165 @TOOLKIT_GTK_TRUE@gdict_la_LIBADD = \
166-@TOOLKIT_GTK_TRUE@ unix/libunix.la
167+@TOOLKIT_GTK_TRUE@ unix/libunix.la \
168+@TOOLKIT_GTK_TRUE@ @top_builddir@/src/libabiword-2.8.la
169
170 @TOOLKIT_GTK_TRUE@gdict_la_LDFLAGS = \
171 @TOOLKIT_GTK_TRUE@ $(GDICT_LIBS) \
172
173--- a/plugins/gimp/Makefile.in 2014-09-06 11:25:35.000000000 +0200
174+++ b/plugins/gimp/Makefile.in 2014-09-06 15:04:47.380425494 +0200
175@@ -425,7 +425,8 @@
176 @GIMP_BUILTIN_FALSE@plugindir = $(ABIWORD_PLUGINSDIR)
177 @GIMP_BUILTIN_FALSE@plugin_LTLIBRARIES = gimp.la
178 gimp_la_LIBADD = \
179- xp/libxp.la
180+ xp/libxp.la \
181+ @top_builddir@/src/libabiword-2.8.la
182
183 gimp_la_LDFLAGS = \
184 $(GIMP_LIBS) \
185
186--- a/plugins/goffice/Makefile.in 2014-09-06 11:25:35.000000000 +0200
187+++ b/plugins/goffice/Makefile.in 2014-09-06 15:04:57.660425830 +0200
188@@ -419,7 +419,8 @@
189 plugindir = $(ABIWORD_PLUGINSDIR)
190 plugin_LTLIBRARIES = goffice.la
191 goffice_la_LIBADD = \
192- unix/libunix.la
193+ unix/libunix.la \
194+ @top_builddir@/src/libabiword-2.8.la
195
196 goffice_la_LDFLAGS = \
197 $(GOFFICE_LIBS) \
198
199--- a/plugins/google/Makefile.in 2014-09-06 11:25:35.000000000 +0200
200+++ b/plugins/google/Makefile.in 2014-09-06 15:05:06.852426131 +0200
201@@ -425,7 +425,8 @@
202 @GOOGLE_BUILTIN_FALSE@plugindir = $(ABIWORD_PLUGINSDIR)
203 @GOOGLE_BUILTIN_FALSE@plugin_LTLIBRARIES = google.la
204 google_la_LIBADD = \
205- xp/libxp.la
206+ xp/libxp.la \
207+ @top_builddir@/src/libabiword-2.8.la
208
209 google_la_LDFLAGS = \
210 $(GOOGLE_LIBS) \
211
212--- a/plugins/grammar/Makefile.in 2014-09-06 11:25:35.000000000 +0200
213+++ b/plugins/grammar/Makefile.in 2014-09-06 15:05:19.840426556 +0200
214@@ -424,7 +424,8 @@
215 plugin_LTLIBRARIES = grammar.la
216 grammar_la_LIBADD = \
217 linkgrammarwrap/liblinkgrammarwrap.la \
218- xp/libxp.la
219+ xp/libxp.la \
220+ @top_builddir@/src/libabiword-2.8.la
221
222 grammar_la_LDFLAGS = \
223 $(GRAMMAR_LIBS) \
224
225--- a/plugins/hancom/Makefile.in 2014-09-06 11:25:35.000000000 +0200
226+++ b/plugins/hancom/Makefile.in 2014-09-06 15:05:29.684426879 +0200
227@@ -425,7 +425,8 @@
228 @HANCOM_BUILTIN_FALSE@plugindir = $(ABIWORD_PLUGINSDIR)
229 @HANCOM_BUILTIN_FALSE@plugin_LTLIBRARIES = hancom.la
230 hancom_la_LIBADD = \
231- xp/libxp.la
232+ xp/libxp.la \
233+ @top_builddir@/src/libabiword-2.8.la
234
235 hancom_la_LDFLAGS = \
236 $(HANCOM_LIBS) \
237
238--- a/plugins/hrtext/Makefile.in 2014-09-06 11:25:35.000000000 +0200
239+++ b/plugins/hrtext/Makefile.in 2014-09-06 15:05:41.244427257 +0200
240@@ -425,7 +425,8 @@
241 @HRTEXT_BUILTIN_FALSE@plugindir = $(ABIWORD_PLUGINSDIR)
242 @HRTEXT_BUILTIN_FALSE@plugin_LTLIBRARIES = hrtext.la
243 hrtext_la_LIBADD = \
244- xp/libxp.la
245+ xp/libxp.la \
246+ @top_builddir@/src/libabiword-2.8.la
247
248 hrtext_la_LDFLAGS = \
249 $(HRTEXT_LIBS) \
250
251--- a/plugins/iscii/Makefile.in 2014-09-06 11:25:35.000000000 +0200
252+++ b/plugins/iscii/Makefile.in 2014-09-06 15:05:52.660427631 +0200
253@@ -425,7 +425,8 @@
254 @ISCII_BUILTIN_FALSE@plugindir = $(ABIWORD_PLUGINSDIR)
255 @ISCII_BUILTIN_FALSE@plugin_LTLIBRARIES = iscii.la
256 iscii_la_LIBADD = \
257- xp/libxp.la
258+ xp/libxp.la \
259+ @top_builddir@/src/libabiword-2.8.la
260
261 iscii_la_LDFLAGS = \
262 $(ISCII_LIBS) \
263
264--- a/plugins/kword/Makefile.in 2014-09-06 11:25:35.000000000 +0200
265+++ b/plugins/kword/Makefile.in 2014-09-06 15:06:01.260427912 +0200
266@@ -425,7 +425,8 @@
267 @KWORD_BUILTIN_FALSE@plugindir = $(ABIWORD_PLUGINSDIR)
268 @KWORD_BUILTIN_FALSE@plugin_LTLIBRARIES = kword.la
269 kword_la_LIBADD = \
270- xp/libxp.la
271+ xp/libxp.la \
272+ @top_builddir@/src/libabiword-2.8.la
273
274 kword_la_LDFLAGS = \
275 $(KWORD_LIBS) \
276
277--- a/plugins/latex/Makefile.in 2014-09-06 11:25:35.000000000 +0200
278+++ b/plugins/latex/Makefile.in 2014-09-06 15:06:13.212428304 +0200
279@@ -426,7 +426,8 @@
280 @LATEX_BUILTIN_FALSE@plugindir = $(ABIWORD_PLUGINSDIR)
281 @LATEX_BUILTIN_FALSE@plugin_LTLIBRARIES = latex.la
282 latex_la_LIBADD = \
283- xp/libxp.la
284+ xp/libxp.la \
285+ @top_builddir@/src/libabiword-2.8.la
286
287 latex_la_LDFLAGS = \
288 $(LATEX_LIBS) \
289
290--- a/plugins/loadbindings/Makefile.in 2014-09-06 11:25:35.000000000 +0200
291+++ b/plugins/loadbindings/Makefile.in 2014-09-06 15:06:27.340428766 +0200
292@@ -427,7 +427,8 @@
293 @LOADBINDINGS_BUILTIN_FALSE@plugindir = $(ABIWORD_PLUGINSDIR)
294 @LOADBINDINGS_BUILTIN_FALSE@plugin_LTLIBRARIES = loadbindings.la
295 loadbindings_la_LIBADD = \
296- xp/libxp.la
297+ xp/libxp.la \
298+ @top_builddir@/src/libabiword-2.8.la
299
300 loadbindings_la_LDFLAGS = \
301 $(LOADBINDINGS_LIBS) \
302
303--- a/plugins/mathview/Makefile.in 2014-09-06 11:25:35.000000000 +0200
304+++ b/plugins/mathview/Makefile.in 2014-09-06 15:06:35.428429031 +0200
305@@ -423,7 +423,8 @@
306 plugin_LTLIBRARIES = mathview.la
307 mathview_la_LIBADD = \
308 itex2mml/libitex2mml.la \
309- xp/libxp.la
310+ xp/libxp.la \
311+ @top_builddir@/src/libabiword-2.8.la
312
313 mathview_la_LDFLAGS = \
314 $(MATHVIEW_LIBS) \
315
316--- a/plugins/mht/Makefile.in 2014-09-06 11:25:35.000000000 +0200
317+++ b/plugins/mht/Makefile.in 2014-09-06 15:06:47.516429427 +0200
318@@ -422,7 +422,8 @@
319 plugindir = $(ABIWORD_PLUGINSDIR)
320 plugin_LTLIBRARIES = mht.la
321 mht_la_LIBADD = \
322- xp/libxp.la
323+ xp/libxp.la \
324+ @top_builddir@/src/libabiword-2.8.la
325
326 mht_la_LDFLAGS = \
327 $(MHT_LIBS) \
328
329--- a/plugins/mif/Makefile.in 2014-09-06 11:25:35.000000000 +0200
330+++ b/plugins/mif/Makefile.in 2014-09-06 15:07:03.496429950 +0200
331@@ -425,7 +425,8 @@
332 @MIF_BUILTIN_FALSE@plugindir = $(ABIWORD_PLUGINSDIR)
333 @MIF_BUILTIN_FALSE@plugin_LTLIBRARIES = mif.la
334 mif_la_LIBADD = \
335- xp/libxp.la
336+ xp/libxp.la \
337+ @top_builddir@/src/libabiword-2.8.la
338
339 mif_la_LDFLAGS = \
340 $(MIF_LIBS) \
341
342--- a/plugins/mswrite/Makefile.in 2014-09-06 11:25:35.000000000 +0200
343+++ b/plugins/mswrite/Makefile.in 2014-09-06 15:07:15.700430349 +0200
344@@ -425,7 +425,8 @@
345 @MSWRITE_BUILTIN_FALSE@plugindir = $(ABIWORD_PLUGINSDIR)
346 @MSWRITE_BUILTIN_FALSE@plugin_LTLIBRARIES = mswrite.la
347 mswrite_la_LIBADD = \
348- xp/libxp.la
349+ xp/libxp.la \
350+ @top_builddir@/src/libabiword-2.8.la
351
352 mswrite_la_LDFLAGS = \
353 $(MSWRITE_LIBS) \
354
355--- a/plugins/opendocument/Makefile.in 2014-09-06 11:25:35.000000000 +0200
356+++ b/plugins/opendocument/Makefile.in 2014-09-06 15:07:26.668430709 +0200
357@@ -430,7 +430,8 @@
358 opendocument_la_LIBADD = \
359 common/libcommon.la \
360 exp/libexp.la \
361- imp/libimp.la
362+ imp/libimp.la \
363+ @top_builddir@/src/libabiword-2.8.la
364
365 opendocument_la_LDFLAGS = \
366 $(OPENDOCUMENT_LIBS) \
367
368--- a/plugins/openwriter/Makefile.in 2014-09-06 11:25:35.000000000 +0200
369+++ b/plugins/openwriter/Makefile.in 2014-09-06 15:07:40.272431154 +0200
370@@ -426,7 +426,8 @@
371 @OPENWRITER_BUILTIN_FALSE@plugindir = $(ABIWORD_PLUGINSDIR)
372 @OPENWRITER_BUILTIN_FALSE@plugin_LTLIBRARIES = openwriter.la
373 openwriter_la_LIBADD = \
374- xp/libxp.la
375+ xp/libxp.la \
376+ @top_builddir@/src/libabiword-2.8.la
377
378 openwriter_la_LDFLAGS = \
379 $(OPENWRITER_LIBS) \
380
381--- a/plugins/openxml/Makefile.in 2014-09-06 11:25:35.000000000 +0200
382+++ b/plugins/openxml/Makefile.in 2014-09-06 15:08:44.312433251 +0200
383@@ -428,7 +428,8 @@
384 openxml_la_LIBADD = \
385 common/libcommon.la \
386 imp/libimp.la \
387- exp/libexp.la
388+ exp/libexp.la \
389+ @top_builddir@/src/libabiword-2.8.la
390
391 openxml_la_LDFLAGS = \
392 $(OPENXML_LIBS) \
393
394--- a/plugins/opml/Makefile.in 2014-09-06 11:25:35.000000000 +0200
395+++ b/plugins/opml/Makefile.in 2014-09-06 15:08:58.424433713 +0200
396@@ -425,7 +425,8 @@
397 @OPML_BUILTIN_FALSE@plugindir = $(ABIWORD_PLUGINSDIR)
398 @OPML_BUILTIN_FALSE@plugin_LTLIBRARIES = opml.la
399 opml_la_LIBADD = \
400- xp/libxp.la
401+ xp/libxp.la \
402+ @top_builddir@/src/libabiword-2.8.la
403
404 opml_la_LDFLAGS = \
405 $(OPML_LIBS) \
406
407--- a/plugins/ots/Makefile.in 2014-09-06 11:25:35.000000000 +0200
408+++ b/plugins/ots/Makefile.in 2014-09-06 15:09:08.164434031 +0200
409@@ -419,7 +419,8 @@
410 plugindir = $(ABIWORD_PLUGINSDIR)
411 plugin_LTLIBRARIES = ots.la
412 ots_la_LIBADD = \
413- xp/libxp.la
414+ xp/libxp.la \
415+ @top_builddir@/src/libabiword-2.8.la
416
417 ots_la_LDFLAGS = \
418 $(OTS_LIBS) \
419
420--- a/plugins/paint/Makefile.in 2014-09-06 11:25:35.000000000 +0200
421+++ b/plugins/paint/Makefile.in 2014-09-06 15:09:38.912435038 +0200
422@@ -426,7 +426,8 @@
423 @PAINT_BUILTIN_FALSE@plugin_LTLIBRARIES = paint.la
424 paint_la_LIBADD = \
425 @PLATFORM@/lib@PLATFORM@.la \
426- xp/libxp.la
427+ xp/libxp.la \
428+ @top_builddir@/src/libabiword-2.8.la
429
430 paint_la_LDFLAGS = \
431 $(PAINT_LIBS) \
432
433--- a/plugins/passepartout/Makefile.in 2014-09-06 11:25:35.000000000 +0200
434+++ b/plugins/passepartout/Makefile.in 2014-09-06 15:09:46.744435295 +0200
435@@ -427,7 +427,8 @@
436 @PASSEPARTOUT_BUILTIN_FALSE@plugindir = $(ABIWORD_PLUGINSDIR)
437 @PASSEPARTOUT_BUILTIN_FALSE@plugin_LTLIBRARIES = passepartout.la
438 passepartout_la_LIBADD = \
439- xp/libxp.la
440+ xp/libxp.la \
441+ @top_builddir@/src/libabiword-2.8.la
442
443 passepartout_la_LDFLAGS = \
444 $(PASSEPARTOUT_LIBS) \
445
446--- a/plugins/pdb/Makefile.in 2014-09-06 11:25:35.000000000 +0200
447+++ b/plugins/pdb/Makefile.in 2014-09-06 15:09:54.484435548 +0200
448@@ -425,7 +425,8 @@
449 @PDB_BUILTIN_FALSE@plugindir = $(ABIWORD_PLUGINSDIR)
450 @PDB_BUILTIN_FALSE@plugin_LTLIBRARIES = pdb.la
451 pdb_la_LIBADD = \
452- xp/libxp.la
453+ xp/libxp.la \
454+ @top_builddir@/src/libabiword-2.8.la
455
456 pdb_la_LDFLAGS = \
457 $(PDB_LIBS) \
458
459--- a/plugins/pdf/Makefile.in 2014-09-06 11:25:35.000000000 +0200
460+++ b/plugins/pdf/Makefile.in 2014-09-06 15:10:04.444435874 +0200
461@@ -425,7 +425,8 @@
462 @PDF_BUILTIN_FALSE@plugindir = $(ABIWORD_PLUGINSDIR)
463 @PDF_BUILTIN_FALSE@plugin_LTLIBRARIES = pdf.la
464 pdf_la_LIBADD = \
465- xp/libxp.la
466+ xp/libxp.la \
467+ @top_builddir@/src/libabiword-2.8.la
468
469 pdf_la_LDFLAGS = \
470 $(PDF_LIBS) \
471
472--- a/plugins/presentation/Makefile.in 2014-09-06 11:25:35.000000000 +0200
473+++ b/plugins/presentation/Makefile.in 2014-09-06 15:10:13.112436158 +0200
474@@ -427,7 +427,8 @@
475 @PRESENTATION_BUILTIN_FALSE@plugindir = $(ABIWORD_PLUGINSDIR)
476 @PRESENTATION_BUILTIN_FALSE@plugin_LTLIBRARIES = presentation.la
477 presentation_la_LIBADD = \
478- xp/libxp.la
479+ xp/libxp.la \
480+ @top_builddir@/src/libabiword-2.8.la
481
482 presentation_la_LDFLAGS = \
483 $(PRESENTATION_LIBS) \
484
485--- a/plugins/psion/Makefile.in 2014-09-06 11:25:35.000000000 +0200
486+++ b/plugins/psion/Makefile.in 2014-09-06 15:10:22.176436455 +0200
487@@ -421,7 +421,8 @@
488 plugindir = $(ABIWORD_PLUGINSDIR)
489 plugin_LTLIBRARIES = psion.la
490 psion_la_LIBADD = \
491- xp/libxp.la
492+ xp/libxp.la \
493+ @top_builddir@/src/libabiword-2.8.la
494
495 psion_la_LDFLAGS = \
496 $(PSION_LIBS) \
497
498--- a/plugins/rsvg/Makefile.in 2014-09-06 11:25:35.000000000 +0200
499+++ b/plugins/rsvg/Makefile.in 2014-09-06 15:10:37.632436961 +0200
500@@ -425,7 +425,8 @@
501 plugin_LTLIBRARIES = rsvg.la
502 rsvg_la_LIBADD = \
503 xp/libxp.la \
504- $(RSVG_LIBS) $(PNG_LIBS)
505+ $(RSVG_LIBS) $(PNG_LIBS) \
506+ @top_builddir@/src/libabiword-2.8.la
507
508 rsvg_la_LDFLAGS = \
509 -avoid-version \
510
511--- a/plugins/s5/Makefile.in 2014-09-06 11:25:35.000000000 +0200
512+++ b/plugins/s5/Makefile.in 2014-09-06 15:10:46.652437256 +0200
513@@ -425,7 +425,8 @@
514 @S5_BUILTIN_FALSE@plugindir = $(ABIWORD_PLUGINSDIR)
515 @S5_BUILTIN_FALSE@plugin_LTLIBRARIES = s5.la
516 s5_la_LIBADD = \
517- xp/libxp.la
518+ xp/libxp.la \
519+ @top_builddir@/src/libabiword-2.8.la
520
521 s5_la_LDFLAGS = \
522 $(S5_LIBS) \
523
524--- a/plugins/sdw/Makefile.in 2014-09-06 11:25:35.000000000 +0200
525+++ b/plugins/sdw/Makefile.in 2014-09-06 15:10:58.072437630 +0200
526@@ -425,7 +425,8 @@
527 @SDW_BUILTIN_FALSE@plugindir = $(ABIWORD_PLUGINSDIR)
528 @SDW_BUILTIN_FALSE@plugin_LTLIBRARIES = sdw.la
529 sdw_la_LIBADD = \
530- xp/libxp.la
531+ xp/libxp.la \
532+ @top_builddir@/src/libabiword-2.8.la
533
534 sdw_la_LDFLAGS = \
535 $(SDW_LIBS) \
536
537--- a/plugins/t602/Makefile.in 2014-09-06 11:25:35.000000000 +0200
538+++ b/plugins/t602/Makefile.in 2014-09-06 15:11:06.224437897 +0200
539@@ -425,7 +425,8 @@
540 @T602_BUILTIN_FALSE@plugindir = $(ABIWORD_PLUGINSDIR)
541 @T602_BUILTIN_FALSE@plugin_LTLIBRARIES = t602.la
542 t602_la_LIBADD = \
543- xp/libxp.la
544+ xp/libxp.la \
545+ @top_builddir@/src/libabiword-2.8.la
546
547 t602_la_LDFLAGS = \
548 $(T602_LIBS) \
549
550--- a/plugins/urldict/Makefile.in 2014-09-06 11:25:35.000000000 +0200
551+++ b/plugins/urldict/Makefile.in 2014-09-06 15:11:14.404438165 +0200
552@@ -425,7 +425,8 @@
553 @URLDICT_BUILTIN_FALSE@plugindir = $(ABIWORD_PLUGINSDIR)
554 @URLDICT_BUILTIN_FALSE@plugin_LTLIBRARIES = urldict.la
555 urldict_la_LIBADD = \
556- xp/libxp.la
557+ xp/libxp.la \
558+ @top_builddir@/src/libabiword-2.8.la
559
560 urldict_la_LDFLAGS = \
561 $(URLDICT_LIBS) \
562
563--- a/plugins/wikipedia/Makefile.in 2014-09-06 11:25:35.000000000 +0200
564+++ b/plugins/wikipedia/Makefile.in 2014-09-06 15:11:22.064438415 +0200
565@@ -425,7 +425,8 @@
566 @WIKIPEDIA_BUILTIN_FALSE@plugindir = $(ABIWORD_PLUGINSDIR)
567 @WIKIPEDIA_BUILTIN_FALSE@plugin_LTLIBRARIES = wikipedia.la
568 wikipedia_la_LIBADD = \
569- xp/libxp.la
570+ xp/libxp.la \
571+ @top_builddir@/src/libabiword-2.8.la
572
573 wikipedia_la_LDFLAGS = \
574 $(WIKIPEDIA_LIBS) \
575
576--- a/plugins/wmf/Makefile.in 2014-09-06 11:25:35.000000000 +0200
577+++ b/plugins/wmf/Makefile.in 2014-09-06 15:11:31.348438719 +0200
578@@ -422,7 +422,8 @@
579 plugindir = $(ABIWORD_PLUGINSDIR)
580 plugin_LTLIBRARIES = wmf.la
581 wmf_la_LIBADD = \
582- xp/libxp.la
583+ xp/libxp.la \
584+ @top_builddir@/src/libabiword-2.8.la
585
586 wmf_la_LDFLAGS = \
587 $(WMF_LIBS) \
588
589--- a/plugins/wml/Makefile.in 2014-09-06 11:25:35.000000000 +0200
590+++ b/plugins/wml/Makefile.in 2014-09-06 15:11:40.168439008 +0200
591@@ -425,7 +425,8 @@
592 @WML_BUILTIN_FALSE@plugindir = $(ABIWORD_PLUGINSDIR)
593 @WML_BUILTIN_FALSE@plugin_LTLIBRARIES = wml.la
594 wml_la_LIBADD = \
595- xp/libxp.la
596+ xp/libxp.la \
597+ @top_builddir@/src/libabiword-2.8.la
598
599 wml_la_LDFLAGS = \
600 $(WML_LIBS) \
601
602--- a/plugins/wordperfect/Makefile.in 2014-09-06 11:25:35.000000000 +0200
603+++ b/plugins/wordperfect/Makefile.in 2014-09-06 15:11:50.336439341 +0200
604@@ -423,7 +423,8 @@
605 plugindir = $(ABIWORD_PLUGINSDIR)
606 plugin_LTLIBRARIES = wordperfect.la
607 wordperfect_la_LIBADD = \
608- xp/libxp.la
609+ xp/libxp.la \
610+ @top_builddir@/src/libabiword-2.8.la
611
612 wordperfect_la_LDFLAGS = \
613 $(WORDPERFECT_LIBS) \
614
615--- a/plugins/wpg/Makefile.in 2014-09-06 11:25:35.000000000 +0200
616+++ b/plugins/wpg/Makefile.in 2014-09-06 15:12:11.328440028 +0200
617@@ -422,7 +422,8 @@
618 plugindir = $(ABIWORD_PLUGINSDIR)
619 plugin_LTLIBRARIES = wpg.la
620 wpg_la_LIBADD = \
621- xp/libxp.la
622+ xp/libxp.la \
623+ @top_builddir@/src/libabiword-2.8.la
624
625 wpg_la_LDFLAGS = \
626 $(WPG_LIBS) \
627
628--- a/plugins/xslfo/Makefile.in 2014-09-06 11:25:35.000000000 +0200
629+++ b/plugins/xslfo/Makefile.in 2014-09-06 15:12:44.984441130 +0200
630@@ -425,7 +425,8 @@
631 @XSLFO_BUILTIN_FALSE@plugindir = $(ABIWORD_PLUGINSDIR)
632 @XSLFO_BUILTIN_FALSE@plugin_LTLIBRARIES = xslfo.la
633 xslfo_la_LIBADD = \
634- xp/libxp.la
635+ xp/libxp.la \
636+ @top_builddir@/src/libabiword-2.8.la
637
638 xslfo_la_LDFLAGS = \
639 $(XSLFO_LIBS) \
diff --git a/gnu/packages/patches/abiword-no-include-glib-internal-headers.patch b/gnu/packages/patches/abiword-no-include-glib-internal-headers.patch
deleted file mode 100644
index 60a74920fb8..00000000000
--- a/gnu/packages/patches/abiword-no-include-glib-internal-headers.patch
+++ /dev/null
@@ -1,13 +0,0 @@
1Include glib.h instead of an internal header.
2
3--- a/goffice-bits/goffice/app/goffice-app.h 2007-01-17 00:17:27.000000000 +0100
4+++ b/goffice-bits/goffice/app/goffice-app.h 2014-09-05 19:02:59.402064713 +0200
5@@ -22,7 +22,7 @@
6 #ifndef GOFFICE_APP_H
7 #define GOFFICE_APP_H
8
9-#include <glib/gmacros.h>
10+#include <glib.h>
11
12 G_BEGIN_DECLS
13
diff --git a/gnu/packages/patches/abiword-pass-no-undefined-to-linker.patch b/gnu/packages/patches/abiword-pass-no-undefined-to-linker.patch
deleted file mode 100644
index a17d465edb6..00000000000
--- a/gnu/packages/patches/abiword-pass-no-undefined-to-linker.patch
+++ /dev/null
@@ -1,608 +0,0 @@
1gcc/g++ chokes on --no-undefined, so instead pass it directly to the linker.
2
3--- a/plugins/loadbindings/Makefile.in 2010-06-13 23:17:48.000000000 +0200
4+++ b/plugins/loadbindings/Makefile.in 2014-09-06 11:03:21.151951221 +0200
5@@ -433,7 +433,7 @@
6 $(LOADBINDINGS_LIBS) \
7 -avoid-version \
8 -module \
9- -no-undefined
10+ -Wl,--no-undefined
11
12 loadbindings_la_SOURCES =
13 nodist_EXTRA_loadbindings_la_SOURCES = dummy.cpp
14
15--- a/plugins/pdf/Makefile.in 2010-06-13 23:17:53.000000000 +0200
16+++ b/plugins/pdf/Makefile.in 2014-09-06 11:03:21.207951223 +0200
17@@ -431,7 +431,7 @@
18 $(PDF_LIBS) \
19 -avoid-version \
20 -module \
21- -no-undefined
22+ -Wl,--no-undefined
23
24 pdf_la_SOURCES =
25 nodist_EXTRA_pdf_la_SOURCES = dummy.cpp
26
27--- a/plugins/xslfo/Makefile.in 2010-06-13 23:17:55.000000000 +0200
28+++ b/plugins/xslfo/Makefile.in 2014-09-06 11:03:21.227951224 +0200
29@@ -431,7 +431,7 @@
30 $(XSLFO_LIBS) \
31 -avoid-version \
32 -module \
33- -no-undefined
34+ -Wl,--no-undefined
35
36 xslfo_la_SOURCES =
37 nodist_EXTRA_xslfo_la_SOURCES = dummy.cpp
38
39--- a/plugins/gda/Makefile.in 2010-06-13 23:17:45.000000000 +0200
40+++ b/plugins/gda/Makefile.in 2014-09-06 11:03:21.251951225 +0200
41@@ -425,7 +425,7 @@
42 $(GDA_LIBS) \
43 -avoid-version \
44 -module \
45- -no-undefined
46+ -Wl,--no-undefined
47
48 gda_la_SOURCES =
49 EXTRA_DIST = \
50
51--- a/plugins/wikipedia/Makefile.in 2010-06-13 23:17:54.000000000 +0200
52+++ b/plugins/wikipedia/Makefile.in 2014-09-06 11:03:21.271951225 +0200
53@@ -431,7 +431,7 @@
54 $(WIKIPEDIA_LIBS) \
55 -avoid-version \
56 -module \
57- -no-undefined
58+ -Wl,--no-undefined
59
60 wikipedia_la_SOURCES =
61 nodist_EXTRA_wikipedia_la_SOURCES = dummy.cpp
62
63--- a/plugins/collab/Makefile.in 2010-06-13 23:17:41.000000000 +0200
64+++ b/plugins/collab/Makefile.in 2014-09-06 11:03:21.291951226 +0200
65@@ -435,7 +435,7 @@
66 @TOOLKIT_COCOA_FALSE@ $(SYSTEM_LIBS) \
67 @TOOLKIT_COCOA_FALSE@ -avoid-version \
68 @TOOLKIT_COCOA_FALSE@ -module \
69-@TOOLKIT_COCOA_FALSE@ -no-undefined
70+@TOOLKIT_COCOA_FALSE@ -Wl,--no-undefined
71
72 @TOOLKIT_COCOA_FALSE@collab_la_SOURCES =
73 @TOOLKIT_COCOA_FALSE@nodist_EXTRA_collab_la_SOURCES = dummy.cpp
74
75--- a/plugins/paint/Makefile.in 2010-06-13 23:17:52.000000000 +0200
76+++ b/plugins/paint/Makefile.in 2014-09-06 11:03:21.315951227 +0200
77@@ -432,7 +432,7 @@
78 $(PAINT_LIBS) \
79 -avoid-version \
80 -module \
81- -no-undefined
82+ -Wl,--no-undefined
83
84 paint_la_SOURCES =
85 nodist_EXTRA_paint_la_SOURCES = dummy.cpp
86
87--- a/plugins/garble/Makefile.in 2010-06-13 23:17:45.000000000 +0200
88+++ b/plugins/garble/Makefile.in 2014-09-06 11:03:21.335951227 +0200
89@@ -433,7 +433,7 @@
90 @TOOLKIT_COCOA_FALSE@ $(GARBLE_LIBS) \
91 @TOOLKIT_COCOA_FALSE@ -avoid-version \
92 @TOOLKIT_COCOA_FALSE@ -module \
93-@TOOLKIT_COCOA_FALSE@ -no-undefined
94+@TOOLKIT_COCOA_FALSE@ -Wl,--no-undefined
95
96 @TOOLKIT_COCOA_FALSE@garble_la_SOURCES =
97 @TOOLKIT_COCOA_FALSE@nodist_EXTRA_garble_la_SOURCES = dummy.cpp
98
99--- a/plugins/latex/Makefile.in 2010-06-13 23:17:48.000000000 +0200
100+++ b/plugins/latex/Makefile.in 2014-09-06 11:03:21.359951228 +0200
101@@ -432,7 +432,7 @@
102 $(LATEX_LIBS) \
103 -avoid-version \
104 -module \
105- -no-undefined
106+ -Wl,--no-undefined
107
108 latex_la_SOURCES =
109 nodist_EXTRA_latex_la_SOURCES = dummy.cpp
110
111--- a/plugins/mht/Makefile.in 2010-06-13 23:17:49.000000000 +0200
112+++ b/plugins/mht/Makefile.in 2014-09-06 11:03:21.379951229 +0200
113@@ -428,7 +428,7 @@
114 $(MHT_LIBS) \
115 -avoid-version \
116 -module \
117- -no-undefined
118+ -Wl,--no-undefined
119
120 mht_la_SOURCES =
121 nodist_EXTRA_mht_la_SOURCES = dummy.cpp
122
123--- a/plugins/google/Makefile.in 2010-06-13 23:17:46.000000000 +0200
124+++ b/plugins/google/Makefile.in 2014-09-06 11:03:21.399951230 +0200
125@@ -431,7 +431,7 @@
126 $(GOOGLE_LIBS) \
127 -avoid-version \
128 -module \
129- -no-undefined
130+ -Wl,--no-undefined
131
132 google_la_SOURCES =
133 nodist_EXTRA_google_la_SOURCES = dummy.cpp
134
135--- a/plugins/babelfish/Makefile.in 2010-06-13 23:17:40.000000000 +0200
136+++ b/plugins/babelfish/Makefile.in 2014-09-06 11:03:21.419951230 +0200
137@@ -431,7 +431,7 @@
138 $(BABELFISH_LIBS) \
139 -avoid-version \
140 -module \
141- -no-undefined
142+ -Wl,--no-undefined
143
144 babelfish_la_SOURCES =
145 nodist_EXTRA_babelfish_la_SOURCES = dummy.cpp
146
147--- a/plugins/opendocument/Makefile.in 2010-06-13 23:17:50.000000000 +0200
148+++ b/plugins/opendocument/Makefile.in 2014-09-06 11:03:21.443951231 +0200
149@@ -436,7 +436,7 @@
150 $(OPENDOCUMENT_LIBS) \
151 -avoid-version \
152 -module \
153- -no-undefined
154+ -Wl,--no-undefined
155
156 opendocument_la_SOURCES =
157
158--- a/plugins/opml/Makefile.in 2010-06-13 23:17:51.000000000 +0200
159+++ b/plugins/opml/Makefile.in 2014-09-06 11:03:21.463951232 +0200
160@@ -431,7 +431,7 @@
161 $(OPML_LIBS) \
162 -avoid-version \
163 -module \
164- -no-undefined
165+ -Wl,--no-undefined
166
167 opml_la_SOURCES =
168 nodist_EXTRA_opml_la_SOURCES = dummy.cpp
169
170--- a/plugins/gimp/Makefile.in 2010-06-13 23:17:46.000000000 +0200
171+++ b/plugins/gimp/Makefile.in 2014-09-06 11:03:21.483951232 +0200
172@@ -431,7 +431,7 @@
173 $(GIMP_LIBS) \
174 -avoid-version \
175 -module \
176- -no-undefined
177+ -Wl,--no-undefined
178
179 gimp_la_SOURCES =
180 nodist_EXTRA_gimp_la_SOURCES = dummy.cpp
181
182--- a/plugins/mswrite/Makefile.in 2010-06-13 23:17:49.000000000 +0200
183+++ b/plugins/mswrite/Makefile.in 2014-09-06 11:03:21.507951233 +0200
184@@ -431,7 +431,7 @@
185 $(MSWRITE_LIBS) \
186 -avoid-version \
187 -module \
188- -no-undefined
189+ -Wl,--no-undefined
190
191 mswrite_la_SOURCES =
192 nodist_EXTRA_mswrite_la_SOURCES = dummy.cpp
193
194--- a/plugins/wordperfect/Makefile.in 2010-06-13 23:17:55.000000000 +0200
195+++ b/plugins/wordperfect/Makefile.in 2014-09-06 11:03:21.527951234 +0200
196@@ -429,7 +429,7 @@
197 $(WORDPERFECT_LIBS) \
198 -avoid-version \
199 -module \
200- -no-undefined
201+ -Wl,--no-undefined
202
203 wordperfect_la_SOURCES =
204 nodist_EXTRA_wordperfect_la_SOURCES = dummy.cpp
205
206--- a/plugins/pdb/Makefile.in 2010-06-13 23:17:53.000000000 +0200
207+++ b/plugins/pdb/Makefile.in 2014-09-06 11:03:21.547951234 +0200
208@@ -431,7 +431,7 @@
209 $(PDB_LIBS) \
210 -avoid-version \
211 -module \
212- -no-undefined
213+ -Wl,--no-undefined
214
215 pdb_la_SOURCES =
216 nodist_EXTRA_pdb_la_SOURCES = dummy.cpp
217
218--- a/plugins/ots/Makefile.in 2010-06-13 23:17:52.000000000 +0200
219+++ b/plugins/ots/Makefile.in 2014-09-06 11:03:21.571951235 +0200
220@@ -425,7 +425,7 @@
221 $(OTS_LIBS) \
222 -avoid-version \
223 -module \
224- -no-undefined
225+ -Wl,--no-undefined
226
227 ots_la_SOURCES =
228 EXTRA_DIST = \
229
230--- a/plugins/wml/Makefile.in 2010-06-13 23:17:55.000000000 +0200
231+++ b/plugins/wml/Makefile.in 2014-09-06 11:03:21.591951236 +0200
232@@ -431,7 +431,7 @@
233 $(WML_LIBS) \
234 -avoid-version \
235 -module \
236- -no-undefined
237+ -Wl,--no-undefined
238
239 wml_la_SOURCES =
240 nodist_EXTRA_wml_la_SOURCES = dummy.cpp
241
242--- a/plugins/bmp/Makefile.in 2010-06-13 23:17:40.000000000 +0200
243+++ b/plugins/bmp/Makefile.in 2014-09-06 11:03:21.615951237 +0200
244@@ -431,7 +431,7 @@
245 $(BMP_LIBS) \
246 -avoid-version \
247 -module \
248- -no-undefined
249+ -Wl,--no-undefined
250
251 bmp_la_SOURCES =
252 nodist_EXTRA_bmp_la_SOURCES = dummy.cpp
253
254--- a/plugins/applix/Makefile.in 2010-06-13 23:17:40.000000000 +0200
255+++ b/plugins/applix/Makefile.in 2014-09-06 11:03:21.635951237 +0200
256@@ -431,7 +431,7 @@
257 $(APPLIX_LIBS) \
258 -avoid-version \
259 -module \
260- -no-undefined
261+ -Wl,--no-undefined
262
263 applix_la_SOURCES =
264
265--- a/plugins/iscii/Makefile.in 2010-06-13 23:17:47.000000000 +0200
266+++ b/plugins/iscii/Makefile.in 2014-09-06 11:03:21.659951238 +0200
267@@ -431,7 +431,7 @@
268 $(ISCII_LIBS) \
269 -avoid-version \
270 -module \
271- -no-undefined
272+ -Wl,--no-undefined
273
274 iscii_la_SOURCES =
275 nodist_EXTRA_iscii_la_SOURCES = dummy.cpp
276
277--- a/plugins/gdict/Makefile.in 2010-06-13 23:17:46.000000000 +0200
278+++ b/plugins/gdict/Makefile.in 2014-09-06 11:03:21.679951239 +0200
279@@ -429,7 +429,7 @@
280 @TOOLKIT_GTK_TRUE@ $(GDICT_LIBS) \
281 @TOOLKIT_GTK_TRUE@ -avoid-version \
282 @TOOLKIT_GTK_TRUE@ -module \
283-@TOOLKIT_GTK_TRUE@ -no-undefined
284+@TOOLKIT_GTK_TRUE@ -Wl,--no-undefined
285
286 @TOOLKIT_GTK_TRUE@gdict_la_SOURCES =
287 @TOOLKIT_GTK_TRUE@EXTRA_DIST = \
288
289--- a/plugins/openwriter/Makefile.in 2010-06-13 23:17:50.000000000 +0200
290+++ b/plugins/openwriter/Makefile.in 2014-09-06 11:03:21.699951239 +0200
291@@ -432,7 +432,7 @@
292 $(OPENWRITER_LIBS) \
293 -avoid-version \
294 -module \
295- -no-undefined
296+ -Wl,--no-undefined
297
298 openwriter_la_SOURCES =
299 nodist_EXTRA_openwriter_la_SOURCES = dummy.cpp
300
301--- a/plugins/sdw/Makefile.in 2010-06-13 23:17:54.000000000 +0200
302+++ b/plugins/sdw/Makefile.in 2014-09-06 11:03:21.723951240 +0200
303@@ -431,7 +431,7 @@
304 $(SDW_LIBS) \
305 -avoid-version \
306 -module \
307- -no-undefined
308+ -Wl,--no-undefined
309
310 sdw_la_SOURCES =
311 nodist_EXTRA_sdw_la_SOURCES = dummy.cpp
312
313--- a/plugins/grammar/Makefile.in 2010-06-13 23:17:47.000000000 +0200
314+++ b/plugins/grammar/Makefile.in 2014-09-06 11:03:21.747951241 +0200
315@@ -430,7 +430,7 @@
316 $(GRAMMAR_LIBS) \
317 -avoid-version \
318 -module \
319- -no-undefined
320+ -Wl,--no-undefined
321
322 nodist_EXTRA_grammar_la_SOURCES = dummy.cpp
323 grammar_la_SOURCES =
324
325--- a/plugins/urldict/Makefile.in 2010-06-13 23:17:54.000000000 +0200
326+++ b/plugins/urldict/Makefile.in 2014-09-06 11:03:21.779951242 +0200
327@@ -431,7 +431,7 @@
328 $(URLDICT_LIBS) \
329 -avoid-version \
330 -module \
331- -no-undefined
332+ -Wl,--no-undefined
333
334 urldict_la_SOURCES =
335 nodist_EXTRA_urldict_la_SOURCES = dummy.cpp
336
337--- a/plugins/wmf/Makefile.in 2010-06-13 23:17:55.000000000 +0200
338+++ b/plugins/wmf/Makefile.in 2014-09-06 11:03:21.799951243 +0200
339@@ -428,7 +428,7 @@
340 $(WMF_LIBS) \
341 -avoid-version \
342 -module \
343- -no-undefined
344+ -Wl,--no-undefined
345
346 wmf_la_SOURCES =
347 nodist_EXTRA_wmf_la_SOURCES = dummy.cpp
348
349--- a/plugins/mif/Makefile.in 2010-06-13 23:17:49.000000000 +0200
350+++ b/plugins/mif/Makefile.in 2014-09-06 11:03:21.819951243 +0200
351@@ -431,7 +431,7 @@
352 $(MIF_LIBS) \
353 -avoid-version \
354 -module \
355- -no-undefined
356+ -Wl,--no-undefined
357
358 mif_la_SOURCES =
359 nodist_EXTRA_mif_la_SOURCES = dummy.cpp
360
361--- a/plugins/eml/Makefile.in 2010-06-13 23:17:45.000000000 +0200
362+++ b/plugins/eml/Makefile.in 2014-09-06 11:03:21.843951244 +0200
363@@ -431,7 +431,7 @@
364 $(EML_LIBS) \
365 -avoid-version \
366 -module \
367- -no-undefined
368+ -Wl,--no-undefined
369
370 eml_la_SOURCES =
371 nodist_EXTRA_eml_la_SOURCES = dummy.cpp
372
373--- a/plugins/openxml/Makefile.in 2010-06-13 23:17:51.000000000 +0200
374+++ b/plugins/openxml/Makefile.in 2014-09-06 11:03:21.863951245 +0200
375@@ -434,7 +434,7 @@
376 $(OPENXML_LIBS) \
377 -avoid-version \
378 -module \
379- -no-undefined
380+ -Wl,--no-undefined
381
382 openxml_la_SOURCES =
383 nodist_EXTRA_openxml_la_SOURCES = dummy.cpp
384
385--- a/plugins/goffice/Makefile.in 2010-06-13 23:17:46.000000000 +0200
386+++ b/plugins/goffice/Makefile.in 2014-09-06 11:03:21.883951245 +0200
387@@ -425,7 +425,7 @@
388 $(GOFFICE_LIBS) \
389 -avoid-version \
390 -module \
391- -no-undefined
392+ -Wl,--no-undefined
393
394 goffice_la_SOURCES =
395 EXTRA_DIST = \
396
397--- a/plugins/passepartout/Makefile.in 2010-06-13 23:17:52.000000000 +0200
398+++ b/plugins/passepartout/Makefile.in 2014-09-06 11:03:21.907951246 +0200
399@@ -433,7 +433,7 @@
400 $(PASSEPARTOUT_LIBS) \
401 -avoid-version \
402 -module \
403- -no-undefined
404+ -Wl,--no-undefined
405
406 passepartout_la_SOURCES =
407 nodist_EXTRA_passepartout_la_SOURCES = dummy.cpp
408
409--- a/plugins/clarisworks/Makefile.in 2010-06-13 23:17:41.000000000 +0200
410+++ b/plugins/clarisworks/Makefile.in 2014-09-06 11:03:21.927951247 +0200
411@@ -433,7 +433,7 @@
412 $(CLARISWORKS_LIBS) \
413 -avoid-version \
414 -module \
415- -no-undefined
416+ -Wl,--no-undefined
417
418 clarisworks_la_SOURCES =
419 nodist_EXTRA_clarisworks_la_SOURCES = dummy.cpp
420
421--- a/plugins/command/Makefile.in 2010-06-13 23:17:44.000000000 +0200
422+++ b/plugins/command/Makefile.in 2014-09-06 11:03:21.947951247 +0200
423@@ -426,7 +426,7 @@
424 @TOOLKIT_COCOA_FALSE@ $(COMMAND_LIBS) \
425 @TOOLKIT_COCOA_FALSE@ -avoid-version \
426 @TOOLKIT_COCOA_FALSE@ -module \
427-@TOOLKIT_COCOA_FALSE@ -no-undefined
428+@TOOLKIT_COCOA_FALSE@ -Wl,--no-undefined
429
430 @TOOLKIT_COCOA_FALSE@command_la_SOURCES =
431 all: all-recursive
432
433--- a/plugins/presentation/Makefile.in 2010-06-13 23:17:53.000000000 +0200
434+++ b/plugins/presentation/Makefile.in 2014-09-06 11:03:21.971951248 +0200
435@@ -433,7 +433,7 @@
436 $(PRESENTATION_LIBS) \
437 -avoid-version \
438 -module \
439- -no-undefined
440+ -Wl,--no-undefined
441
442 presentation_la_SOURCES =
443 nodist_EXTRA_presentation_la_SOURCES = dummy.cpp
444
445--- a/plugins/psion/Makefile.in 2010-06-13 23:17:53.000000000 +0200
446+++ b/plugins/psion/Makefile.in 2014-09-06 11:03:21.991951249 +0200
447@@ -427,7 +427,7 @@
448 $(PSION_LIBS) \
449 -avoid-version \
450 -module \
451- -no-undefined
452+ -Wl,--no-undefined
453
454 psion_la_SOURCES =
455 EXTRA_DIST = \
456
457--- a/plugins/rsvg/Makefile.in 2010-06-13 23:17:53.000000000 +0200
458+++ b/plugins/rsvg/Makefile.in 2014-09-06 11:03:22.011951250 +0200
459@@ -430,7 +430,7 @@
460 rsvg_la_LDFLAGS = \
461 -avoid-version \
462 -module \
463- -no-undefined
464+ -Wl,--no-undefined
465
466 rsvg_la_SOURCES =
467 nodist_EXTRA_rsvg_la_SOURCES = dummy.cpp
468
469--- a/plugins/wpg/Makefile.in 2010-06-13 23:17:55.000000000 +0200
470+++ b/plugins/wpg/Makefile.in 2014-09-06 11:03:22.035951250 +0200
471@@ -428,7 +428,7 @@
472 $(WPG_LIBS) \
473 -avoid-version \
474 -module \
475- -no-undefined
476+ -Wl,--no-undefined
477
478 wpg_la_SOURCES =
479 nodist_EXTRA_wpg_la_SOURCES = dummy.cpp
480
481--- a/plugins/t602/Makefile.in 2010-06-13 23:17:54.000000000 +0200
482+++ b/plugins/t602/Makefile.in 2014-09-06 11:03:22.055951251 +0200
483@@ -431,7 +431,7 @@
484 $(T602_LIBS) \
485 -avoid-version \
486 -module \
487- -no-undefined
488+ -Wl,--no-undefined
489
490 t602_la_SOURCES =
491 nodist_EXTRA_t602_la_SOURCES = dummy.cpp
492
493--- a/plugins/docbook/Makefile.in 2010-06-13 23:17:44.000000000 +0200
494+++ b/plugins/docbook/Makefile.in 2014-09-06 11:03:22.075951252 +0200
495@@ -431,7 +431,7 @@
496 $(DOCBOOK_LIBS) \
497 -avoid-version \
498 -module \
499- -no-undefined
500+ -Wl,--no-undefined
501
502 docbook_la_SOURCES =
503 nodist_EXTRA_docbook_la_SOURCES = dummy.cpp
504
505--- a/plugins/hrtext/Makefile.in 2010-06-13 23:17:47.000000000 +0200
506+++ b/plugins/hrtext/Makefile.in 2014-09-06 11:03:22.099951252 +0200
507@@ -431,7 +431,7 @@
508 $(HRTEXT_LIBS) \
509 -avoid-version \
510 -module \
511- -no-undefined
512+ -Wl,--no-undefined
513
514 hrtext_la_SOURCES =
515 nodist_EXTRA_hrtext_la_SOURCES = dummy.cpp
516
517--- a/plugins/s5/Makefile.in 2010-06-13 23:17:54.000000000 +0200
518+++ b/plugins/s5/Makefile.in 2014-09-06 11:03:22.119951253 +0200
519@@ -431,7 +431,7 @@
520 $(S5_LIBS) \
521 -avoid-version \
522 -module \
523- -no-undefined
524+ -Wl,--no-undefined
525
526 s5_la_SOURCES =
527 nodist_EXTRA_s5_la_SOURCES = dummy.cpp
528
529--- a/plugins/hancom/Makefile.in 2010-06-13 23:17:47.000000000 +0200
530+++ b/plugins/hancom/Makefile.in 2014-09-06 11:03:22.143951254 +0200
531@@ -431,7 +431,7 @@
532 $(HANCOM_LIBS) \
533 -avoid-version \
534 -module \
535- -no-undefined
536+ -Wl,--no-undefined
537
538 hancom_la_SOURCES =
539 nodist_EXTRA_hancom_la_SOURCES = dummy.cpp
540
541--- a/plugins/aiksaurus/Makefile.in 2010-06-13 23:17:40.000000000 +0200
542+++ b/plugins/aiksaurus/Makefile.in 2014-09-06 11:03:22.163951255 +0200
543@@ -428,7 +428,7 @@
544 $(AIKSAURUS_LIBS) \
545 -avoid-version \
546 -module \
547- -no-undefined
548+ -Wl,--no-undefined
549
550 aiksaurus_la_SOURCES =
551 all: all-recursive
552
553--- a/plugins/kword/Makefile.in 2010-06-13 23:17:48.000000000 +0200
554+++ b/plugins/kword/Makefile.in 2014-09-06 11:03:22.183951255 +0200
555@@ -431,7 +431,7 @@
556 $(KWORD_LIBS) \
557 -avoid-version \
558 -module \
559- -no-undefined
560+ -Wl,--no-undefined
561
562 kword_la_SOURCES =
563 nodist_EXTRA_kword_la_SOURCES = dummy.cpp
564
565--- a/plugins/freetranslation/Makefile.in 2010-06-13 23:17:45.000000000 +0200
566+++ b/plugins/freetranslation/Makefile.in 2014-09-06 11:03:22.207951256 +0200
567@@ -433,7 +433,7 @@
568 $(FREETRANSLATION_LIBS) \
569 -avoid-version \
570 -module \
571- -no-undefined
572+ -Wl,--no-undefined
573
574 freetranslation_la_SOURCES =
575 nodist_EXTRA_freetranslation_la_SOURCES = dummy.cpp
576
577--- a/plugins/mathview/Makefile.in 2010-06-13 23:17:48.000000000 +0200
578+++ b/plugins/mathview/Makefile.in 2014-09-06 11:03:22.227951257 +0200
579@@ -429,7 +429,7 @@
580 $(MATHVIEW_LIBS) \
581 -avoid-version \
582 -module \
583- -no-undefined
584+ -Wl,--no-undefined
585
586 nodist_EXTRA_mathview_la_SOURCES = dummy.cpp
587 mathview_la_SOURCES =
588
589--- a/src/Makefile.in 2014-09-06 08:42:45.000000000 +0200
590+++ b/src/Makefile.in 2014-09-06 11:17:48.287979611 +0200
591@@ -538,7 +538,7 @@
592
593 @TOOLKIT_COCOA_TRUE@AbiWord_LDFLAGS = \
594 @TOOLKIT_COCOA_TRUE@ $(DEPS_LIBS) \
595-@TOOLKIT_COCOA_TRUE@ --no-undefined \
596+@TOOLKIT_COCOA_TRUE@ -Wl,--no-undefined \
597 @TOOLKIT_COCOA_TRUE@ -avoid-version \
598 @TOOLKIT_COCOA_TRUE@ -export-dynamic \
599 @TOOLKIT_COCOA_TRUE@ -headerpad_max_install_names
600@@ -554,7 +554,7 @@
601
602 @TOOLKIT_COCOA_FALSE@abiword_LDFLAGS = \
603 @TOOLKIT_COCOA_FALSE@ $(platform_ldflags) \
604-@TOOLKIT_COCOA_FALSE@ --no-undefined \
605+@TOOLKIT_COCOA_FALSE@ -Wl,--no-undefined \
606 @TOOLKIT_COCOA_FALSE@ -avoid-version \
607 @TOOLKIT_COCOA_FALSE@ -export-dynamic
608
diff --git a/gnu/packages/patches/abiword-use-proper-png-api.patch b/gnu/packages/patches/abiword-use-proper-png-api.patch
deleted file mode 100644
index e8ce02899db..00000000000
--- a/gnu/packages/patches/abiword-use-proper-png-api.patch
+++ /dev/null
@@ -1,175 +0,0 @@
1Do not directly access the fields of png_struct and png_info.
2
3--- a/plugins/mswrite/xp/ie_imp_MSWrite.cpp 2010-05-30 21:20:53.000000000 +0200
4+++ b/plugins/mswrite/xp/ie_imp_MSWrite.cpp 2014-09-07 06:58:04.162298089 +0200
5@@ -891,7 +891,7 @@
6 info_ptr = png_create_info_struct (png_ptr);
7 if (!info_ptr) goto err;
8
9- if (setjmp (png_ptr->jmpbuf) ) {
10+ if (setjmp (png_jmpbuf(png_ptr)) ) {
11 png_destroy_write_struct (&png_ptr, &info_ptr);
12 goto err;
13 }
14
15--- a/src/af/gr/win/gr_Win32Image.cpp 2009-07-08 19:33:53.000000000 +0200
16+++ b/src/af/gr/win/gr_Win32Image.cpp 2014-09-07 06:58:04.198298090 +0200
17@@ -148,7 +148,7 @@
18 info_ptr = png_create_info_struct(png_ptr);
19
20 // libpng will longjmp back to here if a fatal error occurs
21- if (setjmp(png_ptr->jmpbuf))
22+ if (setjmp(png_jmpbuf(png_ptr)))
23 {
24 /* If we get here, we had a problem reading the file */
25 png_destroy_write_struct(&png_ptr, (png_infopp)NULL);
26@@ -547,7 +547,7 @@
27 * the normal method of doing things with libpng). REQUIRED unless you
28 * set up your own error handlers in the png_create_read_struct() earlier.
29 */
30- if (setjmp(png_ptr->jmpbuf))
31+ if (setjmp(png_jmpbuf(png_ptr)))
32 {
33 /* Free all of the memory associated with the png_ptr and info_ptr */
34 png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
35
36--- a/src/af/util/xp/ut_png.cpp 2008-02-24 04:33:07.000000000 +0100
37+++ b/src/af/util/xp/ut_png.cpp 2014-09-07 06:58:04.230298091 +0200
38@@ -71,7 +71,7 @@
39 * the normal method of doing things with libpng). REQUIRED unless you
40 * set up your own error handlers in the png_create_read_struct() earlier.
41 */
42- if (setjmp(png_ptr->jmpbuf))
43+ if (setjmp(png_jmpbuf(png_ptr)))
44 {
45 /* Free all of the memory associated with the png_ptr and info_ptr */
46 png_destroy_read_struct(&png_ptr, &info_ptr, static_cast<png_infopp>(NULL));
47
48--- a/plugins/bmp/xp/ie_impGraphic_BMP.cpp 2009-06-25 06:02:06.000000000 +0200
49+++ b/plugins/bmp/xp/ie_impGraphic_BMP.cpp 2014-09-07 06:59:08.814300205 +0200
50@@ -313,7 +313,7 @@
51 * the normal method of doing things with libpng). REQUIRED unless you
52 * set up your own error handlers in the png_create_read_struct() earlier.
53 */
54- if (setjmp(m_pPNG->jmpbuf))
55+ if (setjmp(png_jmpbuf(m_pPNG)))
56 {
57 /* Free all of the memory associated with the png_ptr and info_ptr */
58 png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
59@@ -332,7 +332,7 @@
60 UT_Error IE_ImpGraphic_BMP::Convert_BMP_Pallet(UT_ByteBuf* pBB)
61 {
62 /* Reset error handling for libpng */
63- if (setjmp(m_pPNG->jmpbuf))
64+ if (setjmp(png_jmpbuf(m_pPNG)))
65 {
66 png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
67 return UT_ERROR;
68@@ -372,7 +372,7 @@
69 UT_Error IE_ImpGraphic_BMP::Convert_BMP(UT_ByteBuf* pBB)
70 {
71 /* Reset error handling for libpng */
72- if (setjmp(m_pPNG->jmpbuf))
73+ if (setjmp(png_jmpbuf(m_pPNG)))
74 {
75 png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
76 return UT_ERROR;
77
78--- a/plugins/rsvg/xp/AbiRSVG.cpp 2009-06-25 06:02:06.000000000 +0200
79+++ b/plugins/rsvg/xp/AbiRSVG.cpp 2014-09-07 06:59:08.914300209 +0200
80@@ -145,7 +145,7 @@
81 return error;
82 }
83
84- if (setjmp(m_pPNG->jmpbuf))
85+ if (setjmp(png_jmpbuf(m_pPNG)))
86 {
87 g_object_unref(G_OBJECT(pixbuf));
88 png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
89@@ -234,7 +234,7 @@
90 * the normal method of doing things with libpng). REQUIRED unless you
91 * set up your own error handlers in the png_create_read_struct() earlier.
92 */
93- if (setjmp(m_pPNG->jmpbuf))
94+ if (setjmp(png_jmpbuf(m_pPNG)))
95 {
96 /* Free all of the memory associated with the png_ptr and info_ptr */
97 png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
98
99--- a/src/wp/impexp/win/ie_impGraphic_Win32Native.cpp 2009-07-07 18:50:18.000000000 +0200
100+++ b/src/wp/impexp/win/ie_impGraphic_Win32Native.cpp 2014-09-07 06:59:09.018300212 +0200
101@@ -501,7 +501,7 @@
102 * the normal method of doing things with libpng). REQUIRED unless you
103 * set up your own error handlers in the png_create_read_struct() earlier.
104 */
105- if (setjmp(m_pPNG->jmpbuf))
106+ if (setjmp(png_jmpbuf(m_pPNG)))
107 {
108 /* Free all of the memory associated with the png_ptr and info_ptr */
109 png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
110@@ -520,7 +520,7 @@
111 UT_Error IE_ImpGraphic_Win32Native::Convert_BMP_Palette(UT_ByteBuf* pBB)
112 {
113 /* Reset error handling for libpng */
114- if (setjmp(m_pPNG->jmpbuf))
115+ if (setjmp(png_jmpbuf(m_pPNG)))
116 {
117 png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
118 return UT_ERROR;
119@@ -560,7 +560,7 @@
120 UT_Error IE_ImpGraphic_Win32Native::Convert_BMP(UT_ByteBuf* pBB)
121 {
122 /* Reset error handling for libpng */
123- if (setjmp(m_pPNG->jmpbuf))
124+ if (setjmp(png_jmpbuf(m_pPNG)))
125 {
126 png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
127 return UT_ERROR;
128
129--- a/src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp 2009-07-01 06:02:04.000000000 +0200
130+++ b/src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp 2014-09-07 06:59:09.138300216 +0200
131@@ -185,7 +185,7 @@
132 /** needed for the stejmp context */
133 UT_Error IE_ImpGraphic_GdkPixbuf::_png_write(GdkPixbuf * pixbuf)
134 {
135- if (setjmp(m_pPNG->jmpbuf))
136+ if (setjmp(png_jmpbuf(m_pPNG)))
137 {
138 DELETEP(m_pPngBB);
139 png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
140@@ -446,7 +446,7 @@
141 * the normal method of doing things with libpng). REQUIRED unless you
142 * set up your own error handlers in the png_create_read_struct() earlier.
143 */
144- if (setjmp(m_pPNG->jmpbuf))
145+ if (setjmp(png_jmpbuf(m_pPNG)))
146 {
147 /* Free all of the memory associated with the png_ptr and info_ptr */
148 png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
149
150--- a/plugins/bmp/xp/ie_impGraphic_BMP.cpp 2014-09-07 07:03:02.000000000 +0200
151+++ b/plugins/bmp/xp/ie_impGraphic_BMP.cpp 2014-09-07 12:35:33.306961036 +0200
152@@ -191,7 +191,11 @@
153
154 /* Clean Up Memory Used */
155
156- FREEP(m_pPNGInfo->palette);
157+
158+ png_colorp palette;
159+ int ignored_placeholder;
160+ png_get_PLTE(m_pPNG, m_pPNGInfo, &palette, &ignored_placeholder);
161+ FREEP(palette);
162 DELETEP(pBB);
163 png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
164
165--- a/plugins/garble/xp/abiword-garble-png.cpp 2009-09-05 17:34:44.000000000 +0200
166+++ b/plugins/garble/xp/abiword-garble-png.cpp 2014-09-08 00:15:04.508335153 +0200
167@@ -79,7 +79,7 @@
168 png_set_strip_alpha( png_ptr );
169 png_set_interlace_handling( png_ptr );
170 png_set_bgr( png_ptr );
171- rowbytes = info_ptr->rowbytes;
172+ rowbytes = png_get_rowbytes( png_ptr, info_ptr );
173 png_destroy_read_struct( &png_ptr, &info_ptr, NULL );
174 }
175
generated by cgit v1.2.3 (git 2.25.1) at 2026-09-03 08:29:21 +0000