[Libreoffice-commits] .: 8 commits - cairo/cairo-1.8.0.patch cairo/prj expat/expat-2.0.1.patch gdk-pixbuf/makefile.mk .gitattributes libcroco/makefile.mk
Bjoern Michaelsen
bmichaelsen at kemper.freedesktop.org
Sun Jul 24 11:49:37 PDT 2011
.gitattributes | 1 +
cairo/cairo-1.8.0.patch | 4 ++--
cairo/prj/build.lst | 2 +-
expat/expat-2.0.1.patch | 3 ++-
gdk-pixbuf/makefile.mk | 2 ++
libcroco/makefile.mk | 3 ++-
6 files changed, 10 insertions(+), 5 deletions(-)
New commits:
commit 208b6819ed4f243c85c8748ea613d85d43f1d329
Merge: ffb3d67... 48568db...
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Thu Jul 21 18:51:33 2011 +0200
Merge branch 'master' into feature/gnumake4
commit ffb3d670f43ae49b956a7bfc406d40bb0a117b28
Merge: 2d511b9... a97482c...
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Sun Jun 19 12:03:35 2011 +0200
Merge branch 'master' into feature/gnumake4
Conflicts:
cairo/cairo-1.8.0.patch
cairo/prj/build.lst
gdk-pixbuf/makefile.mk
libcroco/makefile.mk
diff --cc cairo/prj/build.lst
index c59a5c4,5827e76..a4d0da4
--- a/cairo/prj/build.lst
+++ b/cairo/prj/build.lst
@@@ -1,4 -1,4 +1,4 @@@
- lcairo cairo : ZLIB:zlib soltools stlport NULL
-lcairo cairo : ZLIB:zlib libpng soltools NULL
++lcairo cairo : ZLIB:zlib libpng soltools stlport NULL
lcairo cairo usr1 - all lcairo_mkout NULL
lcairo cairo\pixman nmake - all lcairo_pixman NULL
lcairo cairo\cairo nmake - all lcairo_cairo lcairo_pixman NULL
diff --cc expat/expat-2.0.1.patch
index 3ff1e2d,6c09d34..f168297
--- a/expat/expat-2.0.1.patch
+++ b/expat/expat-2.0.1.patch
@@@ -1,6 -1,17 +1,17 @@@
+ --- misc/expat-2.0.1/conftools/config.sub
+ +++ misc/build/expat-2.0.1/conftools/config.sub
+ @@ -1272,7 +1272,7 @@
+ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+ + | -udi* | -androideabi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+ | -chorusos* | -chorusrdb* \
+ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
--- misc/expat-2.0.1/lib/makefile.mk Wed Aug 20 14:33:55 2008
+++ misc/build/expat-2.0.1/lib/makefile.mk Wed Aug 20 14:26:42 2008
-@@ -1 +1,89 @@
+@@ -1 +1,90 @@
-dummy
+#*************************************************************************
+#
diff --cc gdk-pixbuf/makefile.mk
index d44f1a0,aa58133..74f3201
--- a/gdk-pixbuf/makefile.mk
+++ b/gdk-pixbuf/makefile.mk
@@@ -52,15 -52,21 +52,23 @@@ TARFILE_MD5=a7d6c5f2fe2d481149ed3ba807b
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_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" \
- 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
+ ./configure --disable-dependency-tracking $(eq,$(VERBOSE),$(NULL) --enable-silent-rules --disable-silent-rules) \
+ CPPFLAGS="$(EXTRA_CDEFS) -I$(SOLARINCDIR)/external -I$(SOLARINCDIR)/external/glib-2.0 -I$(SOLARINCDIR)/external/libpng -I$(SOLARINCDIR)/external/jpeg" \
+ CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)" \
+ LDFLAGS="$(EXTRA_LINKFLAGS) -L$(SOLARLIBDIR) -lgobject-2.0 -lgio-2.0 -lgthread-2.0 -lgmodule-2.0 -lglib-2.0" \
+ --prefix=$(SRC_ROOT)/$(PRJNAME)/$(MISC) \
+ --disable-nls \
+ --disable-modules \
+ --with-included-loaders=ani,icns,pcx,ras,tga,png,pnm,wbmp,xbm,xpm,qtif,bmp,gif,ico,jpeg \
+ --disable-glibtest --without-libtiff --without-libjasper
+
+ .IF "$(CROSS_COMPILING)"=="YES"
+ CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) gio_can_sniff=no
+ .ENDIF
BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE)
BUILD_DIR=$(CONFIGURE_DIR)
diff --cc libcroco/makefile.mk
index 8f80daf,4789c07..d405f95
--- a/libcroco/makefile.mk
+++ b/libcroco/makefile.mk
@@@ -51,18 -51,18 +51,19 @@@ PATCH_FILES
CONFIGURE_DIR=
.IF "$(OS)"=="MACOSX"
- CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) \
- .$/configure \
- --prefix=$(SRC_ROOT)$/$(PRJNAME)$/$(MISC) \
- CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) -I$(SOLARINCDIR)$/external -I$(SOLARINCDIR)$/external$/glib-2.0" \
- LDFLAGS="-L$(SOLARLIBDIR)" \
- GLIB2_CFLAGS="-I$(SOLARINCDIR)$/external$/glib-2.0" \
+ CONFIGURE_ACTION=./configure --prefix=$(SRC_ROOT)/$(PRJNAME)/$(MISC) \
+ CPPFLAGS="$(EXTRA_CDEFS)" \
+ CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) -I$(SOLARINCDIR)/external -I$(SOLARINCDIR)/external/glib-2.0" \
+ LDFLAGS="-L$(SOLARLIBDIR) $(EXTRA_LINKFLAGS) -Wl,-dylib_file, at loader_path/libgmodule-2.0.0.dylib:$(SOLARLIBDIR)/libgmodule-2.0.0.dylib" \
+ GLIB2_CFLAGS="-I$(SOLARINCDIR)/external/glib-2.0" \
GLIB2_LIBS="-lgio-2.0 -lgobject-2.0 -lgthread-2.0 -lglib-2.0 -lintl" \
- LIBXML2_CFLAGS="$(LIBXML_CFLAGS)" LIBXML2_LIBS="$(LIBXML_LIBS)"
+ LIBXML2_CFLAGS="$(LIBXML_CFLAGS)" \
+ LIBXML2_LIBS="$(LIBXML_LIBS)"
- CONFIGURE_FLAGS=$(eq,$(OS),MACOSX CPPFLAGS="$(EXTRA_CDEFS)" $(NULL))
-
+ .IF "$(CROSS_COMPILING)"=="YES"
+ CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
+ .ENDIF
+
BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) \
$(GNUMAKE)
BUILD_DIR=$(CONFIGURE_DIR)
commit 2d511b9ebe590adbc4d3fd09078340968a7ea7d7
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Sat Jun 18 14:12:17 2011 +0200
fixing rebase errors
diff --git a/.gitattributes b/.gitattributes
new file mode 120000
index 0000000..f18402b
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+/striped/bjoern/.jenkins/jobs/gnumake4/workspace/.gitattributes
\ No newline at end of file
commit ccd0ec7be0ce4d6b251642bbb0659aa0269f7f87
Author: Michael Stahl <mst at openoffice.org>
Date: Thu Apr 28 10:12:42 2011 +0000
gnumake4: libcroco: use LIBXML_CFLAGS [hg:506ddad86d06]
diff --git a/libcroco/makefile.mk b/libcroco/makefile.mk
index d5c84d5..8f80daf 100644
--- a/libcroco/makefile.mk
+++ b/libcroco/makefile.mk
@@ -58,9 +58,9 @@ CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) \
LDFLAGS="-L$(SOLARLIBDIR)" \
GLIB2_CFLAGS="-I$(SOLARINCDIR)$/external$/glib-2.0" \
GLIB2_LIBS="-lgio-2.0 -lgobject-2.0 -lgthread-2.0 -lglib-2.0 -lintl" \
- LIBXML2_CFLAGS=" " \
- LIBXML2_LIBS="-lxml2"
-
+ LIBXML2_CFLAGS="$(LIBXML_CFLAGS)" \
+ LIBXML2_LIBS="$(LIBXML_LIBS)"
+
CONFIGURE_FLAGS=$(eq,$(OS),MACOSX CPPFLAGS="$(EXTRA_CDEFS)" $(NULL))
BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) \
commit cf0edd9026e937af20f9e59c33e946c17f4f40a3
Author: Philipp Lohmann [pl] <Philipp.Lohmann at Oracle.COM>
Date: Wed Apr 6 14:24:05 2011 +0200
ooo34gsl01: #i117732# patch to make configure work with homebrew (thanks hbrinkm !) [hg:1780f020f3f4]
diff --git a/gdk-pixbuf/gdk-pixbuf-2.23.0.patch b/gdk-pixbuf/gdk-pixbuf-2.23.0.patch
index 1bff293..7e6db67 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 663f0f2..d44f1a0 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" \
commit 1464d3f520a3a3502ffa4bbae11cd453c839c3e5
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Wed Apr 6 13:06:33 2011 +0200
masterfix DEV300: #i10000# missing stlport dep [hg:5d377dd89e6b]
diff --git a/cairo/prj/build.lst b/cairo/prj/build.lst
index c531e6c..c59a5c4 100644
--- a/cairo/prj/build.lst
+++ b/cairo/prj/build.lst
@@ -1,4 +1,4 @@
-lcairo cairo : ZLIB:zlib soltools NULL
+lcairo cairo : ZLIB:zlib soltools stlport NULL
lcairo cairo usr1 - all lcairo_mkout NULL
lcairo cairo\pixman nmake - all lcairo_pixman NULL
lcairo cairo\cairo nmake - all lcairo_cairo lcairo_pixman NULL
commit a9a17544b085bf2536677927b8751f96e0f3a044
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Tue Apr 5 13:29:57 2011 +0200
masterfix DEV300: #i10000# SRC_ROOT -> SOLARSRC [hg:5851574127d1]
diff --git a/cairo/cairo-1.8.0.patch b/cairo/cairo-1.8.0.patch
index 424c604..dc2b6e4 100644
--- a/cairo/cairo-1.8.0.patch
+++ b/cairo/cairo-1.8.0.patch
@@ -7,8 +7,8 @@ diff -ur misc/build/cairo-1.8.0.org/build/Makefile.win32.common misc/build/cairo
-PIXMAN_CFLAGS := -I$(top_srcdir)/../pixman/pixman
-PIXMAN_LIBS := $(top_builddir)/../pixman/pixman/$(CFG)/pixman-1.lib
-+PIXMAN_CFLAGS := -I$(SRC_ROOT)/cairo/$(INPATH)/inc
-+PIXMAN_LIBS := $(SRC_ROOT)/cairo/$(INPATH)/lib/pixman-1.lib
++PIXMAN_CFLAGS := -I$(SOLARSRC)/cairo/$(INPATH)/inc
++PIXMAN_LIBS := $(SOLARSRC)/cairo/$(INPATH)/lib/pixman-1.lib
CAIRO_LIBS = gdi32.lib msimg32.lib user32.lib
ifeq ($(CAIRO_HAS_PNG_FUNCTIONS),1)
commit 7cc85ca35fcf1e5bfd6cb57a686e79e662e98b8c
Author: Michael Stahl <mst at openoffice.org>
Date: Fri Apr 1 20:47:03 2011 +0000
gnumake4: expat: build static libraries with VISIBILITY_HIDDEN [hg:f9b6805ca6ca]
diff --git a/expat/expat-2.0.1.patch b/expat/expat-2.0.1.patch
index bea3d01..3ff1e2d 100644
--- a/expat/expat-2.0.1.patch
+++ b/expat/expat-2.0.1.patch
@@ -1,6 +1,6 @@
--- misc/expat-2.0.1/lib/makefile.mk Wed Aug 20 14:33:55 2008
+++ misc/build/expat-2.0.1/lib/makefile.mk Wed Aug 20 14:26:42 2008
-@@ -1 +1,89 @@
+@@ -1 +1,90 @@
-dummy
+#*************************************************************************
+#
@@ -34,6 +34,7 @@
+TARGET=expat
+LIBTARGET=NO
+EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
++VISIBILITY_HIDDEN=TRUE
+
+# --- Settings -----------------------------------------------------
+.INCLUDE : settings.mk
More information about the Libreoffice-commits
mailing list