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 [3/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
Added: incubator/ooo/trunk/main/glib/glib-2.28.1-mingw.patch
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/glib/glib-2.28.1-mingw.patch?rev=1172090&view=auto
==============================================================================
--- incubator/ooo/trunk/main/glib/glib-2.28.1-mingw.patch (added)
+++ incubator/ooo/trunk/main/glib/glib-2.28.1-mingw.patch Sat Sep 17 22:34:18 2011
@@ -0,0 +1,104 @@
+--- misc/glib-2.28.1/Makefile.in	2011-02-19 00:22:03.000000000 +0900
++++ misc/build/glib-2.28.1/Makefile.in	2011-04-06 20:49:38.648000000 +0900
+@@ -422,7 +422,7 @@
+ 	gio-2.0-uninstalled.pc.in gio-unix-2.0-uninstalled.pc.in
+ TEST_PROGS = 
+ ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS}
+-SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po docs
++SUBDIRS = . m4macros glib gmodule gthread gobject gio
+ DIST_SUBDIRS = $(SUBDIRS) build
+ bin_SCRIPTS = glib-gettextize
+ AM_CPPFLAGS = \
+--- misc/glib-2.28.1/gobject/Makefile.in	2011-02-19 00:22:02.000000000 +0900
++++ misc/build/glib-2.28.1/gobject/Makefile.in	2011-04-06 06:37:37.274125000 +0900
+@@ -723,6 +723,7 @@
+ glib-genmarshal$(EXEEXT): $(glib_genmarshal_OBJECTS) $(glib_genmarshal_DEPENDENCIES) 
+ 	@rm -f glib-genmarshal$(EXEEXT)
+ 	$(AM_V_CCLD)$(LINK) $(glib_genmarshal_OBJECTS) $(glib_genmarshal_LDADD) $(LIBS)
++	@cp /dev/null @am__quote@./$(DEPDIR)/glib-genmarshal.Po@am__quote@
+ gobject-query$(EXEEXT): $(gobject_query_OBJECTS) $(gobject_query_DEPENDENCIES) 
+ 	@rm -f gobject-query$(EXEEXT)
+ 	$(AM_V_CCLD)$(LINK) $(gobject_query_OBJECTS) $(gobject_query_LDADD) $(LIBS)
+--- misc/glib-2.28.1/ltmain.sh	2011-02-08 21:25:07.000000000 +0900
++++ misc/build/glib-2.28.1/ltmain.sh	2011-04-05 20:46:38.586000000 +0900
+@@ -6485,7 +6485,7 @@
+ 	case $ladir in
+ 	[\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
+ 	*)
+-	  abs_ladir=`cd "$ladir" && pwd`
++	  abs_ladir=`cd "$ladir" && cygpath -am .`
+ 	  if test -z "$abs_ladir"; then
+ 	    func_warning "cannot determine absolute directory name of \`$ladir'"
+ 	    func_warning "passing it literally to the linker, although it might fail"
+--- misc/glib-2.28.1/configure	2011-02-19 00:22:04.000000000 +0900
++++ misc/build/glib-2.28.1/configure	2011-04-03 22:22:36.941750000 +0900
+@@ -1443,6 +1443,7 @@
+     cross_compiling=yes
+   fi
+ fi
++cross_compiling=no
+ 
+ ac_tool_prefix=
+ test -n "$host_alias" && ac_tool_prefix=$host_alias-
+@@ -7931,13 +7932,13 @@
+ done
+ 
+ 
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inflate in -lz" >&5
+-$as_echo_n "checking for inflate in -lz... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inflate in $ZLIB3RDLIB" >&5
++$as_echo_n "checking for inflate in $ZLIB3RDLIB... " >&6; }
+ if ${ac_cv_lib_z_inflate+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lz  $LIBS"
++LIBS="$ZLIB3RDLIB  $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+@@ -7979,7 +7980,7 @@
+   if test "x$found_zlib" = "xno" ; then
+     as_fn_error $? "*** Working zlib library and headers not found ***" "$LINENO" 5
+   fi
+-  ZLIB_LIBS='-lz'
++  ZLIB_LIBS="$ZLIB3RDLIB"
+ 
+ fi
+ 
+@@ -8389,6 +8390,7 @@
+ 
+ $as_echo "#define HAVE_GETTEXT 1" >>confdefs.h
+ 
++if test ! 1; then
+ 	# Extract the first word of "msgfmt", so it can be a program name with args.
+ set dummy msgfmt; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+@@ -8605,8 +8607,10 @@
+ $as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
+         XGETTEXT=":"
+       fi
++fi
+     fi
+ 
++if test ! 1; then
+     # We need to process the po/ directory.
+     POSUB=po
+ 
+@@ -8690,6 +8694,7 @@
+    rm -f po/POTFILES
+    sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/"
\
+ 	< $srcdir/po/POTFILES.in > po/POTFILES
++fi
+ 
+ 
+ if test "$gt_cv_have_gettext" != "yes" ; then
+@@ -9797,7 +9802,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.

Propchange: incubator/ooo/trunk/main/glib/glib-2.28.1-mingw.patch
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/ooo/trunk/main/glib/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/glib/makefile.mk?rev=1172090&r1=1172089&r2=1172090&view=diff
==============================================================================
--- incubator/ooo/trunk/main/glib/makefile.mk (original)
+++ incubator/ooo/trunk/main/glib/makefile.mk Sat Sep 17 22:34:18 2011
@@ -287,6 +287,50 @@ OUT2INC+=gobject/gtype.h
 OUT2INC+=gobject/gvaluearray.h
 
 .ELIF "$(OS)"=="WNT"
+.IF "$(COM)"=="GCC"
+PATCH_FILES=glib-2.28.1-mingw.patch
+
+CONFIGURE_CPPFLAGS=-nostdinc
+
+.IF "$(SYSTEM_ZLIB)"!="YES"
+CONFIGURE_CPPFLAGS+=-I$(SOLARINCDIR)$/external$/zlib
+.ENDIF
+CONFIGURE_CPPFLAGS+=$(INCLUDE)
+
+CONFIGURE_LDFLAGS=-no-undefined -L$(ILIB:s/;/ -L/)
+CONFIGURE_CC=$(CC) -mthreads
+
+CONFIGURE_LIBS=
+
+.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=.$/configure
+CONFIGURE_FLAGS=--disable-fam --build=i686-pc-cygwin --host=i686-pc-mingw32 CC="$(CONFIGURE_CC)"
CPPFLAGS="$(CONFIGURE_CPPFLAGS)" LDFLAGS="$(CONFIGURE_LDFLAGS)" LIBS="$(CONFIGURE_LIBS)" ZLIB3RDLIB=$(ZLIB3RDLIB)
OBJDUMP="$(WRAPCMD) objdump"
+BUILD_ACTION=PATH=/cygdrive/c/OOo/Local/workdir/glib/wntgcci.pro/misc/build/glib-2.28.1/glib/.libs:/cygdrive/c/OOo/Local/workdir/solver/300/wntgcci.pro/bin:$$PATH
$(GNUMAKE)
+BUILD_FLAGS+= -j$(EXTMAXPROCESS)
+BUILD_DIR=$(CONFIGURE_DIR)
+
+OUT2BIN+=gio/.libs/libgio-2.0-0.dll
+OUT2BIN+=glib/.libs/libglib-2.0-0.dll
+OUT2BIN+=gmodule/.libs/libgmodule-2.0-0.dll
+OUT2BIN+=gobject/.libs/libgobject-2.0-0.dll
+OUT2BIN+=gthread/.libs/libgthread-2.0-0.dll
+OUT2BIN+=gobject$/glib-mkenums
+OUT2BIN+=gobject$/.libs$/glib-genmarshal.exe
+
+OUT2LIB+=gio/.libs/libgio-2.0.dll.a
+OUT2LIB+=glib/.libs/libglib-2.0.dll.a
+OUT2LIB+=gmodule/.libs/libgmodule-2.0.dll.a
+OUT2LIB+=gobject/.libs/libgobject-2.0.dll.a
+OUT2LIB+=gthread/.libs/libgthread-2.0.dll.a
+
+.ELSE
 CONVERTFILES=gobject/gmarshal.c
 
 PATCH_FILES=glib-2.28.1-win32.patch glib-2.28.1-win32-2.patch
@@ -320,6 +364,7 @@ OUT2LIB+=gmodule/gmodule-2.0.lib
 OUT2LIB+=gobject/glib-genmarshal.lib
 OUT2LIB+=gobject/gobject-2.0.lib
 OUT2LIB+=gthread/gthread-2.0.lib
+.ENDIF
 
 OUT2INC+=build$/win32$/make.msc
 OUT2INC+=build$/win32$/module.defs

Modified: incubator/ooo/trunk/main/glib/prj/d.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/glib/prj/d.lst?rev=1172090&r1=1172089&r2=1172090&view=diff
==============================================================================
--- incubator/ooo/trunk/main/glib/prj/d.lst (original)
+++ incubator/ooo/trunk/main/glib/prj/d.lst Sat Sep 17 22:34:18 2011
@@ -18,6 +18,11 @@ symlink: %_DEST%\lib%_EXT%\libgobject-2.
 ..\%__SRC%\lib\gthread-2.0.lib %_DEST%\lib%_EXT%\gthread-2.0.lib
 ..\%__SRC%\lib\glib-2.0.lib %_DEST%\lib%_EXT%\glib-2.0.lib
 ..\%__SRC%\lib\gobject-2.0.lib %_DEST%\lib%_EXT%\gobject-2.0.lib
+..\%__SRC%\lib\libgio-2.0.dll.a %_DEST%\lib%_EXT%\libgio-2.0.dll.a
+..\%__SRC%\lib\libgmodule-2.0.dll.a %_DEST%\lib%_EXT%\libgmodule-2.0.dll.a
+..\%__SRC%\lib\libgthread-2.0.dll.a %_DEST%\lib%_EXT%\libgthread-2.0.dll.a
+..\%__SRC%\lib\libglib-2.0.dll.a %_DEST%\lib%_EXT%\libglib-2.0.dll.a
+..\%__SRC%\lib\libgobject-2.0.dll.a %_DEST%\lib%_EXT%\libgobject-2.0.dll.a
 
 mkdir: %_DEST%\inc%_EXT%\external\gio-unix-2.0
 mkdir: %_DEST%\inc%_EXT%\external\gio-unix-2.0\gio

Added: incubator/ooo/trunk/main/libcroco/libcroco-0.6.2-mingw.patch
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/libcroco/libcroco-0.6.2-mingw.patch?rev=1172090&view=auto
==============================================================================
--- incubator/ooo/trunk/main/libcroco/libcroco-0.6.2-mingw.patch (added)
+++ incubator/ooo/trunk/main/libcroco/libcroco-0.6.2-mingw.patch Sat Sep 17 22:34:18 2011
@@ -0,0 +1,25 @@
+--- misc/libcroco-0.6.2/src/makefile.mk	Wed Aug 20 14:33:55 2008
++++ misc/build/libcroco-0.6.2/src/makefile.mk	Wed Aug 20 14:26:42 2008
+@@ -76,16 +76,16 @@
+ SHL1TARGET=	$(TARGET)
+ SHL1OBJS=$(SLOFILES)
+ SHL1STDLIBS=\
+-	gio-2.0.lib \
+-	gobject-2.0.lib \
+-	gthread-2.0.lib \
+-	glib-2.0.lib \
+-	intl.lib \
++	-lgio-2.0 \
++	-lgobject-2.0 \
++	-lgthread-2.0 \
++	-lglib-2.0 \
++	-lintl \
+ 	$(LIBXML2LIB)
+ 
+ 
+ SHL1DEPN=
+-#SHL1IMPLIB=$(TARGET)
++SHL1IMPLIB=$(TARGET)
+ #SHL1USE_EXPORTS=name
+ 
+ SHL1DEF=	$(MISC)$/$(SHL1TARGET).def

Propchange: incubator/ooo/trunk/main/libcroco/libcroco-0.6.2-mingw.patch
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/ooo/trunk/main/libcroco/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/libcroco/makefile.mk?rev=1172090&r1=1172089&r2=1172090&view=diff
==============================================================================
--- incubator/ooo/trunk/main/libcroco/makefile.mk (original)
+++ incubator/ooo/trunk/main/libcroco/makefile.mk Sat Sep 17 22:34:18 2011
@@ -103,6 +103,9 @@ OUT2INC+=src$/libcroco.h
 BUILD_ACTION=dmake
 BUILD_DIR=$(CONFIGURE_DIR)$/src
 PATCH_FILES=libcroco-0.6.2.patch
+.IF "$(COM)"=="GCC"
+PATCH_FILES+=libcroco-0.6.2-mingw.patch
+.ENDIF
 ADDITIONAL_FILES=\
 	src$/makefile.mk
 

Added: incubator/ooo/trunk/main/libgsf/libgsf-1.14.19.mingw.patch
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/libgsf/libgsf-1.14.19.mingw.patch?rev=1172090&view=auto
==============================================================================
--- incubator/ooo/trunk/main/libgsf/libgsf-1.14.19.mingw.patch (added)
+++ incubator/ooo/trunk/main/libgsf/libgsf-1.14.19.mingw.patch Sat Sep 17 22:34:18 2011
@@ -0,0 +1,36 @@
+--- misc/libgsf-1.14.19/gsf/gsf-config.h	2011-03-23 16:18:27.163747600 +0100
++++ misc/build/libgsf-1.14.19/gsf/gsf-config.h	2011-03-23 16:01:26.598374600 +0100
+@@ -3,8 +3,6 @@
+ 
+ #define GETTEXT_PACKAGE "gsf"
+ 
+-typedef unsigned short mode_t;
+-
+ #define S_ISREG(x) ((x & _S_IFREG)!=0)
+ 
+ #endif
+--- misc/libgsf-1.14.19/gsf/makefile.mk	2011-03-23 16:18:27.070742300 +0100
++++ misc/build/libgsf-1.14.19/gsf/makefile.mk	2011-03-23 16:17:29.477448100 +0100
+@@ -91,14 +91,14 @@
+ SHL1TARGET=	$(TARGET)
+ SHL1OBJS=$(SLOFILES)
+ SHL1STDLIBS=\
+-    libxml2.lib \
+-    gio-2.0.lib \
+-    gmodule-2.0.lib \
+-    gobject-2.0.lib \
+-    glib-2.0.lib \
+-    intl.lib \
+-    zlib.lib \
+-	Advapi32.lib
++    $(LIBXML2LIB) \
++    -lgio-2.0 \
++    -lgmodule-2.0 \
++    -lgobject-2.0 \
++    -lglib-2.0 \
++    -lintl \
++    $(ZLIB3RDLIB) \
++	$(ADVAPI32LIB)
+ 
+ 
+ SHL1IMPLIB=	i$(TARGET)

Propchange: incubator/ooo/trunk/main/libgsf/libgsf-1.14.19.mingw.patch
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/ooo/trunk/main/libgsf/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/libgsf/makefile.mk?rev=1172090&r1=1172089&r2=1172090&view=diff
==============================================================================
--- incubator/ooo/trunk/main/libgsf/makefile.mk (original)
+++ incubator/ooo/trunk/main/libgsf/makefile.mk Sat Sep 17 22:34:18 2011
@@ -52,6 +52,9 @@ TARFILE_MD5=3a84ac2da37cae5bf7ce616228c6
 
 .IF "$(OS)" == "WNT"
 PATCH_FILES=libgsf-1.14.19.windows.patch
+.IF "$(COM)"=="GCC"
+PATCH_FILES+=libgsf-1.14.19.mingw.patch
+.ENDIF
 
 BUILD_DIR=gsf
 BUILD_ACTION=dmake

Added: incubator/ooo/trunk/main/librsvg/librsvg-2.32.1-mingw.patch
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/librsvg/librsvg-2.32.1-mingw.patch?rev=1172090&view=auto
==============================================================================
--- incubator/ooo/trunk/main/librsvg/librsvg-2.32.1-mingw.patch (added)
+++ incubator/ooo/trunk/main/librsvg/librsvg-2.32.1-mingw.patch Sat Sep 17 22:34:18 2011
@@ -0,0 +1,38 @@
+--- misc/librsvg-2.32.1/makefile.mk	2011-04-09 00:05:39.215750000 +0900
++++ misc/build/librsvg-2.32.1/makefile.mk	2011-04-09 00:20:44.061125000 +0900
+@@ -81,21 +81,21 @@
+ SHL1TARGET=	$(TARGET)
+ SHL1OBJS=$(SLOFILES)
+ SHL1STDLIBS=\
+-    intl.lib 				\
+-    gobject-2.0.lib 	\
+-    gmodule-2.0.lib 	\
+-	glib-2.0.lib 			\
+-    gio-2.0.lib 			\
+-    gthread-2.0.lib    \
+-    gdk_pixbuf-2.0.lib \
+-    cairo.lib 			\
+-    libxml2.lib 			\
+-    igsf-1.lib     	    \
+-    libcroco-0.6-3.lib	\
+-    pango-1.0.lib 		\
+-    pangocairo-1.0.lib 	
++    -lintl 				\
++    -lgobject-2.0 	\
++    -lgmodule-2.0 	\
++	-lglib-2.0 			\
++    -lgio-2.0 			\
++    -lgthread-2.0    \
++    -lgdk_pixbuf-2.0 \
++    -lcairo 			\
++    $(LIBXML2LIB) 			\
++    -lgsf-1     	    \
++    -llibcroco-0.6-3	\
++    -lpango-1.0 		\
++    -lpangocairo-1.0 	
+ 
+-SHL1IMPLIB= i$(TARGET)
++SHL1IMPLIB= $(TARGET)
+ SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
+ DEF1NAME= $(SHL1TARGET)
+ DEF1DEPN=	$(MISC)$/$(SHL1TARGET).flt $(SLB)$/$(TARGET).lib

Propchange: incubator/ooo/trunk/main/librsvg/librsvg-2.32.1-mingw.patch
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/ooo/trunk/main/librsvg/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/librsvg/makefile.mk?rev=1172090&r1=1172089&r2=1172090&view=diff
==============================================================================
--- incubator/ooo/trunk/main/librsvg/makefile.mk (original)
+++ incubator/ooo/trunk/main/librsvg/makefile.mk Sat Sep 17 22:34:18 2011
@@ -90,6 +90,9 @@ OUT2INC+=rsvg.h
 .ELIF "$(OS)"=="WNT"
 
 PATCH_FILES=librsvg-2.32.1-win32.patch
+.IF "$(COM)"=="GCC"
+PATCH_FILES+=librsvg-2.32.1-mingw.patch
+.ENDIF
 ADDITIONAL_FILES=config.h makefile.mk
 
 BUILD_DIR=.

Modified: incubator/ooo/trunk/main/pango/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/pango/makefile.mk?rev=1172090&r1=1172089&r2=1172090&view=diff
==============================================================================
--- incubator/ooo/trunk/main/pango/makefile.mk (original)
+++ incubator/ooo/trunk/main/pango/makefile.mk Sat Sep 17 22:34:18 2011
@@ -107,6 +107,54 @@ OUT2INC+=pango/pango-utils.h
 
 .ELIF "$(OS)"=="WNT"
 
+.IF "$(COM)"=="GCC"
+
+PATCH_FILES=pango-1.28.3-mingw.patch
+
+CONFIGURE_CPPFLAGS=-nostdinc -I$(SOLARINCDIR)$/external$/glib-2.0
+
+CONFIGURE_CPPFLAGS+=$(INCLUDE)
+
+CONFIGURE_LDFLAGS=-no-undefined -L$(ILIB:s/;/ -L/)
+CONFIGURE_CC=$(CC) -mthreads
+
+CONFIGURE_LIBS=
+
+.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)" \
+                 CAIRO_CFLAGS="-I$(SOLARINCDIR) -I$(SOLARINCDIR)$/cairo" \
+                 CAIRO_LIBS="-lcairo" \
+                 GLIB_CFLAGS="-I$(SOLARINCDIR)$/external$/glib-2.0" \
+                 GLIB_LIBS="-lgthread-2.0 -lgmodule-2.0 -lgobject-2.0 -lglib-2.0 -lintl"
\
+                 --without-x --with-included-modules=yes
+
+BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE)
+BUILD_DIR=$(CONFIGURE_DIR)
+
+OUT2LIB+=pango/.libs/libpango-1.0.dll.a
+OUT2LIB+=pango/.libs/libpangocairo-1.0.dll.a
+OUT2LIB+=pango/.libs/libpangowin32-1.0.dll.a
+
+OUT2BIN+=pango/.libs/libpango-1.0-0.dll
+OUT2BIN+=pango/.libs/libpangocairo-1.0-0.dll
+OUT2BIN+=pango/.libs/libpangowin32-1.0-0.dll
+OUT2BIN+=pango/.libs/pango-querymodules.exe
+                
+.ELSE
+
 PATCH_FILES=pango-1.28.3-win32.patch
 ADDITIONAL_FILES=config.h msvc_recommended_pragmas.h
 CONFIGURE_DIR=
