Hello community, here is the log from the commit of package libgdiplus0 for openSUSE:Factory checked in at 2013-03-17 10:07:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libgdiplus0 (Old) and /work/SRC/openSUSE:Factory/.libgdiplus0.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libgdiplus0", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/libgdiplus0/libgdiplus0.changes 2012-11-12 13:31:02.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libgdiplus0.new/libgdiplus0.changes 2013-03-17 10:07:06.000000000 +0100 @@ -1,0 +2,18 @@ +Fri Mar 15 15:30:21 UTC 2013 - [email protected] + +- license update: (LGPL-2.1+ or MPL-1.1) and MIT + Avoid confusion + +------------------------------------------------------------------- +Wed Mar 13 09:19:49 UTC 2013 - [email protected] + +- fix build with giflib-5.x (libgdiplus0-giflib5.patch) + +------------------------------------------------------------------- +Sat Mar 9 07:39:31 UTC 2013 - [email protected] + +- update to 2.10.9 + * http://www.go-mono.com/archive/2.10.9 +- add devel package + +------------------------------------------------------------------- Old: ---- libgdiplus-2.10.tar.bz2 New: ---- libgdiplus-2.10.9.tar.bz2 libgdiplus0-giflib5.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libgdiplus0.spec ++++++ --- /var/tmp/diff_new_pack.uWCCIs/_old 2013-03-17 10:07:08.000000000 +0100 +++ /var/tmp/diff_new_pack.uWCCIs/_new 2013-03-17 10:07:08.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libgdiplus0 # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,20 +21,22 @@ %define system_cairo 0 Name: libgdiplus0 -Version: 2.10 +Version: 2.10.9 Release: 0 Url: http://go-mono.org/ Source0: %{real_name}-%{version}.tar.bz2 # link to libpng15.patch content sent to [email protected] Patch0: %{name}-libpng15.patch +Patch1: libgdiplus0-giflib5.patch Summary: Open Source Implementation of the GDI+ API -License: LGPL-2.1+ or MPL-1.1 and MIT +License: (LGPL-2.1+ or MPL-1.1) and MIT Group: Development/Libraries/Other BuildRoot: %{_tmppath}/%{name}-%{version}-build -Obsoletes: libgdiplus-devel -Provides: libgdiplus-devel -Obsoletes: libgdiplus Provides: libgdiplus +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: libtool +BuildRequires: pkg-config %if %system_cairo BuildRequires: cairo-devel >= 1.6.4 %endif @@ -50,50 +52,53 @@ BuildRequires: xorg-x11-libXrender-devel %description -This is part of the Mono project. It is required when using -Windows.Forms. +Mono library that provide a GDI+ comptible API on non-Windows +operating systems. - - -Authors: --------- - Alexandre Pigolkine - Duncan Mak - Jordi Mas - Miguel de Icaza - Ravindra Kumar - -%files -%defattr(-, root, root) -%_libdir/libgdiplus.so* -%doc AUTHORS COPYING ChangeLog* NEWS README +%package -n libgdiplus-devel +Summary: Development files for libgdiplus +Group: Development/Libraries/C and C++ +Requires: libgdiplus0 = %{version} +Provides: pkgconfig(libgdiplus) + +%description -n libgdiplus-devel +This library is part of the Mono project. It is required when +using System.Drawing. %prep %setup -q -n %{real_name}-%{version} %patch0 +%patch1 -p1 +sed -i -e 's/LT_/LTT_/g' cairo/configure.in +sed -i -e 's:ungif:gif:g' configure || die %build -export CFLAGS="$RPM_OPT_FLAGS" +autoreconf -fiv +%{?env_options} %configure make %install make install DESTDIR=%{buildroot} -# Unwanted files: -rm -f %{buildroot}%{_libdir}/libgdiplus.a -rm -f %{buildroot}%{_libdir}/libgdiplus.la -# Factory checks .pc files for dependencies now -# We may consider leaving this in a -devel package instead -rm -f %{buildroot}%{_libdir}/pkgconfig/libgdiplus.pc -# Remove generic non-usefull INSTALL file... (appeases -# suse rpmlint checks, saves 3kb) -find . -name INSTALL | xargs rm -f -%clean -rm -rf %{buildroot} +# Remove generic non-usefull INSTALL file... +# (appeases suse rpmlint checks, saves 3kb) +find . -name INSTALL | xargs rm -f %post -p /sbin/ldconfig %postun -p /sbin/ldconfig +%files +%defattr(-, root, root) +%{_libdir}/libgdiplus.so* +%doc AUTHORS COPYING ChangeLog* NEWS README + +%files -n libgdiplus-devel +%defattr(-, root, root) +%{_libdir}/pkgconfig/libgdiplus.pc +%{_libdir}/libgdiplus.a +# Unwanted statically linked files: +%exclude %{_libdir}/libgdiplus.la + %changelog ++++++ libgdiplus-2.10.tar.bz2 -> libgdiplus-2.10.9.tar.bz2 ++++++ ++++ 98513 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libgdiplus-2.10/cairo/config.h.in new/libgdiplus-2.10.9/cairo/config.h.in --- old/libgdiplus-2.10/cairo/config.h.in 2011-01-13 23:43:07.000000000 +0100 +++ new/libgdiplus-2.10.9/cairo/config.h.in 2012-01-31 18:28:04.000000000 +0100 @@ -1,8 +1,5 @@ /* config.h.in. Generated from configure.in by autoheader. */ -/* Define if building universal (internal helper macro) */ -#undef AC_APPLE_UNIVERSAL_BUILD - /* whether Cairo needs memory barriers around atomic ops */ #undef CAIRO_ATOMIC_OP_NEEDS_MEMORY_BARRIER @@ -56,6 +53,9 @@ /* Define to 1 if you have the `drand48' function. */ #undef HAVE_DRAND48 +/* Define to 1 if you have the `FcFini' function. */ +#undef HAVE_FCFINI + /* FT_Bitmap_Size structure includes y_ppem field */ #undef HAVE_FT_BITMAP_SIZE_Y_PPEM @@ -131,10 +131,6 @@ /* Define to 1 if you have the <windows.h> header file. */ #undef HAVE_WINDOWS_H -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ -#undef LT_OBJDIR - /* Name of package */ #undef PACKAGE @@ -163,17 +159,9 @@ attribute */ #undef WARN_UNUSED_RESULT -/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most - significant byte first (like Motorola and SPARC, unlike Intel). */ -#if defined AC_APPLE_UNIVERSAL_BUILD -# if defined __BIG_ENDIAN__ -# define WORDS_BIGENDIAN 1 -# endif -#else -# ifndef WORDS_BIGENDIAN -# undef WORDS_BIGENDIAN -# endif -#endif +/* Define to 1 if your processor stores words with the most significant byte + first (like Motorola and SPARC, unlike Intel and VAX). */ +#undef WORDS_BIGENDIAN /* Deal with multiple architecture compiles on Mac OS X */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libgdiplus-2.10/config.h.in new/libgdiplus-2.10.9/config.h.in --- old/libgdiplus-2.10/config.h.in 2011-01-13 23:42:56.000000000 +0100 +++ new/libgdiplus-2.10.9/config.h.in 2012-01-31 18:28:34.000000000 +0100 @@ -103,6 +103,9 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME +/* Define to the home page for this package. */ +#undef PACKAGE_URL + /* Define to the version of this package. */ #undef PACKAGE_VERSION diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libgdiplus-2.10/configure.in new/libgdiplus-2.10.9/configure.in --- old/libgdiplus-2.10/configure.in 2011-01-13 23:28:19.000000000 +0100 +++ new/libgdiplus-2.10.9/configure.in 2012-01-31 18:27:38.000000000 +0100 @@ -1,7 +1,7 @@ AC_INIT(README) AC_CANONICAL_SYSTEM AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(libgdiplus,2.10) +AM_INIT_AUTOMAKE(libgdiplus,2.10.9) AM_MAINTAINER_MODE AM_PROG_LIBTOOL @@ -94,10 +94,6 @@ GDIPLUS_LIBS="$GDIPLUS_LIBS $FONTCONFIG_LIBS $FREETYPE2_LIBS" GDIPLUS_CFLAGS="$GDIPLUS_CFLAGS $FONTCONFIG_CFLAGS $FREETYPE2_CFLAGS" -# Add xrender here so that we don't fail to find glib if we won't have xrender.pc -GDIPLUS_LIBS="$GDIPLUS_LIBS `pkg-config --libs xrender `" -GDIPLUS_CFLAGS="$GDIPLUS_CFLAGS `pkg-config --cflags xrender `" - AC_CHECK_HEADERS(byteswap.h) AC_MSG_CHECKING([host threading settings]) @@ -137,6 +133,7 @@ AC_DEFINE_UNQUOTED(OSX,1,[OS X]) CFLAGS="-no-cpp-precomp $CFLAGS" LDFLAGS="-flat_namespace -undefined suppress $LDFLAGS" + no_x=yes ;; *) @@ -145,6 +142,12 @@ ;; esac +# Add xrender here so that we don't fail to find glib if we won't have xrender.pc +if test "x$no_x" != "xyes"; then + GDIPLUS_LIBS="$GDIPLUS_LIBS `pkg-config --libs xrender `" + GDIPLUS_CFLAGS="$GDIPLUS_CFLAGS `pkg-config --cflags xrender `" +fi + # Apparently for BSD special handling needs to happen # See http://archives/neohapsis.com/archives/openbsd/2001-11/2142.html # by Miod Vallat <[email protected]> @@ -212,39 +215,20 @@ fi -AC_ARG_WITH(libjpeg, - [AC_HELP_STRING([--without-libjpeg], [disable JPEG file IO])]) -AC_ARG_WITH(libtiff, - [AC_HELP_STRING([--without-libtiff], [disable TIFF file IO])]) -AC_ARG_WITH(libgif, - [AC_HELP_STRING([--without-libgif], [disable GIF file IO])]) AC_ARG_WITH(libexif, [AC_HELP_STRING([--without-libexif], [disable EXIF support])]) -dnl Test for libtiff - if test x$with_libtiff != xno && test -z "$LIBTIFF"; then - AC_CHECK_LIB(tiff, TIFFReadScanline, - [AC_CHECK_HEADER(tiffio.h, - TIFF='tiff'; LIBTIFF='-ltiff', - AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***))], - [AC_CHECK_LIB(tiff, TIFFWriteScanline, - [AC_CHECK_HEADER(tiffio.h, - TIFF='tiff'; LIBTIFF='-ltiff -ljpeg -lz', - AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***))], - [AC_CHECK_LIB(tiff34, TIFFFlushData, - [AC_CHECK_HEADER(tiffio.h, - TIFF='tiff'; LIBTIFF='-ltiff34 -ljpeg -lz', - AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***))], - AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF library not found) ***), -lz -lm)], -ljpeg -lz -lm)], -lm) - fi - -if test x$TIFF != x; then - GDIPLUS_LIBS="$GDIPLUS_LIBS $LIBTIFF" - AC_DEFINE(HAVE_LIBTIFF, 1, Define if tiff support is available) -fi +dnl Test for libjpeg (this needs to be checked before libtiff, since libtiff depends on libjpeg) +AC_ARG_WITH([libjpeg], + AS_HELP_STRING([--with-libjpeg=PREFIX], + [Prefix where libjpeg is installed, or 'no' to disable]), + [libjpeg_prefix="$withval"], [libjpeg_prefix="${prefix}"]) -dnl Test for libjpeg if test x$with_libjpeg != xno && test -z "$LIBJPEG"; then + JPEG_CFLAGS="-I${libjpeg_prefix}/include" + JPEG_LIBS="-L${libjpeg_prefix}/lib" + save_cflags=$CFLAGS; CFLAGS=$JPEG_CFLAGS + save_libs=$LIBS; LIBS=$JPEG_LIBS AC_CHECK_LIB(jpeg, jpeg_destroy_decompress, jpeg_ok=yes, jpeg_ok=no @@ -261,66 +245,124 @@ jpeg_ok=no) AC_MSG_RESULT($jpeg_ok) if test "$jpeg_ok" = yes; then - JPEG='jpeg'; LIBJPEG='-ljpeg' + JPEG='jpeg'; LIBJPEG='-L${libjpeg_prefix}/lib -ljpeg' else AC_MSG_WARN(*** JPEG loader will not be built (JPEG header file not found) ***) fi fi + CFLAGS=$save_cflags + LIBS=$save_libs fi if test x$JPEG != x; then GDIPLUS_LIBS="$GDIPLUS_LIBS $LIBJPEG" AC_DEFINE(HAVE_LIBJPEG, 1, Define if jpeg support is available) +else + jpeg_ok="no (Get it from http://freshmeat.net/projects/libjpeg)" +fi + +dnl Test for libtiff +AC_ARG_WITH([libtiff], + AS_HELP_STRING([--with-libtiff=PREFIX], + [Prefix where libtiff is installed, or 'no' to disable]), + [libtiff_prefix="$withval"], [libtiff_prefix="${prefix}"]) + + if test x$with_libtiff != xno && test -z "$LIBTIFF"; then + TIFF_CFLAGS="-I${libjpeg_prefix}/include -I${libtiff_prefix}/include" + TIFF_LIBS="-L${libjpeg_prefix}/lib -L${libtiff_prefix}/lib" + save_cflags=$CFLAGS; CFLAGS=$TIFF_CFLAGS + save_libs=$LIBS; LIBS=$TIFF_LIBS + AC_CHECK_LIB(tiff, TIFFReadScanline, + [AC_CHECK_HEADER(tiffio.h, + TIFF='tiff'; LIBTIFF='-ltiff'; tiff_ok=yes, + AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***))], + [AC_CHECK_LIB(tiff, TIFFWriteScanline, + [AC_CHECK_HEADER(tiffio.h, + TIFF='tiff'; LIBTIFF='-ltiff -ljpeg -lz'; tiff_ok=yes, + AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***))], + [AC_CHECK_LIB(tiff34, TIFFFlushData, + [AC_CHECK_HEADER(tiffio.h, + TIFF='tiff'; LIBTIFF='-ltiff34 -ljpeg -lz'; tiff_ok=yes, + AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***))], + AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF library not found) ***), -lz -lm)], -ljpeg -lz -lm)], -lm) + CFLAGS=$save_cflags + LIBS=$save_libs + fi + +if test x$TIFF != x; then + GDIPLUS_LIBS="$GDIPLUS_LIBS $LIBTIFF" + AC_DEFINE(HAVE_LIBTIFF, 1, Define if tiff support is available) +else + tiff_ok="no (Get it from http://www.libtiff.org/)" fi dnl Test for libgif or libungif +AC_ARG_WITH([libgif], + AS_HELP_STRING([--with-libgif=PREFIX], + [Prefix where libgif is installed, or 'no' to disable]), + [libgif_prefix="$withval"], [libgif_prefix="${prefix}"]) + if test x$with_libgif != xno && test -z "$LIBGIF"; then + GIF_CFLAGS="-I${libgif_prefix}/include" + GIF_LIBS="-L${libgif_prefix}/lib" + save_cflags=$CFLAGS; CFLAGS=$GIF_CFLAGS + save_libs=$LIBS; LIBS=$GIF_LIBS AC_CHECK_LIB(gif, DGifOpenFileName, [AC_CHECK_HEADER(gif_lib.h, - GIF='gif'; LIBGIF='-lgif', + GIF='gif'; LIBGIF='-lgif'; gif_ok=yes, AC_MSG_WARN(*** GIF loader will not be built (giflibrary not found) ***))], AC_MSG_WARN(*** GIF loader will not be built (giflibrary not found) ***)) AC_CHECK_LIB(ungif, DGifOpenFileName, [AC_CHECK_HEADER(gif_lib.h, - GIF='ungif'; LIBGIF='-lungif', + GIF='ungif'; LIBGIF='-lungif'; gif_ok=yes, AC_MSG_WARN(*** GIF loader will not be built (ungiflibrary not found) ***))], AC_MSG_WARN(*** GIF loader will not be built (ungiflibrary not found) ***)) + CFLAGS=$save_cflags + LIBS=$save_libs fi if test x$GIF != x; then GDIPLUS_LIBS="$GDIPLUS_LIBS $LIBGIF" AC_DEFINE(HAVE_LIBGIF, 1, Define if gif support is available) +else + gif_ok="no (See http://sourceforge.net/projects/libgif)" fi dnl Test for libpng - AC_MSG_CHECKING(for libpng12) - if $PKG_CONFIG --exists libpng12 ; then + AC_MSG_CHECKING(for libpng14) + if $PKG_CONFIG --exists libpng14 ; then + AC_MSG_RESULT(yes) + PNG='png' + PNG_DEP_CFLAGS_PACKAGES=libpng14 + LIBPNG=`$PKG_CONFIG --libs libpng14` + else + AC_MSG_CHECKING(for libpng12) + if $PKG_CONFIG --exists libpng12 ; then AC_MSG_RESULT(yes) PNG='png' - PNG_DEP_CFLAGS_PACKAGES=libpng12 - LIBPNG=`$PKG_CONFIG --libs libpng12` - else - AC_MSG_RESULT(no) - AC_CHECK_LIB(png, png_read_info, - [AC_CHECK_HEADER(png.h, - png_ok=yes, - png_ok=no)], - AC_MSG_ERROR(*** libpng12 not found. See http://www.libpng.org/pub/png/libpng.html.), -lz -lm) - if test "$png_ok" = yes; then - AC_MSG_CHECKING([for png_structp in png.h]) - AC_TRY_COMPILE([#include <png.h>], - [png_structp pp; png_infop info; png_colorp cmap; png_create_read_struct;], - png_ok=yes, - png_ok=no) - AC_MSG_RESULT($png_ok) + PNG_DEP_CFLAGS_PACKAGES=libpng12 + LIBPNG=`$PKG_CONFIG --libs libpng12` + else + AC_MSG_RESULT(no) + AC_CHECK_LIB(png, png_read_info, + [AC_CHECK_HEADER(png.h, png_ok=yes, png_ok=no)], + AC_MSG_ERROR(*** libpng12 not found. See http://www.libpng.org/pub/png/libpng.html.), -lz -lm) if test "$png_ok" = yes; then - PNG='png'; LIBPNG='-lpng -lz' + AC_MSG_CHECKING([for png_structp in png.h]) + AC_TRY_COMPILE([#include <png.h>], + [png_structp pp; png_infop info; png_colorp cmap; png_create_read_struct;], + png_ok=yes, + png_ok=no) + AC_MSG_RESULT($png_ok) + if test "$png_ok" = yes; then + PNG='png'; LIBPNG='-lpng -lz' + else + AC_MSG_ERROR(*** libpng12 found, but it is too old. See http://www.libpng.org/pub/png/libpng.html.) + fi else - AC_MSG_ERROR(*** libpng12 found, but it is too old. See http://www.libpng.org/pub/png/libpng.html.) + AC_MSG_ERROR(*** libpng12 not found. See http://www.libpng.org/pub/png/libpng.html.) fi - else - AC_MSG_ERROR(*** libpng12 not found. See http://www.libpng.org/pub/png/libpng.html.) fi fi @@ -378,13 +420,10 @@ echo " * EXIF tags = $libexif_pkgconfig" echo " * Codecs supported:" echo "" -echo $ECHO_N " - TIFF: " -test ! x$TIFF = x && echo yes || echo "no (Get it from http://www.libtiff.org/)" -echo $ECHO_N " - JPEG: " -test ! x$JPEG = x && echo yes || echo "no (Get it from http://freshmeat.net/projects/libjpeg)" -echo $ECHO_N " - GIF: " -test ! x$GIF = x && echo yes || echo "no (See http://sourceforge.net/projects/libgif)" -echo $ECHO_N " - PNG: yes" +echo " - TIFF: $tiff_ok" +echo " - JPEG: $jpeg_ok" +echo " - GIF: $gif_ok" +echo " - PNG: yes" echo "" echo " NOTE: if any of the above say 'no' you may install the" echo " corresponding development packages for them, rerun" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libgdiplus-2.10/missing new/libgdiplus-2.10.9/missing --- old/libgdiplus-2.10/missing 2009-02-21 08:11:21.000000000 +0100 +++ new/libgdiplus-2.10.9/missing 2010-12-09 00:19:43.000000000 +0100 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2006-05-10.23 +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <[email protected]>, 1996. # This program is free software; you can redistribute it and/or modify @@ -18,9 +18,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program. If not, see <http://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -89,6 +87,9 @@ tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] +Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and +\`g' are ignored when checking the name. + Send bug reports to <[email protected]>." exit $? ;; @@ -106,15 +107,22 @@ esac +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect -# the program). +# the program). This is about non-GNU programs, so use $1 not +# $program. case $1 in - lex|yacc) + lex*|yacc*) # Not GNU programs, they don't have --version. ;; - tar) + tar*) if test -n "$run"; then echo 1>&2 "ERROR: \`tar' requires --run" exit 1 @@ -138,7 +146,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case $1 in +case $program in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -148,7 +156,7 @@ touch aclocal.m4 ;; - autoconf) + autoconf*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the @@ -157,7 +165,7 @@ touch configure ;; - autoheader) + autoheader*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want @@ -187,7 +195,7 @@ while read f; do touch "$f"; done ;; - autom4te) + autom4te*) echo 1>&2 "\ WARNING: \`$1' is needed, but is $msg. You might have modified some files without having the @@ -210,7 +218,7 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package @@ -240,7 +248,7 @@ fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package @@ -263,7 +271,7 @@ fi ;; - help2man) + help2man*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the @@ -277,11 +285,11 @@ else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) + makeinfo*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file @@ -310,7 +318,7 @@ touch $file ;; - tar) + tar*) shift # We have already tried tar in the generic part. @@ -363,5 +371,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libgdiplus-2.10/pixman/config.h.in new/libgdiplus-2.10.9/pixman/config.h.in --- old/libgdiplus-2.10/pixman/config.h.in 2011-01-13 23:43:02.000000000 +0100 +++ new/libgdiplus-2.10.9/pixman/config.h.in 2012-01-31 18:28:04.000000000 +0100 @@ -1,8 +1,5 @@ /* config.h.in. Generated from configure.ac by autoheader. */ -/* Define if building universal (internal helper macro) */ -#undef AC_APPLE_UNIVERSAL_BUILD - /* Define to 1 if you have the <dlfcn.h> header file. */ #undef HAVE_DLFCN_H @@ -36,10 +33,6 @@ /* Define to 1 if you have the <unistd.h> header file. */ #undef HAVE_UNISTD_H -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ -#undef LT_OBJDIR - /* Name of package */ #undef PACKAGE @@ -73,14 +66,6 @@ /* Version number of package */ #undef VERSION -/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most - significant byte first (like Motorola and SPARC, unlike Intel). */ -#if defined AC_APPLE_UNIVERSAL_BUILD -# if defined __BIG_ENDIAN__ -# define WORDS_BIGENDIAN 1 -# endif -#else -# ifndef WORDS_BIGENDIAN -# undef WORDS_BIGENDIAN -# endif -#endif +/* Define to 1 if your processor stores words with the most significant byte + first (like Motorola and SPARC, unlike Intel and VAX). */ +#undef WORDS_BIGENDIAN diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libgdiplus-2.10/src/font.c new/libgdiplus-2.10.9/src/font.c --- old/libgdiplus-2.10/src/font.c 2011-01-13 23:28:19.000000000 +0100 +++ new/libgdiplus-2.10.9/src/font.c 2011-12-14 03:47:19.000000000 +0100 @@ -649,6 +649,18 @@ gdip_get_cairo_font_face (GpFont *font) { if (!font->cairofnt) { +#if CAIRO_HAS_QUARTZ_FONT + FcPattern *pattern = FcPatternBuild ( + NULL, + FC_FAMILY, FcTypeString, font->face, + FC_SLANT, FcTypeInteger, ((font->style & FontStyleItalic) ? FC_SLANT_ITALIC : FC_SLANT_ROMAN), + FC_WEIGHT, FcTypeInteger, ((font->style & FontStyleBold) ? FC_WEIGHT_BOLD : FC_WEIGHT_MEDIUM), + NULL); + + font->cairofnt = cairo_ft_font_face_create_for_pattern (pattern); + cairo_font_face_reference (font->cairofnt); + FcPatternDestroy (pattern); +#else cairo_surface_t *surface = cairo_image_surface_create_for_data ((BYTE*)NULL, CAIRO_FORMAT_ARGB32, 0, 0, 0); font->cairo = cairo_create (surface); @@ -658,6 +670,8 @@ font->cairofnt = cairo_get_font_face (font->cairo); cairo_font_face_reference (font->cairofnt); cairo_surface_destroy (surface); +#endif + } return font->cairofnt; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libgdiplus-2.10/src/gifcodec.c new/libgdiplus-2.10.9/src/gifcodec.c --- old/libgdiplus-2.10/src/gifcodec.c 2011-01-13 23:28:19.000000000 +0100 +++ new/libgdiplus-2.10.9/src/gifcodec.c 2011-12-02 18:23:12.000000000 +0100 @@ -595,9 +595,8 @@ gdip_bitmap_dispose (result); } - FreeExtensionMono(&global_extensions); - if (gif != NULL) { + FreeExtensionMono (&global_extensions); DGifCloseFile (gif); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libgdiplus-2.10/src/graphics.c new/libgdiplus-2.10.9/src/graphics.c --- old/libgdiplus-2.10/src/graphics.c 2011-01-13 23:28:19.000000000 +0100 +++ new/libgdiplus-2.10.9/src/graphics.c 2012-01-30 23:23:51.000000000 +0100 @@ -208,8 +208,6 @@ return result; } -#ifdef CAIRO_HAS_XLIB_SURFACE - // coverity[+alloc : arg-*1] GpStatus GdipCreateFromHDC (void *hDC, GpGraphics **graphics) @@ -233,7 +231,8 @@ if (clone->type == gtMemoryBitmap) return GdipGetImageGraphicsContext (clone->image, graphics); - + +#ifdef CAIRO_HAS_XLIB_SURFACE XGetGeometry (clone->display, clone->drawable, &root, &x, &y, &w, &h, &border_w, &depth); @@ -255,6 +254,9 @@ (*graphics)->display = clone->display; return Ok; +#endif + + return NotImplemented; } GpStatus @@ -263,8 +265,6 @@ return NotImplemented; } -#endif - #ifdef CAIRO_HAS_QUARTZ_SURFACE // coverity[+alloc : arg-*3] GpStatus diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libgdiplus-2.10/src/tiffcodec.c new/libgdiplus-2.10.9/src/tiffcodec.c --- old/libgdiplus-2.10/src/tiffcodec.c 2011-01-13 23:28:19.000000000 +0100 +++ new/libgdiplus-2.10.9/src/tiffcodec.c 2011-12-02 18:23:12.000000000 +0100 @@ -219,6 +219,7 @@ uint32 rows_per_strip; uint32 tile_length; uint32 tile_width; + uint16 compression = 0; samples_per_pixel = 0; bits_per_sample = 0; @@ -269,6 +270,7 @@ } if (TIFFGetField(tiff, TIFFTAG_COMPRESSION, &s)) { + compression = s; gdip_bitmapdata_property_add_short(bitmap_data, PropertyTagCompression, s); } @@ -393,8 +395,10 @@ gdip_bitmapdata_property_add_short(bitmap_data, PropertyTagPlanarConfig, planar_configuration); } - if (TIFFGetField(tiff, TIFFTAG_PREDICTOR, &s)) { - gdip_bitmapdata_property_add_short(bitmap_data, PropertyTagPredictor, s); + if (compression == COMPRESSION_ADOBE_DEFLATE) { + if (TIFFGetField(tiff, TIFFTAG_PREDICTOR, &s)) { + gdip_bitmapdata_property_add_short(bitmap_data, PropertyTagPredictor, s); + } } { ++++++ libgdiplus0-giflib5.patch ++++++ diff --git a/src/gifcodec.c b/src/gifcodec.c index 8dee0eb..564beed 100644 --- a/src/gifcodec.c +++ b/src/gifcodec.c @@ -39,8 +39,10 @@ GUID gdip_gif_image_format_guid = {0xb96b3cb0U, 0x0728U, 0x11d3U, {0x9d, 0x7b, 0 #include "gifcodec.h" +#if GIFLIB_MAJOR < 5 /* giflib declares this incorrectly as EgifOpen */ extern GifFileType *EGifOpen(void *userData, OutputFunc writeFunc); +#endif /* Data structure used for callback */ typedef struct @@ -105,7 +107,7 @@ gdip_gif_inputfunc (GifFileType *gif, GifByteType *data, int len) */ static int -AddExtensionBlockMono(SavedImage *New, int Len, BYTE ExtData[]) +AddExtensionBlockMono(SavedImage *New, int Len, int func, BYTE ExtData[]) { ExtensionBlock *ep; @@ -129,7 +131,7 @@ AddExtensionBlockMono(SavedImage *New, int Len, BYTE ExtData[]) if (ExtData) { memcpy(ep->Bytes, ExtData, Len); - ep->Function = New->Function; + ep->Function = func; } return (GIF_OK); @@ -232,20 +234,20 @@ DGifSlurpMono(GifFileType * GifFile, SavedImage *TrailingExtensions) } case EXTENSION_RECORD_TYPE: { - if (DGifGetExtension(GifFile, &temp_save.Function, &ExtData) == GIF_ERROR) { + int func; + if (DGifGetExtension(GifFile, &func, &ExtData) == GIF_ERROR) { return (GIF_ERROR); } while (ExtData != NULL) { /* Create an extension block with our data */ - if (AddExtensionBlockMono(&temp_save, ExtData[0], &ExtData[1]) == GIF_ERROR) { + if (AddExtensionBlockMono(&temp_save, func, ExtData[0], &ExtData[1]) == GIF_ERROR) { return (GIF_ERROR); } if (DGifGetExtensionNext(GifFile, &ExtData) == GIF_ERROR) { return (GIF_ERROR); } - temp_save.Function = 0; } break; } @@ -303,12 +305,19 @@ gdip_load_gif_image (void *stream, GpImage **image, BOOL from_file) result = NULL; loop_counter = FALSE; +#if GIFLIB_MAJOR < 5 if (from_file) { gif = DGifOpen(stream, &gdip_gif_fileinputfunc); } else { gif = DGifOpen (stream, &gdip_gif_inputfunc); } - +#else + if (from_file) + gif = DGifOpen(stream, &gdip_gif_fileinputfunc, NULL); + else + gif = DGifOpen(stream, &gdip_gif_inputfunc, NULL); +#endif + if (gif == NULL) { goto error; } @@ -660,11 +669,22 @@ gdip_save_gif_image (void *stream, GpImage *image, BOOL from_file) return InvalidParameter; } +#if GIFLIB_MAJOR < 5 if (from_file) { fp = EGifOpenFileName (stream, 0); } else { fp = EGifOpen (stream, gdip_gif_outputfunc); } +#else + if (from_file) + fp = EGifOpenFileName (stream, 0, NULL); + else + fp = EGifOpen (stream, gdip_gif_outputfunc, NULL); +#define MakeMapObject GifMakeMapObject +#define FreeMapObject GifFreeMapObject +#define QuantizeBuffer GifQuantizeBuffer +#define BitSize GifBitSize +#endif if (!fp) { return FileNotFound; @@ -848,8 +868,15 @@ gdip_save_gif_image (void *stream, GpImage *image, BOOL from_file) Buffer[0] = 1; Buffer[1] = ptr[0]; Buffer[2] = ptr[1]; +#if GIFLIB_MAJOR < 5 EGifPutExtensionFirst(fp, APPLICATION_EXT_FUNC_CODE, 11, "NETSCAPE2.0"); EGifPutExtensionLast(fp, APPLICATION_EXT_FUNC_CODE, 3, Buffer); +#else + EGifPutExtensionLeader(fp, APPLICATION_EXT_FUNC_CODE); + EGifPutExtensionBlock(fp, 11, "NETSCAPE2.0"); + EGifPutExtensionBlock(fp, 3, Buffer); + EGifPutExtensionTrailer(fp); +#endif } } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
