diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-29 11:40:49 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-29 21:56:31 +0200 |
commit | f14c1fc5515445840d2fbe3350cff0c03eae0b55 (patch) | |
tree | 7617315e619f969c13e79c1f44c2428871719357 /package/cairo | |
parent | 365261c9db442081290b7d21aba6201244af294d (diff) |
resolve merge conflict
Diffstat (limited to 'package/cairo')
-rw-r--r-- | package/cairo/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package/cairo/Makefile b/package/cairo/Makefile index 35fcf82cc..177a4a4ad 100644 --- a/package/cairo/Makefile +++ b/package/cairo/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 1.12.16 PKG_RELEASE:= 4 PKG_MD5SUM:= a1304edcdc99282f478b995ee5f8f854 PKG_DESCR:= cairo graphics library -PKG_SECTION:= libs +PKG_SECTION:= libs/image PKG_DEPENDS:= fontconfig libfreetype libpng libx11 pixman PKG_DEPENDS+= libxrender PKG_BUILDDEP:= libpng pixman freetype fontconfig libX11 libXrender glib |