@@ -123,6 +171,8 @@ OUT2BIN+=pango/libpangocairo-1.0-0.dll
 OUT2BIN+=pango/libpangowin32-1.0-0.dll
 OUT2BIN+=pango/querymodules.exe
 
+.ENDIF
+
 OUT2INC+=pango/pango.h
 OUT2INC+=pango/pangocairo.h
 OUT2INC+=pango/pango-attributes.h

Added: incubator/ooo/trunk/main/pango/pango-1.28.3-mingw.patch
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/pango/pango-1.28.3-mingw.patch?rev=1172090&view=auto
==============================================================================
--- incubator/ooo/trunk/main/pango/pango-1.28.3-mingw.patch (added)
+++ incubator/ooo/trunk/main/pango/pango-1.28.3-mingw.patch Sat Sep 17 22:34:18 2011
@@ -0,0 +1,103 @@
+--- misc/pango-1.28.3/Makefile.in	2010-09-29 20:02:36.000000000 +0900
++++ misc/build/pango-1.28.3/Makefile.in	2011-04-08 22:17:09.951750000 +0900
+@@ -329,7 +329,7 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = pango modules pango-view examples docs tools tests
++SUBDIRS = pango
+ EXTRA_DIST = \
+ 	autogen.sh		\
+ 	pango.pc.in		\
+--- misc/pango-1.28.3/configure	2010-09-29 20:02:33.000000000 +0900
++++ misc/build/pango-1.28.3/configure	2011-04-08 19:39:29.965875000 +0900
+@@ -1557,6 +1557,7 @@
+     cross_compiling=yes
+   fi
+ fi
++cross_compiling=no
+ 
+ ac_tool_prefix=
+ test -n "$host_alias" && ac_tool_prefix=$host_alias-
+@@ -6307,7 +6308,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
+@@ -18576,16 +18577,16 @@
+   fi
+ 
+   if $have_win32; then
+-    if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo-win32
>= \$cairo_required\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "cairo-win32 >= $cairo_required") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; then
++#    if test -n "$PKG_CONFIG" && \
++#    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo-win32
>= \$cairo_required\""; } >&5
++#  ($PKG_CONFIG --exists --print-errors "cairo-win32 >= $cairo_required") 2>&5
++#  ac_status=$?
++#  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++#  test $ac_status = 0; }; then
+   have_cairo_win32=true
+-else
+-  :
+-fi
++#else
++#  :
++#fi
+   fi
+   if $have_cairo_win32; then
+ 
+@@ -18858,16 +18859,16 @@
+ fi
+ 
+ # Setup GLIB_MKENUMS to use glib-mkenums even if GLib is uninstalled.
+-GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
+-
++#GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
++GLIB_MKENUMS=glib-mkenums
+ 
+ 
+ # Add in gthread-2.0 to CFLAGS but not to LIBS so we get any
+ # necesary defines for thread-safety.
+-GLIB_CFLAGS=`$PKG_CONFIG --cflags $GLIB_MODULES gthread-2.0`
++#GLIB_CFLAGS=`$PKG_CONFIG --cflags $GLIB_MODULES gthread-2.0`
+ 
+ # 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 $GLIB_REQUIRED_VERSION | sed "s/\.[^.]*\$//"`
+ if test "x$GLIB_VERSION_MAJOR_MINOR" = "x$GLIB_REQUIRED_VERSION_MAJOR_MINOR"; then
+   GLIB_CFLAGS="-DG_DISABLE_DEPRECATED $GLIB_CFLAGS"
+@@ -19839,12 +19840,14 @@
+ fi
+ 
+ 
++if test ! 1; then
+ if test "x$enable_doc_cross_references" != xno ; then
+ 	GLIB_PREFIX="`$PKG_CONFIG --variable=prefix glib-2.0`"
+ 	CAIRO_PREFIX="`pkg-config --variable=prefix cairo`"
+ 
+ 
+ fi
++fi
+  if test x$enable_doc_cross_references != xno; then
+   ENABLE_DOC_CROSS_REFERENCES_TRUE=
+   ENABLE_DOC_CROSS_REFERENCES_FALSE='#'
+--- misc/pango-1.28.3/ltmain.sh	2010-09-29 20:02:28.000000000 +0900
++++ misc/build/pango-1.28.3/ltmain.sh	2011-04-08 19:39:39.153375000 +0900
+@@ -5393,7 +5393,7 @@
+ 	case $ladir in
+ 	[\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
+ 	*)
+-	  abs_ladir=`cd "$ladir" && pwd`
++	  abs_ladir=`cd "$ladir" && cygpath -am .`
+ 	  if test -z "$abs_ladir"; then
+ 	    func_warning "cannot determine absolute directory name of \`$ladir'"
+ 	    func_warning "passing it literally to the linker, although it might fail"

