summaryrefslogtreecommitdiff
path: root/librsvg
diff options
context:
space:
mode:
authorPhilipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM>2011-03-03 14:42:27 +0100
committerPhilipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM>2011-03-03 14:42:27 +0100
commita9f44c3d4d87e28029e59315edce08e7fe3889b1 (patch)
treed08cff4f69b62e9045f08b426769a93c65a76e83 /librsvg
parent1a37018cfe5ac64071be7de0953fb8b3f3fed17d (diff)
rsvglibs: add libcroco dependency
Diffstat (limited to 'librsvg')
-rw-r--r--librsvg/librsvg-2.32.1.patch13
-rw-r--r--librsvg/makefile.mk15
2 files changed, 22 insertions, 6 deletions
diff --git a/librsvg/librsvg-2.32.1.patch b/librsvg/librsvg-2.32.1.patch
index 7e065a1bc497..8d2368e11e39 100644
--- a/librsvg/librsvg-2.32.1.patch
+++ b/librsvg/librsvg-2.32.1.patch
@@ -1,5 +1,5 @@
--- misc/librsvg-2.32.1/configure 2010-11-13 11:52:19.000000000 +0100
-+++ misc/build/librsvg-2.32.1/configure 2011-03-03 13:50:14.000000000 +0100
++++ misc/build/librsvg-2.32.1/configure 2011-03-03 14:28:12.000000000 +0100
@@ -12288,8 +12288,8 @@
@@ -29,4 +29,15 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_gio_2_24" >&5
$as_echo "$have_gio_2_24" >&6; }
+@@ -12695,8 +12699,8 @@
+
+
+
+-LIBCROCO_CFLAGS=""
+-LIBCROCO_LIBS=""
++#LIBCROCO_CFLAGS=""
++#LIBCROCO_LIBS=""
+ LIBCROCOPKG=""
+
+ test_croco=true
diff --git a/librsvg/makefile.mk b/librsvg/makefile.mk
index 084d9e2569e4..ef458745b95a 100644
--- a/librsvg/makefile.mk
+++ b/librsvg/makefile.mk
@@ -58,14 +58,19 @@ CONFIGURE_DIR=
CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) .$/configure \
--prefix=$(SRC_ROOT)$/$(PRJNAME)$/$(MISC)
CONFIGURE_FLAGS=--disable-gtk-theme --disable-tools --with-croco --with-svgz \
- LIBRSVG_CFLAGS=-I$(SOLARINCDIR)$/external/glib-2.0 \
- LIBRSVG_LIBS="-lgdk_pixbuf-2.0 -lpango-1.0 -lpangocairo-1.0 -lgthread-2.0 -lgio-2.0 -lgmodule-2.0 -lgobject-2.0 -lglib-2.0 $(LIBXML_LIBS) -lcairo -lintl" \
- GDK_PIXBUF_CFLAGS=-I$(SOLARINCDIR)$/external/gdk-pixbuf-2.0 \
+ LIBRSVG_CFLAGS="-I$(SOLARINCDIR)$/external$/glib-2.0 -I$(SOLARINCDIR)$/external$/gdk-pixbuf-2.0 -I$(SOLARINCDIR)$/external$/pango-1.0 -I$(SOLARINCDIR)$/cairo $(LIBXML_CFLAGS)" \
+ LIBRSVG_LIBS="-L$(SOLARLIBDIR) -lgdk_pixbuf-2.0 -lpango-1.0 -lpangocairo-1.0 -lgthread-2.0 -lgio-2.0 -lgmodule-2.0 -lgobject-2.0 -lglib-2.0 $(LIBXML_LIBS) -lcairo -lintl" \
+ GDK_PIXBUF_CFLAGS="-I$(SOLARINCDIR)$/external$/gdk-pixbuf-2.0" \
GDK_PIXBUF_LIBS=-lgdkpixbuf-2.0 \
- GTHREAD_CFLAGS=-I$(SOLARINCDIR)$/external/glib-2.0 \
+ GTHREAD_CFLAGS=-I$(SOLARINCDIR)$/external/$glib-2.0 \
GTHREAD_LIBS=-lgthread-2.0 \
- CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) -I$(SOLARINCDIR)$/external -I$(SOLARINCDIR)$/external$/glib-2.0 -I$(SOLARINCDIR)$/external/gdk-pixbuf-2.0 -I$(SOLARINCDIR)$/external/pango-1.0 -I$(SOLARINCDIR)$/cairo" \
+ LIBCROCO_CFLAGS="-I$(SOLARINCDIR)$/external$/libcroco-0.6" \
+ LIBCROCO_LIBS=-lcroco-0.6
+ CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) -I$(SOLARINCDIR)$/external -I$(SOLARINCDIR)$/external$/glib-2.0 -I$(SOLARINCDIR)$/external$/gdk-pixbuf-2.0 -I$(SOLARINCDIR)$/external$/pango-1.0 -I$(SOLARINCDIR)$/cairo" \
LDFLAGS="$(CONFIGURE_LDFLAGS)"
+.IF "$(OS)" == "MACOSX"
+CONFIGURE_FLAGS+= CPPFLAGS="$(ARCH_FLAGS) $(EXTRA_CDEFS)"
+.ENDIF
BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) \
$(GNUMAKE)