summaryrefslogtreecommitdiff
path: root/gdk-pixbuf
diff options
context:
space:
mode:
authorPhilipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM>2011-04-06 14:24:05 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-06-17 13:40:24 +0200
commit62bb785b6664e4e77d4b8a01ca87ba1c4812ad0c (patch)
treea1a677ab4743faed17e244263ffbd063f67759e4 /gdk-pixbuf
parent6e5685efb15b893d1e2dfb941f1baf80085a6e78 (diff)
ooo34gsl01: #i117732# patch to make configure work with homebrew (thanks hbrinkm !) [hg:1780f020f3f4]
Diffstat (limited to 'gdk-pixbuf')
-rw-r--r--gdk-pixbuf/gdk-pixbuf-2.23.0.patch2
-rw-r--r--gdk-pixbuf/makefile.mk2
2 files changed, 3 insertions, 1 deletions
diff --git a/gdk-pixbuf/gdk-pixbuf-2.23.0.patch b/gdk-pixbuf/gdk-pixbuf-2.23.0.patch
index 1bff29333b62..7e6db673e158 100644
--- a/gdk-pixbuf/gdk-pixbuf-2.23.0.patch
+++ b/gdk-pixbuf/gdk-pixbuf-2.23.0.patch
@@ -5,7 +5,7 @@
-
-+if 0; then
++if false; then
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
if test -n "$ac_tool_prefix"; then
diff --git a/gdk-pixbuf/makefile.mk b/gdk-pixbuf/makefile.mk
index 663f0f252a47..d44f1a01b42c 100644
--- a/gdk-pixbuf/makefile.mk
+++ b/gdk-pixbuf/makefile.mk
@@ -54,6 +54,8 @@ CONFIGURE_DIR=
CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) \
BASE_DEPENDENCIES_CFLAGS="-I$(SOLARINCDIR)$/external -I$(SOLARINCDIR)$/external/glib-2.0" \
BASE_DEPENDENCIES_LIBS=" " \
+ GDK_PIXBUF_XLIB_DEP_CFLAGS="-I$(SOLARINCDIR)$/external -I$(SOLARINCDIR)$/external/glib-2.0" \
+ GDK_PIXBUF_XLIB_DEP_LIBS=" " \
.$/configure \
--prefix=$(SRC_ROOT)$/$(PRJNAME)$/$(MISC) \
CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) -I$(SOLARINCDIR)$/external -I$(SOLARINCDIR)$/external$/glib-2.0 -I$(SOLARINCDIR)$/external$/libpng -I$(SOLARINCDIR)$/external$/libjpeg" \