Propchange: incubator/ooo/trunk/main/pango/pango-1.28.3-mingw.patch
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/ooo/trunk/main/pango/prj/d.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/pango/prj/d.lst?rev=1172090&r1=1172089&r2=1172090&view=diff
==============================================================================
--- incubator/ooo/trunk/main/pango/prj/d.lst (original)
+++ incubator/ooo/trunk/main/pango/prj/d.lst Sat Sep 17 22:34:18 2011
@@ -39,6 +39,11 @@ symlink: %_DEST%\lib%_EXT%\libpangocairo
 ..\%__SRC%\lib\pangocairo-1.0.lib %_DEST%\lib%_EXT%\pangocairo-1.0.lib
 ..\%__SRC%\lib\pangowin32-1.0.lib %_DEST%\lib%_EXT%\pangowin32-1.0.lib
 
+..\%__SRC%\lib\libpango-1.0.dll.a %_DEST%\lib%_EXT%\libpango-1.0.dll.a
+..\%__SRC%\lib\libpangocairo-1.0.dll.a %_DEST%\lib%_EXT%\libpangocairo-1.0.dll.a
+..\%__SRC%\lib\libpangowin32-1.0.dll.a %_DEST%\lib%_EXT%\libpangowin32-1.0.dll.a
+
 ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%
 ..\%__SRC%\bin\pango-querymodules %_DEST%\bin%_EXT%\pango-querymodules
 ..\%__SRC%\bin\querymodules.exe %_DEST%\bin%_EXT%\pango-querymodules.exe
+..\%__SRC%\bin\pango-querymodules.exe %_DEST%\bin%_EXT%\pango-querymodules.exe



Mime
View raw message