incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m..@apache.org
Subject svn commit: r1172090 [1/3] - in /incubator/ooo/trunk/main: gdk-pixbuf/ gdk-pixbuf/prj/ gettext/ gettext/prj/ glib/ glib/prj/ libcroco/ libgsf/ librsvg/ pango/ pango/prj/
Date Sat, 17 Sep 2011 22:34:19 GMT
Author: mst
Date: Sat Sep 17 22:34:18 2011
New Revision: 1172090

URL: http://svn.apache.org/viewvc?rev=1172090&view=rev
Log:
mingwport35: i#117794: MinGW port fix for rsvglibs

# HG changeset patch
# User tono@openoffice.org
# Date 1302529333 -32400
# Node ID 4bb59a76c6af417e85e78837d66e601f9082fff2
# Parent  315be8282fa3b83477a1f5120fa3516d066d689f

Added:
    incubator/ooo/trunk/main/gdk-pixbuf/gdk-pixbuf-2.23.0-mingw.patch   (with props)
    incubator/ooo/trunk/main/gettext/gettext-0.18.1.1-mingw.patch   (with props)
    incubator/ooo/trunk/main/glib/glib-2.28.1-mingw.patch   (with props)
    incubator/ooo/trunk/main/libcroco/libcroco-0.6.2-mingw.patch   (with props)
    incubator/ooo/trunk/main/libgsf/libgsf-1.14.19.mingw.patch   (with props)
    incubator/ooo/trunk/main/librsvg/librsvg-2.32.1-mingw.patch   (with props)
    incubator/ooo/trunk/main/pango/pango-1.28.3-mingw.patch   (with props)
Modified:
    incubator/ooo/trunk/main/gdk-pixbuf/makefile.mk
    incubator/ooo/trunk/main/gdk-pixbuf/prj/d.lst
    incubator/ooo/trunk/main/gettext/makefile.mk
    incubator/ooo/trunk/main/gettext/prj/d.lst
    incubator/ooo/trunk/main/glib/makefile.mk
    incubator/ooo/trunk/main/glib/prj/d.lst
    incubator/ooo/trunk/main/libcroco/makefile.mk
    incubator/ooo/trunk/main/libgsf/makefile.mk
    incubator/ooo/trunk/main/librsvg/makefile.mk
    incubator/ooo/trunk/main/pango/makefile.mk
    incubator/ooo/trunk/main/pango/prj/d.lst

Added: incubator/ooo/trunk/main/gdk-pixbuf/gdk-pixbuf-2.23.0-mingw.patch
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/gdk-pixbuf/gdk-pixbuf-2.23.0-mingw.patch?rev=1172090&view=auto
==============================================================================
--- incubator/ooo/trunk/main/gdk-pixbuf/gdk-pixbuf-2.23.0-mingw.patch (added)
+++ incubator/ooo/trunk/main/gdk-pixbuf/gdk-pixbuf-2.23.0-mingw.patch Sat Sep 17 22:34:18
2011
@@ -0,0 +1,104 @@
+--- misc/gdk-pixbuf-2.23.0/configure	2011-04-08 23:09:51.936125000 +0900
++++ misc/build/gdk-pixbuf-2.23.0/configure	2011-04-08 23:09:30.967375000 +0900
+@@ -1417,6 +1417,7 @@
+     cross_compiling=yes
+   fi
+ fi
++cross_compiling=no
+ 
+ ac_tool_prefix=
+ test -n "$host_alias" && ac_tool_prefix=$host_alias-
+@@ -5192,7 +5193,7 @@
+   lt_cv_path_NM="$NM"
+ else
+   lt_nm_to_check="${ac_tool_prefix}nm"
+-  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
++  if test -n "$ac_tool_prefix"; then
+     lt_nm_to_check="$lt_nm_to_check nm"
+   fi
+   for lt_tmp_nm in $lt_nm_to_check; do
+@@ -5850,7 +5851,7 @@
+   # unless we find 'file', for example because we are cross-compiling.
+   # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
+   if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1;
then
+-    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
++    lt_cv_deplibs_check_method='file_magic ^x86 archive|^x86 DLL'
+     lt_cv_file_magic_cmd='func_win32_libid'
+   else
+     # Keep this pattern in sync with the one in func_win32_libid.
+@@ -16839,7 +16840,7 @@
+ 
+ 
+ 
+-
++if test ! 1; then
+ 
+ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+ 	if test -n "$ac_tool_prefix"; then
+@@ -17158,14 +17159,20 @@
+ 
+ 
+   rm -f conf.glibtest
++else
++  GLIB_MKENUMS=glib-mkenums
++  GLIB_GENMARSHAL=glib-genmarshal
++  GOBJECT_QUERY=gobject-query
++fi
+ 
+-
++if test ! 1; then
+ # See if it's safe to turn G_DISABLE_DEPRECATED on.
+ 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"
+ 
+@@ -17434,6 +17441,7 @@
+ else
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
++if test ! 1; then
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether dynamic modules work" >&5
+ $as_echo_n "checking whether dynamic modules work... " >&6; }
+     ## for loop is to strip newline
+@@ -17465,6 +17473,7 @@
+ $as_echo "no" >&6; }
+     fi
+ fi
++fi
+ 
+ 
+ 
+@@ -18622,8 +18631,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"
+ 
+ 
+ 
+@@ -18632,6 +18641,9 @@
+ 
+ 
+ 
++USE_X11_TRUE='#'
++USE_X11_FALSE=
++if test ! 1; then
+ ###############
+ # Check for X11
+ ###############
+@@ -18769,6 +18781,7 @@
+ if test -n "$export_dynamic"; then
+   GDK_PIXBUF_DEP_LIBS=`echo $GDK_PIXBUF_DEP_LIBS | sed -e "s/$export_dynamic//"`
+ fi
++fi
+ 
+ ##################################################
+ # GObject introspection

