summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2013-04-22 10:55:06 +0200
committerRemi Collet <fedora@famillecollet.com>2013-04-22 10:55:06 +0200
commit36f3ab697972c8f539060744744745d1b1680282 (patch)
tree47982839dd79637aa64439269657d9314f777d59
parent64eeb5f34d30b45455fcc3b6c0314a45783b6784 (diff)
gd: fix default font search path
-rw-r--r--gd-2.0.34-fonts.patch11
-rw-r--r--gd.spec19
2 files changed, 8 insertions, 22 deletions
diff --git a/gd-2.0.34-fonts.patch b/gd-2.0.34-fonts.patch
deleted file mode 100644
index acb119b..0000000
--- a/gd-2.0.34-fonts.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gd-2.0.34/Makefile.in.pom 2007-09-04 15:08:18.000000000 +0200
-+++ gd-2.0.34/Makefile.in 2007-09-04 15:58:05.000000000 +0200
-@@ -227,7 +227,7 @@ AUTOMAKE = @AUTOMAKE@
- AWK = @AWK@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -D_DEFAULT_FONTPATH="/usr/share/X11/fonts/TTF/:/usr/share/fonts/bitstream-vera/:/usr/share/fonts/dejavu-lgc/:/usr/share/fonts/default/Type1/:/usr/share/X11/fonts/Type1:/usr/share/fonts/liberation/"
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CXX = @CXX@
diff --git a/gd.spec b/gd.spec
index bf4ee29..5c36a56 100644
--- a/gd.spec
+++ b/gd.spec
@@ -14,7 +14,6 @@ Patch5: gd-2.0.34-sparc64.patch
Patch6: gd-2.0.35-overflow.patch
Patch7: gd-2.0.35-AALineThick.patch
Patch8: gd-2.0.33-BoxBound.patch
-Patch9: gd-2.0.34-fonts.patch
Patch10: gd-2.0.35-time.patch
Patch11: gd-2.0.35-security3.patch
Patch12: gd-2.0.35-runtests.patch
@@ -84,7 +83,6 @@ files for gd, a graphics library for creating PNG and JPEG graphics.
#patch5 -p1 -b .sparc64
#patch7 -p1 -b .AALineThick
#patch8 -p1 -b .bb
-#patch9 -p1 -b .fonts
#patch10 -p1 -b .time
#patch11 -p1 -b .sec3
#patch12 -p1 -b .runtests
@@ -98,15 +96,14 @@ files for gd, a graphics library for creating PNG and JPEG graphics.
[ -f configure ] || ./bootstrap.sh
%build
-#cmake -DENABLE_PNG=1 \
-# -DENABLE_LIQ=0 \
-# -DENABLE_JPEG=1 \
-# -DENABLE_TIFF=1 \
-# -DENABLE_XPM=1 \
-# -DENABLE_FREETYPE=1 \
-# -DENABLE_FONTCONFIG=1 \
-# -DENABLE_WEBP=1 \
-# .
+# Provide a correct default font search path
+CFLAGS="$RPM_OPT_FLAGS -DDEFAULT_FONTPATH='\"\
+/usr/share/fonts/bitstream-vera:\
+/usr/share/fonts/dejavu:\
+/usr/share/fonts/default/Type1:\
+/usr/share/X11/fonts/Type1:\
+/usr/share/fonts/liberation\"'"
+
%configure --disable-rpath
make %{?_smp_mflags}