/[packages]/cauldron/abiword/current/SOURCES/abiword-2.9.2-linkage.patch
ViewVC logotype

Contents of /cauldron/abiword/current/SOURCES/abiword-2.9.2-linkage.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 203407 - (show annotations) (download)
Mon Jan 30 18:12:05 2012 UTC (12 years, 1 month ago) by fwang
File size: 2293 byte(s)
cairo-fc acturally
1 --- src/Makefile.am.link 2011-11-25 16:36:23.336062335 +0800
2 +++ src/Makefile.am 2011-11-25 16:38:03.226062266 +0800
3 @@ -47,7 +47,6 @@
4 -DABIWORD_DATADIR="\"$(ABIWORD_DATADIR)\""
5
6 libabiword_@ABIWORD_SERIES@_la_LDFLAGS = \
7 - $(DEPS_LIBS) \
8 -no-undefined \
9 -avoid-version \
10 -export-dynamic
11 @@ -58,7 +57,6 @@
12 endif
13
14 libabiword_@ABIWORD_SERIES@_la_LIBADD = \
15 - $(opt_libs) \
16 plugins/libplugins.la \
17 text/fmt/xp/libxp.la \
18 text/ptbl/xp/libxp.la \
19 @@ -72,7 +70,8 @@
20 af/util/$(PLATFORM)/lib$(PLATFORM).la \
21 af/util/xp/libxp.la \
22 af/ev/$(TOOLKIT)/lib$(TOOLKIT).la \
23 - af/ev/xp/libxp.la
24 + af/ev/xp/libxp.la \
25 + $(opt_libs) $(DEPS_LIBS) -lpng -lX11
26
27 if TOOLKIT_GTK_ALL
28 libabiword_@ABIWORD_SERIES@_la_LIBADD += \
29 --- src/Makefile.in.link 2011-11-15 05:40:52.000000000 +0800
30 +++ src/Makefile.in 2011-11-25 16:58:09.534653987 +0800
31 @@ -547,7 +547,7 @@
32
33 libabiword_@ABIWORD_SERIES@_la_LDFLAGS = $(DEPS_LIBS) -no-undefined \
34 -avoid-version -export-dynamic $(am__append_6)
35 -libabiword_@ABIWORD_SERIES@_la_LIBADD = $(opt_libs) \
36 +libabiword_@ABIWORD_SERIES@_la_LIBADD = \
37 plugins/libplugins.la text/fmt/xp/libxp.la \
38 text/ptbl/xp/libxp.la wp/ap/$(TOOLKIT)/lib$(TOOLKIT).la \
39 wp/ap/xp/libxp.la wp/impexp/xp/libxp.la \
40 @@ -555,7 +555,7 @@
41 af/gr/$(TOOLKIT)/lib$(TOOLKIT).la af/gr/xp/libxp.la \
42 af/util/$(PLATFORM)/lib$(PLATFORM).la af/util/xp/libxp.la \
43 af/ev/$(TOOLKIT)/lib$(TOOLKIT).la af/ev/xp/libxp.la \
44 - $(am__append_7) $(am__append_8)
45 + $(am__append_7) $(am__append_8) $(opt_libs) -lpng -lX11
46
47 # headers are GTK only.
48 @TOOLKIT_GTK_ALL_TRUE@libabiword_@ABIWORD_SERIES@_includedir = @ABIWORD_HEADERSDIR@
49 --- configure.in.link 2011-11-12 22:48:23.000000000 +0800
50 +++ configure.in 2012-01-31 02:09:10.718299112 +0800
51 @@ -103,7 +103,7 @@
52 opt_pkgs=''
53
54 # gtk deps
55 -cairo_req='cairo-pdf cairo-ps pangocairo'
56 +cairo_req='cairo-pdf cairo-ps pangocairo cairo-fc'
57 if test "x$abi_cv_gtk2" = "xyes"; then
58 gtk_req="gtk+-2.0 >= $GTK2_VERSION_REQ gtk+-unix-print-2.0 librsvg-2.0 >= 2.16.0"
59 else
60 @@ -612,6 +612,7 @@
61 fi
62
63 PKG_CHECK_MODULES(DEPS,[$deps_pkgs])
64 +DEPS_LIBS=`$PKG_CONFIG --libs-only-L --libs-only-l $deps_pkgs`
65 dnl specific gtk214 test.
66 if test "$TOOLKIT" = "gtk2"; then
67 PKG_CHECK_MODULES(GTK214, gtk+-2.0 > 2.14, [abi_cv_gtk214=yes],

  ViewVC Help
Powered by ViewVC 1.1.30