From bb1f58728aba7f2cdc8d0c1178caf13a7f675b4c Mon Sep 17 00:00:00 2001
From: "Philipp Lohmann [pl]" <Philipp.Lohmann@Oracle.COM>
Date: Tue, 1 Mar 2011 15:04:30 +0100
Subject: [PATCH] rsvglibs: add gdk-pixbuf dependency

---
 gdk-pixbuf/gdk-pixbuf-2.23.0.patch | 24 ++++++++
 gdk-pixbuf/makefile.mk             | 97 ++++++++++++++++++++++++++++++
 gdk-pixbuf/prj/build.lst           |  3 +
 gdk-pixbuf/prj/d.lst               | 18 ++++++
 gettext/makefile.mk                |  1 +
 glib/makefile.mk                   |  1 +
 6 files changed, 144 insertions(+)
 create mode 100644 gdk-pixbuf/gdk-pixbuf-2.23.0.patch
 create mode 100644 gdk-pixbuf/makefile.mk
 create mode 100644 gdk-pixbuf/prj/build.lst
 create mode 100644 gdk-pixbuf/prj/d.lst

diff --git a/gdk-pixbuf/gdk-pixbuf-2.23.0.patch b/gdk-pixbuf/gdk-pixbuf-2.23.0.patch
new file mode 100644
index 000000000000..1bff29333b62
--- /dev/null
+++ b/gdk-pixbuf/gdk-pixbuf-2.23.0.patch
@@ -0,0 +1,24 @@
+--- misc/gdk-pixbuf-2.23.0/configure	2010-12-23 15:18:11.000000000 +0100
++++ misc/build/gdk-pixbuf-2.23.0/configure	2011-02-28 18:49:26.000000000 +0100
+@@ -16839,7 +16839,7 @@
+ 
+ 
+ 
+-
++if 0; then
+ 
+ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+ 	if test -n "$ac_tool_prefix"; then
+@@ -17158,7 +17158,11 @@
+ 
+ 
+   rm -f conf.glibtest
+-
++else
++  GLIB_MKENUMS=glib-mkenums
++  GLIB_GENMARSHAL=glib-genmarshal
++  GOBJECT_QUERY=gobject-query
++fi
+ 
+ # See if it's safe to turn G_DISABLE_DEPRECATED on.
+ GLIB_VERSION_MAJOR_MINOR=`$PKG_CONFIG --modversion glib-2.0 | sed "s/\.[^.]*\$//"`
diff --git a/gdk-pixbuf/makefile.mk b/gdk-pixbuf/makefile.mk
new file mode 100644
index 000000000000..fca747e22c13
--- /dev/null
+++ b/gdk-pixbuf/makefile.mk
@@ -0,0 +1,97 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=.
+
+PRJNAME=gdk-pixbuf
+TARGET=so_gdk-pixbuf
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :	settings.mk
+
+.IF "$(SYSTEM_GDKPIXBUF)" == "YES"
+all:
+    @echo "An already available installation of gdk-pixbuf should exist on your system."
+    @echo "Therefore the version provided here does not need to be built in addition."
+.ENDIF
+
+# --- Files --------------------------------------------------------
+
+GDKPIXBUFVERSION=2.23.0
+
+TARFILE_NAME=$(PRJNAME)-$(GDKPIXBUFVERSION)
+TARFILE_MD5=a7d6c5f2fe2d481149ed3ba807b5c043
+
+PATCH_FILES=gdk-pixbuf-2.23.0.patch
+
+CONFIGURE_DIR=
+CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) \
+                BASE_DEPENDENCIES_CFLAGS="-I$(SOLARINCDIR)$/external -I$(SOLARINCDIR)$/external/glib-2.0" \
+                BASE_DEPENDENCIES_LIBS=" " \
+                 .$/configure \
+                 --prefix=$(SRC_ROOT)$/$(PRJNAME)$/$(MISC) \
+                 CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) -I$(SOLARINCDIR)$/external -I$(SOLARINCDIR)$/external/glib-2.0" \
+                 LDFLAGS="-L$(SOLARLIBDIR) -lgobject-2.0 -lgio-2.0 -lgthread-2.0 -lgmodule-2.0 -lglib-2.0 -lintl" \
+                 --disable-glibtest \
+                 --without-libtiff \
+                 --without-libjpeg \
+                 --without-libpng
+                 
+## FIXME: libtiff, libjpeg, libpng
+                 
+CONFIGURE_FLAGS=$(eq,$(OS),MACOSX CPPFLAGS="$(EXTRA_CDEFS)" $(NULL))
+                
+BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) \
+             $(GNUMAKE)
+BUILD_DIR=$(CONFIGURE_DIR)
+
+.IF "$(OS)"=="MACOSX"
+EXTRPATH=LOADER
+OUT2LIB+=gdk-pixbuf/.libs/libgdk_pixbuf-2.0.0.dylib
+
+OUT2INC+=gdk-pixbuf/gdk-pixbuf-animation.h
+OUT2INC+=gdk-pixbuf/gdk-pixbuf-features.h
+OUT2INC+=gdk-pixbuf/gdk-pixbuf-marshal.h
+OUT2INC+=gdk-pixbuf/gdk-pixbuf.h
+OUT2INC+=gdk-pixbuf/gdk-pixbuf-core.h
+OUT2INC+=gdk-pixbuf/gdk-pixbuf-io.h
+OUT2INC+=gdk-pixbuf/gdk-pixbuf-simple-anim.h
+OUT2INC+=gdk-pixbuf/gdk-pixdata.h
+OUT2INC+=gdk-pixbuf/gdk-pixbuf-enum-types.h
+OUT2INC+=gdk-pixbuf/gdk-pixbuf-loader.h
+OUT2INC+=gdk-pixbuf/gdk-pixbuf-transform.h
+.ELIF "$(OS)"=="WNT"
+.ELSE
+.ENDIF
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE : set_ext.mk
+.INCLUDE : target.mk
+.INCLUDE : tg_ext.mk
+
diff --git a/gdk-pixbuf/prj/build.lst b/gdk-pixbuf/prj/build.lst
new file mode 100644
index 000000000000..fda2c4a0031d
--- /dev/null
+++ b/gdk-pixbuf/prj/build.lst
@@ -0,0 +1,3 @@
+gp	gdk-pixbuf	: soltools NULL
+gp	gdk-pixbuf			    usr1	-	all	gp_mkout NULL
+gp	gdk-pixbuf			    nmake	-	all	gp_gdk-pixbuf NULL
diff --git a/gdk-pixbuf/prj/d.lst b/gdk-pixbuf/prj/d.lst
new file mode 100644
index 000000000000..1248a8beef48
--- /dev/null
+++ b/gdk-pixbuf/prj/d.lst
@@ -0,0 +1,18 @@
+mkdir: %_DEST%\inc%_EXT%\external
+mkdir: %_DEST%\inc%_EXT%\external\gdk-pixbuf-2.0
+mkdir: %_DEST%\inc%_EXT%\external\gdk-pixbuf-2.0\gdk-pixbuf
+
+..\%__SRC%\inc\gdk-pixbuf-animation.h %_DEST%\inc%_EXT%\external\gdk-pixbuf-2.0\gdk-pixbuf\gdk-pixbuf-animation.h
+..\%__SRC%\inc\gdk-pixbuf-features.h %_DEST%\inc%_EXT%\external\gdk-pixbuf-2.0\gdk-pixbuf\gdk-pixbuf-features.h
+..\%__SRC%\inc\gdk-pixbuf-marshal.h %_DEST%\inc%_EXT%\external\gdk-pixbuf-2.0\gdk-pixbuf\gdk-pixbuf-marshal.h
+..\%__SRC%\inc\gdk-pixbuf.h %_DEST%\inc%_EXT%\external\gdk-pixbuf-2.0\gdk-pixbuf\gdk-pixbuf.h
+..\%__SRC%\inc\gdk-pixbuf-core.h %_DEST%\inc%_EXT%\external\gdk-pixbuf-2.0\gdk-pixbuf\gdk-pixbuf-core.h
+..\%__SRC%\inc\gdk-pixbuf-io.h %_DEST%\inc%_EXT%\external\gdk-pixbuf-2.0\gdk-pixbuf\gdk-pixbuf-io.h
+..\%__SRC%\inc\gdk-pixbuf-simple-anim.h %_DEST%\inc%_EXT%\external\gdk-pixbuf-2.0\gdk-pixbuf\gdk-pixbuf-simple-anim.h
+..\%__SRC%\inc\gdk-pixdata.h %_DEST%\inc%_EXT%\external\gdk-pixbuf-2.0\gdk-pixbuf\gdk-pixdata.h
+..\%__SRC%\inc\gdk-pixbuf-enum-types.h %_DEST%\inc%_EXT%\external\gdk-pixbuf-2.0\gdk-pixbuf\gdk-pixbuf-enum-types.h
+..\%__SRC%\inc\gdk-pixbuf-loader.h %_DEST%\inc%_EXT%\external\gdk-pixbuf-2.0\gdk-pixbuf\gdk-pixbuf-loader.h
+..\%__SRC%\inc\gdk-pixbuf-transform.h %_DEST%\inc%_EXT%\external\gdk-pixbuf-2.0\gdk-pixbuf\gdk-pixbuf-transform.h
+
+..\%__SRC%\lib\libgdk_pixbuf-2.0.0.dylib %_DEST%\lib%_EXT%\libgdk_pixbuf-2.0.0.dylib
+
diff --git a/gettext/makefile.mk b/gettext/makefile.mk
index 60d62ab00f75..dee6c82d6295 100644
--- a/gettext/makefile.mk
+++ b/gettext/makefile.mk
@@ -57,6 +57,7 @@ BUILD_ACTION=$(GNUMAKE)
 BUILD_DIR=$(CONFIGURE_DIR)
 
 .IF "$(OS)"=="MACOSX"
+EXTRPATH=LOADER
 OUT2LIB+=gettext-tools$/intl$/.libs$/libintl.*.dylib
 OUT2LIB+=gettext-runtime$/libasprintf$/.libs$/libasprintf.*.dylib
 OUT2LIB+=gettext-tools$/gnulib-lib$/.libs$/libgettextlib-*.dylib
diff --git a/glib/makefile.mk b/glib/makefile.mk
index 99012a7778bd..eefa00315007 100644
--- a/glib/makefile.mk
+++ b/glib/makefile.mk
@@ -65,6 +65,7 @@ BUILD_DIR=$(CONFIGURE_DIR)
 
 
 .IF "$(OS)"=="MACOSX"
+EXTRPATH=LOADER
 OUT2LIB+=gio/.libs/libgio-2.0.0.dylib
 OUT2LIB+=glib/.libs/libglib-2.0.0.dylib
 OUT2LIB+=gmodule/.libs/libgmodule-2.0.0.dylib