[Libreoffice-commits] .: 2 commits - gdk-pixbuf/gdk-pixbuf-2.23.0.patch gdk-pixbuf/makefile.mk librsvg/librsvg-2.32.1.patch librsvg/makefile.mk

Christian Lohmaier cloph at kemper.freedesktop.org
Tue Jun 14 06:43:19 PDT 2011 

 gdk-pixbuf/gdk-pixbuf-2.23.0.patch |   59 ++++++++++++++++++++++++++++++++++---
 gdk-pixbuf/makefile.mk             |   38 +++++++++++------------
 librsvg/librsvg-2.32.1.patch       |   19 +++++++++++
 librsvg/makefile.mk                |    4 +-
 4 files changed, 94 insertions(+), 26 deletions(-)

New commits:
commit a97482c6505524d1d1ef00ada8f59ca3ab35081e
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Tue Jun 14 15:44:11 2011 +0200

    remove noise from configure on Mac, use --disable-dependency-tracking

diff --git a/gdk-pixbuf/gdk-pixbuf-2.23.0.patch b/gdk-pixbuf/gdk-pixbuf-2.23.0.patch
index 726ca89..fccd992 100644
--- a/gdk-pixbuf/gdk-pixbuf-2.23.0.patch
+++ b/gdk-pixbuf/gdk-pixbuf-2.23.0.patch
@@ -1,5 +1,5 @@
 --- 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
++++ misc/build/gdk-pixbuf-2.23.0/configure	2011-06-14 15:20:05.000000000 +0200
 @@ -16839,7 +16839,7 @@
  
  
@@ -9,7 +9,7 @@
  
  if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
  	if test -n "$ac_tool_prefix"; then
-@@ -17158,7 +17158,11 @@
+@@ -17158,14 +17158,18 @@
  
  
    rm -f conf.glibtest
@@ -21,7 +21,58 @@
 +fi
  
  # See if it's safe to turn G_DISABLE_DEPRECATED on.
- GLIB_VERSION_MAJOR_MINOR=`$PKG_CONFIG --modversion glib-2.0 | sed "s/\.[^.]*\$//"`
+-GLIB_VERSION_MAJOR_MINOR=`$PKG_CONFIG --modversion glib-2.0 | sed "s/\.[^.]*\$//"`
+-GLIB_REQUIRED_VERSION_MAJOR_MINOR=`echo 2.25.15 | sed "s/\.[^.]*\$//"`
+-if test "x$GLIB_VERSION_MAJOR_MINOR" = "x$GLIB_REQUIRED_VERSION_MAJOR_MINOR"; then
++#GLIB_VERSION_MAJOR_MINOR=`$PKG_CONFIG --modversion glib-2.0 | sed "s/\.[^.]*\$//"`
++#GLIB_REQUIRED_VERSION_MAJOR_MINOR=`echo 2.25.15 | sed "s/\.[^.]*\$//"`
++#if test "x$GLIB_VERSION_MAJOR_MINOR" = "x$GLIB_REQUIRED_VERSION_MAJOR_MINOR"; then
+   CFLAGS="-DG_DISABLE_DEPRECATED $CFLAGS"
+-fi
++#fi
+ 
+ CFLAGS="-DGDK_PIXBUF_DISABLE_DEPRECATED $CFLAGS"
+ 
+@@ -17801,7 +17805,7 @@
+     for l in libpng libpng14 libpng12 libpng13 libpng10 ; do
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $l" >&5
+ $as_echo_n "checking for $l... " >&6; }
+-      if $PKG_CONFIG --exists $l ; then
++      if false ; then
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+         PNG='png'
+@@ -18206,8 +18210,8 @@
+ $as_echo_n "checking if gio can sniff png... " >&6; }
+   gtk_save_LIBS="$LIBS"
+   gtk_save_CFLAGS="$CFLAGS"
+-  LIBS="`$PKG_CONFIG --libs gio-2.0`"
+-  CFLAGS="`$PKG_CONFIG --cflags gio-2.0`"
++  #LIBS="`$PKG_CONFIG --libs gio-2.0`"
++  #CFLAGS="`$PKG_CONFIG --cflags gio-2.0`"
+   if test "$cross_compiling" = yes; then :
+   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+@@ -18622,8 +18626,8 @@
+ GDK_PIXBUF_PACKAGES="gmodule-no-export-2.0 gobject-2.0 gio-2.0"
+ GDK_PIXBUF_EXTRA_LIBS="$STATIC_LIB_DEPS $MATH_LIB $MEDIA_LIB"
+ GDK_PIXBUF_EXTRA_CFLAGS=
+-GDK_PIXBUF_DEP_LIBS="`$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS"
+-GDK_PIXBUF_DEP_CFLAGS="`$PKG_CONFIG --cflags  gthread-2.0 $GDK_PIXBUF_PACKAGES $PNG_DEP_CFLAGS_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS"
++GDK_PIXBUF_DEP_LIBS="$GDK_PIXBUF_EXTRA_LIBS"
++GDK_PIXBUF_DEP_CFLAGS="$GDK_PIXBUF_EXTRA_CFLAGS"
+ 
+ 
+ 
+@@ -18640,7 +18644,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS=
+ GDK_PIXBUF_XLIB_EXTRA_LIBS=
+ 
+-if $PKG_CONFIG --exists x11; then
++if false; then
+    if true; then
+   USE_X11_TRUE=
+   USE_X11_FALSE='#'
 --- misc/gdk-pixbuf-2.23.0/gdk-pixbuf/gdk-pixbuf-util.c
 +++ misc/build/gdk-pixbuf-2.23.0/gdk-pixbuf/gdk-pixbuf-util.c
 @@ -23,7 +23,9 @@