Propchange: incubator/ooo/trunk/main/gdk-pixbuf/gdk-pixbuf-2.23.0-mingw.patch
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/ooo/trunk/main/gdk-pixbuf/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/gdk-pixbuf/makefile.mk?rev=1172090&r1=1172089&r2=1172090&view=diff
==============================================================================
--- incubator/ooo/trunk/main/gdk-pixbuf/makefile.mk (original)
+++ incubator/ooo/trunk/main/gdk-pixbuf/makefile.mk Sat Sep 17 22:34:18 2011
@@ -84,6 +84,45 @@ OUT2INC+=gdk-pixbuf$/gdk-pixbuf-transfor
 
 .ELIF "$(OS)"=="WNT"
 
+.IF "$(COM)"=="GCC"
+
+PATCH_FILES=gdk-pixbuf-2.23.0-mingw.patch
+
+CONFIGURE_CPPFLAGS=-nostdinc -I$(SOLARINCDIR)$/external$/glib-2.0 -I$(SOLARINCDIR)$/external$/libpng
-I$(SOLARINCDIR)$/external$/jpeg
+
+CONFIGURE_CPPFLAGS+=$(INCLUDE)
+
+CONFIGURE_LDFLAGS=-no-undefined -L$(ILIB:s/;/ -L/)
+CONFIGURE_CC=$(CC) -mthreads
+
+CONFIGURE_LIBS=-lgobject-2.0 -lgio-2.0 -lgthread-2.0 -lgmodule-2.0 -lglib-2.0 -lintl
+
+.IF "$(MINGW_SHARED_GCCLIB)"=="YES"
+CONFIGURE_CC+=-shared-libgcc
+.ENDIF
+.IF "$(MINGW_SHARED_GXXLIB)"=="YES"
+CONFIGURE_LIBS+=$(MINGW_SHARED_LIBSTDCPP)
+.ENDIF
+
+CONFIGURE_DIR=
+CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) \
+                BASE_DEPENDENCIES_CFLAGS="$(CONFIGURE_CPPFLAGS)" \
+                BASE_DEPENDENCIES_LIBS=" " \
+                 .$/configure \
+                 --build=i686-pc-cygwin --host=i686-pc-mingw32 \
+                 CC="$(CONFIGURE_CC)" CPPFLAGS="$(CONFIGURE_CPPFLAGS)" \
+                 LDFLAGS="$(CONFIGURE_LDFLAGS)" LIBS="$(CONFIGURE_LIBS)" \
+                 --disable-glibtest --without-libtiff LIBPNG="-lpng -lzlib"
+
+BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE)
+BUILD_DIR=$(CONFIGURE_DIR)
+                
+OUT2LIB+=gdk-pixbuf$/.libs/libgdk_pixbuf-2.0.dll.a
+
+OUT2BIN+=gdk-pixbuf$/.libs/libgdk_pixbuf-2.0-0.dll
+
+.ELSE
+
 PATCH_FILES=gdk-pixbuf-2.23.0-win32.patch
 ADDITIONAL_FILES=config.h.win32 glib-mkenums.pl msvc_recommended_pragmas.h 
 CONFIGURE_DIR=
@@ -95,6 +134,8 @@ OUT2LIB+=gdk-pixbuf$/gdk_pixbuf-2.0.lib
 
 OUT2BIN+=gdk-pixbuf$/libgdk_pixbuf-2.0-0.dll
 
+.ENDIF
+
 OUT2INC+=gdk-pixbuf$/gdk-pixbuf-animation.h
 OUT2INC+=gdk-pixbuf$/gdk-pixbuf-features.h
 OUT2INC+=gdk-pixbuf$/gdk-pixbuf-marshal.h

Modified: incubator/ooo/trunk/main/gdk-pixbuf/prj/d.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/gdk-pixbuf/prj/d.lst?rev=1172090&r1=1172089&r2=1172090&view=diff
==============================================================================
--- incubator/ooo/trunk/main/gdk-pixbuf/prj/d.lst (original)
+++ incubator/ooo/trunk/main/gdk-pixbuf/prj/d.lst Sat Sep 17 22:34:18 2011
@@ -19,3 +19,4 @@ symlink: %_DEST%\lib%_EXT%\libgdk_pixbuf
 ..\%__SRC%\bin\gdk-pixbuf-query-loaders %_DEST%\bin%_EXT%\gdk-pixbuf-query-loaders
 ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%
 ..\%__SRC%\lib\gdk_pixbuf-2.0.lib %_DEST%\lib%_EXT%\gdk_pixbuf-2.0.lib
+..\%__SRC%\lib\libgdk_pixbuf-2.0.dll.a %_DEST%\lib%_EXT%\libgdk_pixbuf-2.0.dll.a



Mime
View raw message