summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArwed von Merkatz2009-03-05 19:18:45 +0100
committerArwed von Merkatz2009-03-07 18:32:01 +0100
commit74be8d1bd3989bd992cc1e9c1f4d8c7b617b6642 (patch)
treeb4ac842a3fb8ce27ad2a527633f26ef97582a0b2
parent39c963486278b7c0bb9f168aefb57a42f1f2f17c (diff)
cairo: freetype2 is hard depends, not optional
(cherry picked from commit 75d99bbf47cfc12b9da8433bcd7152cb64bf830f)
-rwxr-xr-xx11-libs/cairo/DEPENDS6
-rw-r--r--x11-libs/cairo/HISTORY3
2 files changed, 4 insertions, 5 deletions
diff --git a/x11-libs/cairo/DEPENDS b/x11-libs/cairo/DEPENDS
index f6d31955f8..47516ea430 100755
--- a/x11-libs/cairo/DEPENDS
+++ b/x11-libs/cairo/DEPENDS
@@ -1,3 +1,4 @@
+depends freetype2 '--enable-ft' &&
depends fontconfig &&
depends pixman &&
@@ -42,11 +43,6 @@ optional_depends directfb \
"--disable-directfb" \
"for directfb surface backend feature" &&
-optional_depends freetype2 \
- "--enable-ft" \
- "--disable-ft" \
- "for FreeType font backend feature" &&
-
optional_depends poppler \
"--enable-pdf" \
"--disable-pdf" \
diff --git a/x11-libs/cairo/HISTORY b/x11-libs/cairo/HISTORY
index 02aa29e19f..93a9af6e72 100644
--- a/x11-libs/cairo/HISTORY
+++ b/x11-libs/cairo/HISTORY
@@ -1,3 +1,6 @@
+2009-03-05 Arwed v. Merkatz <v.merkatz@gmx.net>
+ * DEPENDS: requires freetype2, not optional
+
2009-02-22 Remko van der Vossen <wich@sourcemage.org>
* DEPENDS: Removed depends libpng, is already optional_depends