@@ -34,7 +85,7 @@
  
  #include "gdk-pixbuf-transform.h"
  #include "gdk-pixbuf-private.h"
-@@ -336,15 +336,19 @@
+@@ -336,15 +338,19 @@
  const gchar *
  gdk_pixbuf_gettext (const gchar *msgid)
  {
diff --git a/gdk-pixbuf/makefile.mk b/gdk-pixbuf/makefile.mk
index 201495d..aa58133 100644
--- a/gdk-pixbuf/makefile.mk
+++ b/gdk-pixbuf/makefile.mk
@@ -52,13 +52,13 @@ 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_CFLAGS="-I$(SOLARINCDIR)/external -I$(SOLARINCDIR)/external/glib-2.0" \
                 BASE_DEPENDENCIES_LIBS=" " \
-                 .$/configure \
-                 CPPFLAGS="$(EXTRA_CDEFS) -I$(SOLARINCDIR)$/external -I$(SOLARINCDIR)$/external$/glib-2.0 -I$(SOLARINCDIR)$/external$/libpng -I$(SOLARINCDIR)$/external$/jpeg" \
+                 ./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) \
+                 --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 \
@@ -95,21 +95,21 @@ CONFIGURE_ACTION=
 BUILD_DIR=./gdk-pixbuf
 BUILD_ACTION=nmake -f makefile.msc
 
-OUT2LIB+=gdk-pixbuf$/gdk_pixbuf-2.0.lib
-
-OUT2BIN+=gdk-pixbuf$/libgdk_pixbuf-2.0-0.dll
-
-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
+OUT2LIB+=gdk-pixbuf/gdk_pixbuf-2.0.lib
+
+OUT2BIN+=gdk-pixbuf/libgdk_pixbuf-2.0-0.dll
+
+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
 
 .ELSE
 
commit b4c63a9e190d29fa05f6d7afd7d79e76ad81530c
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Tue Jun 14 15:04:04 2011 +0200

    remove noise from configure on Mac, use --disable-dependency-tracking

diff --git a/librsvg/librsvg-2.32.1.patch b/librsvg/librsvg-2.32.1.patch
index 0b7534d..2d9fc0f 100644
--- a/librsvg/librsvg-2.32.1.patch
+++ b/librsvg/librsvg-2.32.1.patch
@@ -40,4 +40,21 @@
  LIBCROCOPKG=""
  
  test_croco=true
-
+@@ -13376,13 +13380,13 @@
+ 
+ 
+ 
+-GLIB_PREFIX=$($PKG_CONFIG --variable=prefix glib-2.0)
++#GLIB_PREFIX=$($PKG_CONFIG --variable=prefix glib-2.0)
+ 
+-GDK_PIXBUF_PREFIX=$($PKG_CONFIG --variable=prefix gdk-pixbuf-2.0)
++#GDK_PIXBUF_PREFIX=$($PKG_CONFIG --variable=prefix gdk-pixbuf-2.0)
+ 
+-GTK_PREFIX=$($PKG_CONFIG --variable=prefix gdk-pixbuf-2.0)
++#GTK_PREFIX=$($PKG_CONFIG --variable=prefix gdk-pixbuf-2.0)
+ 
+-CAIRO_PREFIX=$($PKG_CONFIG --variable=prefix cairo)
++#CAIRO_PREFIX=$($PKG_CONFIG --variable=prefix cairo)
+ 
+ 
+ 
diff --git a/librsvg/makefile.mk b/librsvg/makefile.mk
index 664baf6..63f45e3 100755
--- a/librsvg/makefile.mk
+++ b/librsvg/makefile.mk
@@ -62,7 +62,7 @@ CONFIGURE_DIR=
 CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) ./configure \
                  --prefix=$(SRC_ROOT)/$(PRJNAME)/$(MISC)
 CONFIGURE_FLAGS=--disable-gtk-theme --disable-tools --with-croco --with-svgz \
-                 --disable-pixbuf-loader \
+                 --disable-pixbuf-loader --disable-dependency-tracking $(eq,$(VERBOSE),$(NULL) --enable-silent-rules --disable-silent-rules) \
                  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" \
@@ -71,7 +71,7 @@ CONFIGURE_FLAGS=--disable-gtk-theme --disable-tools --with-croco --with-svgz \
                  GTHREAD_LIBS=-lgthread-2.0 \
                  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" \
+                 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)"
 
 CONFIGURE_FLAGS+= CPPFLAGS="$(ARCH_FLAGS) $(EXTRA_CDEFS)"

More information about the Libreoffice-commits mailing list