/[pkgs]/devel/ImageMagick/ImageMagick-6.4.0-multilib.patch
ViewVC logotype

Contents of /devel/ImageMagick/ImageMagick-6.4.0-multilib.patch

Parent Directory Parent Directory | Revision Log Revision Log

Revision 1.3 - (show annotations) (download) (as text)
Mon Mar 9 11:06:50 2009 UTC (8 months, 2 weeks ago) by jwrdegoede
Branch: MAIN
CVS Tags: F-12-split, ImageMagick-6_5_3_7-2_fc12, ImageMagick-6_4_9_6-1_fc11, ImageMagick-6_4_9_6-2_fc11, ImageMagick-6_5_3_7-1_fc12, F-11-split, ImageMagick-6_5_4_7-3_fc12, ImageMagick-6_5_1_2-1_fc11, HEAD
Changes since 1.2: +20 -20 lines
File MIME type: text/x-patch 
* Mon Mar  9 2009 Hans de Goede <hdegoede@redhat.com> 6.4.9.6-1
- New upstream release 6.4.9-6
1 diff -up ImageMagick-6.4.9-6/Magick++/bin/Magick++-config.in.multilib ImageMagick-6.4.9-6/Magick++/bin/Magick++-config.in
2 --- ImageMagick-6.4.9-6/Magick++/bin/Magick++-config.in.multilib 2008-12-08 20:00:35.000000000 +0100
3 +++ ImageMagick-6.4.9-6/Magick++/bin/Magick++-config.in 2009-02-24 10:55:05.000000000 +0100
4 @@ -7,8 +7,6 @@
5
6 prefix=@prefix@
7 exec_prefix=@exec_prefix@
8 -libdir=@libdir@
9 -includedir=@includedir@
10
11 usage='Usage: Magick++-config [--cppflags] [--cxxflags] [--exec-prefix] [--ldflags] [--libs] [--prefix] [--version]
12
13 @@ -43,19 +41,19 @@ while test $# -gt 0; do
14 echo '@PACKAGE_VERSION@ Q@QUANTUM_DEPTH@ @MAGICK_HDRI@'
15 ;;
16 --cflags)
17 - echo "-I${includedir} @MAGICK_PCFLAGS@"
18 + pkg-config --cflags Magick++
19 ;;
20 --cxxflags)
21 - echo '@MAGICK_CXXFLAGS@'
22 + pkg-config --cflags Magick++
23 ;;
24 --cppflags)
25 - echo '@MAGICK_CPPFLAGS@'
26 + pkg-config --cflags Magick++
27 ;;
28 --ldflags)
29 - echo '@MAGICK_LDFLAGS@'
30 + pkg-config --libs Magick++
31 ;;
32 --libs)
33 - echo "-L${libdir} -lMagick++ -lMagickWand @MAGICK_LIBS@"
34 + pkg-config --libs Magick++
35 ;;
36 *)
37 echo "${usage}" 1>&2
38 diff -up ImageMagick-6.4.9-6/magick/Magick-config.in.multilib ImageMagick-6.4.9-6/magick/Magick-config.in
39 --- ImageMagick-6.4.9-6/magick/Magick-config.in.multilib 2008-12-08 20:00:35.000000000 +0100
40 +++ ImageMagick-6.4.9-6/magick/Magick-config.in 2009-02-24 10:57:33.000000000 +0100
41 @@ -6,8 +6,6 @@
42
43 prefix=@prefix@
44 exec_prefix=@exec_prefix@
45 -libdir=@libdir@
46 -includedir=@includedir@/ImageMagick
47
48 usage="\
49 Usage: Magick-config [--cflags] [--cppflags] [--exec-prefix] [--ldflags] [--libs] [--prefix] [--version]"
50 @@ -40,19 +38,19 @@ while test $# -gt 0; do
51 echo '@PACKAGE_VERSION@ Q@QUANTUM_DEPTH@ @MAGICK_HDRI@'
52 ;;
53 --cflags)
54 - echo "-I${includedir} @MAGICK_PCFLAGS@"
55 + pkg-config --cflags MagickCore
56 ;;
57 --cxxflags)
58 - echo '@MAGICK_CXXFLAGS@'
59 + pkg-config --cflags MagickCore
60 ;;
61 --cppflags)
62 - echo '@MAGICK_CPPFLAGS@'
63 + pkg-config --cflags MagickCore
64 ;;
65 --ldflags)
66 - echo '@MAGICK_LDFLAGS@'
67 + pkg-config --libs MagickCore
68 ;;
69 --libs)
70 - echo "-L${libdir} @MAGICK_LIBS@"
71 + pkg-config --libs MagickCore
72 ;;
73 *)
74 echo "${usage}" 1>&2
75 diff -up ImageMagick-6.4.9-6/magick/MagickCore-config.in.multilib ImageMagick-6.4.9-6/magick/MagickCore-config.in
76 --- ImageMagick-6.4.9-6/magick/MagickCore-config.in.multilib 2008-12-08 20:00:35.000000000 +0100
77 +++ ImageMagick-6.4.9-6/magick/MagickCore-config.in 2009-02-24 11:02:23.000000000 +0100
78 @@ -6,8 +6,6 @@
79
80 prefix=@prefix@
81 exec_prefix=@exec_prefix@
82 -libdir=@libdir@
83 -includedir=@includedir@/ImageMagick
84
85 usage="\
86 Usage: MagickCore-config [--cflags] [--cppflags] [--exec-prefix] [--ldflags] [--libs] [--prefix] [--version]"
87 @@ -40,25 +38,19 @@ while test $# -gt 0; do
88 echo '@PACKAGE_VERSION@ Q@QUANTUM_DEPTH@ @MAGICK_HDRI@'
89 ;;
90 --cflags)
91 - echo "-I${includedir} @MAGICK_PCFLAGS@"
92 + pkg-config --cflags MagickCore
93 ;;
94 --cxxflags)
95 - echo '@MAGICK_CXXFLAGS@'
96 + pkg-config --cflags MagickCore
97 ;;
98 --cppflags)
99 - echo '@MAGICK_CPPFLAGS@'
100 + pkg-config --cflags MagickCore
101 ;;
102 --ldflags)
103 - echo '@MAGICK_LDFLAGS@'
104 + pkg-config --libs MagickCore
105 ;;
106 --libs)
107 - echo "-L${libdir} @MAGICK_LIBS@"
108 - ;;
109 - --coder-path)
110 - echo "@CODER_PATH@"
111 - ;;
112 - --filter-path)
113 - echo "@FILTER_PATH@"
114 + pkg-config --libs MagickCore
115 ;;
116 *)
117 echo "${usage}" 1>&2
118 diff -up ImageMagick-6.4.9-6/wand/MagickWand-config.in.multilib ImageMagick-6.4.9-6/wand/MagickWand-config.in
119 --- ImageMagick-6.4.9-6/wand/MagickWand-config.in.multilib 2008-12-08 20:00:35.000000000 +0100
120 +++ ImageMagick-6.4.9-6/wand/MagickWand-config.in 2009-02-24 11:01:09.000000000 +0100
121 @@ -6,8 +6,6 @@
122
123 prefix=@prefix@
124 exec_prefix=@exec_prefix@
125 -libdir=@libdir@
126 -includedir=@includedir@/ImageMagick
127
128 usage="\
129 Usage: MagickWand-config [--cflags] [--cppflags] [--exec-prefix] [--ldflags] [--libs] [--prefix] [--version]"
130 @@ -40,19 +38,19 @@ while test $# -gt 0; do
131 echo '@PACKAGE_VERSION@ Q@QUANTUM_DEPTH@ @MAGICK_HDRI@'
132 ;;
133 --cflags)
134 - echo "-I${includedir} @MAGICK_PCFLAGS@"
135 + pkg-config --cflags MagickWand
136 ;;
137 --cxxflags)
138 - echo '@MAGICK_CXXFLAGS@'
139 + pkg-config --cflags MagickWand
140 ;;
141 --cppflags)
142 - echo '@MAGICK_CPPFLAGS@'
143 + pkg-config --cflags MagickWand
144 ;;
145 --ldflags)
146 - echo '@MAGICK_LDFLAGS@'
147 + pkg-config --libs MagickWand
148 ;;
149 --libs)
150 - echo "-L${libdir} -lMagickWand @MAGICK_LIBS@"
151 + pkg-config --libs MagickWand
152 ;;
153 *)
154 echo "${usage}" 1>&2
155 diff -up ImageMagick-6.4.9-6/wand/Wand-config.in.multilib ImageMagick-6.4.9-6/wand/Wand-config.in
156 --- ImageMagick-6.4.9-6/wand/Wand-config.in.multilib 2008-12-08 20:00:35.000000000 +0100
157 +++ ImageMagick-6.4.9-6/wand/Wand-config.in 2009-02-24 10:54:27.000000000 +0100
158 @@ -6,8 +6,6 @@
159
160 prefix=@prefix@
161 exec_prefix=@exec_prefix@
162 -libdir=@libdir@
163 -includedir=@includedir@/ImageMagick
164
165 usage="\
166 Usage: Wand-config [--cflags] [--cppflags] [--exec-prefix] [--ldflags] [--libs] [--prefix] [--version]"
167 @@ -40,19 +38,19 @@ while test $# -gt 0; do
168 echo '@PACKAGE_VERSION@ Q@QUANTUM_DEPTH@ @MAGICK_HDRI@'
169 ;;
170 --cflags)
171 - echo "-I${includedir} @MAGICK_PCFLAGS@"
172 + pkg-config --cflags MagickWand
173 ;;
174 --cxxflags)
175 - echo '@MAGICK_CXXFLAGS@'
176 + pkg-config --cflags MagickWand
177 ;;
178 --cppflags)
179 - echo '@MAGICK_CPPFLAGS@'
180 + pkg-config --cflags MagickWand
181 ;;
182 --ldflags)
183 - echo '@MAGICK_LDFLAGS@'
184 + pkg-config --libs MagickWand
185 ;;
186 --libs)
187 - echo "-L${libdir} -lMagickWand @MAGICK_LIBS@"
188 + pkg-config --libs MagickWand
189 ;;
190 *)
191 echo "${usage}" 1>&2
admin@fedoraproject.org
 ViewVC Help
Powered by ViewVC 1.1.2