diff options
Diffstat (limited to 'gdk-pixbuf')
| -rw-r--r-- | gdk-pixbuf/gdk-pixbuf-2.23.0-win32.patch | 459 | ||||
| -rw-r--r-- | gdk-pixbuf/gdk-pixbuf-2.23.0.patch | 171 | ||||
| -rw-r--r-- | gdk-pixbuf/makefile.mk | 124 | ||||
| -rw-r--r-- | gdk-pixbuf/prj/build.lst | 3 | ||||
| -rwxr-xr-x | gdk-pixbuf/prj/d.lst | 20 |
5 files changed, 777 insertions, 0 deletions
diff --git a/gdk-pixbuf/gdk-pixbuf-2.23.0-win32.patch b/gdk-pixbuf/gdk-pixbuf-2.23.0-win32.patch new file mode 100644 index 000000000000..142ea346f2d0 --- /dev/null +++ b/gdk-pixbuf/gdk-pixbuf-2.23.0-win32.patch @@ -0,0 +1,459 @@ +--- misc/gdk-pixbuf-2.23.0/config.h.win32 2011-03-24 04:59:07.000000000 +0100 ++++ misc/build/gdk-pixbuf-2.23.0/config.h.win32 2011-03-22 01:58:24.296875000 +0100 +@@ -1 +1,126 @@ +-dummy ++/* config.h.in. Generated from configure.ac by autoheader. */ ++ ++/* Define to 1 if translation of program messages to the user's native ++ language is requested. */ ++#undef ENABLE_NLS ++ ++/* Define if gio can sniff image data */ ++#undef GDK_PIXBUF_USE_GIO_MIME ++ ++/* The prefix for our gettext translation domains. */ ++#define GETTEXT_PACKAGE "intl.dll" ++ ++/* Define to 1 if you have the `bind_textdomain_codeset' function. */ ++#undef HAVE_BIND_TEXTDOMAIN_CODESET ++ ++/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the ++ CoreFoundation framework. */ ++#undef HAVE_CFLOCALECOPYCURRENT ++ ++/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in ++ the CoreFoundation framework. */ ++#undef HAVE_CFPREFERENCESCOPYAPPVALUE ++ ++/* Define if the GNU dcgettext() function is already present or preinstalled. ++ */ ++#undef HAVE_DCGETTEXT ++ ++/* Define to 1 if you have the <dlfcn.h> header file. */ ++#undef HAVE_DLFCN_H ++ ++/* Define if the GNU gettext() function is already present or preinstalled. */ ++#define HAVE_GETTEXT 1 ++ ++/* Define if you have the iconv() function and it works. */ ++#define HAVE_ICONV 1 ++ ++/* Define to 1 if you have the <inttypes.h> header file. */ ++#undef HAVE_INTTYPES_H ++ ++/* Define to 1 if you have the <memory.h> header file. */ ++#undef HAVE_MEMORY_H ++ ++/* Define to 1 is libjpeg supports progressive JPEG */ ++#define HAVE_PROGRESSIVE_JPEG 1 ++ ++/* Define to 1 if sigsetjmp is available */ ++#undef HAVE_SIGSETJMP ++ ++/* Define to 1 if you have the <stdint.h> header file. */ ++#undef HAVE_STDINT_H ++ ++/* Define to 1 if you have the <stdlib.h> header file. */ ++#define HAVE_STDLIB_H 1 ++ ++/* Define to 1 if you have the <strings.h> header file. */ ++#define HAVE_STRINGS_H 1 ++ ++/* Define to 1 if you have the <string.h> header file. */ ++#undef HAVE_STRING_H ++ ++/* Define to 1 if you have the <sys/stat.h> header file. */ ++#undef HAVE_SYS_STAT_H ++ ++/* Define to 1 if sys/sysinfo.h is available */ ++#undef HAVE_SYS_SYSINFO_H ++ ++/* Define to 1 if sys/systeminfo.h is available */ ++#undef HAVE_SYS_SYSTEMINFO_H ++ ++/* Define to 1 if you have the <sys/types.h> header file. */ ++#undef HAVE_SYS_TYPES_H ++ ++/* 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 ++ ++/* Define to 1 if your C compiler doesn't accept -c and -o together. */ ++#undef NO_MINUS_C_MINUS_O ++ ++/* Define to the address where bug reports for this package should be sent. */ ++#undef PACKAGE_BUGREPORT ++ ++/* Define to the full name of this package. */ ++#undef PACKAGE_NAME ++ ++/* Define to the full name and version of this package. */ ++#undef PACKAGE_STRING ++ ++/* 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 ++ ++/* Define to 1 if you have the ANSI C header files. */ ++#undef STDC_HEADERS ++ ++/* Define to 1 if gmodule works and should be used */ ++#undef USE_GMODULE ++ ++/* Whether to load modules via .la files rather than directly */ ++#undef USE_LA_MODULES ++ ++/* Define to 1 if medialib is available and should be used */ ++#undef USE_MEDIALIB ++ ++/* Define to 1 if medialib 2.5 is available */ ++#undef USE_MEDIALIB25 ++ ++/* Define to 1 if XXM is available and should be used */ ++#undef USE_MMX ++ ++/* Number of bits in a file offset, on hosts where this is settable. */ ++#undef _FILE_OFFSET_BITS ++ ++/* Define for large files, on AIX-style hosts. */ ++#undef _LARGE_FILES ++ ++/* Define to empty if `const' does not conform to ANSI C. */ ++#undef const +--- misc/gdk-pixbuf-2.23.0/gdk-pixbuf/io-png.c 2010-07-10 02:54:35.000000000 +0200 ++++ misc/build/gdk-pixbuf-2.23.0/gdk-pixbuf/io-png.c 2011-03-22 02:18:55.515625000 +0100 +@@ -27,6 +27,7 @@ + #include <stdio.h> + #include <stdlib.h> + #include <png.h> ++#include <pngstruct.h> + #include "gdk-pixbuf-private.h" + + +@@ -183,7 +184,7 @@ + error_msg); + } + +- longjmp (png_save_ptr->jmpbuf, 1); ++ longjmp (png_save_ptr->png_jmpbuf, 1); + } + + static void +@@ -287,7 +288,7 @@ + return NULL; + } + +- if (setjmp (png_ptr->jmpbuf)) { ++ if (setjmp (png_ptr->png_jmpbuf)) { + g_free (rows); + + if (pixbuf) +@@ -459,7 +460,7 @@ + return NULL; + } + +- if (setjmp (lc->png_read_ptr->jmpbuf)) { ++ if (setjmp (lc->png_read_ptr->png_jmpbuf)) { + if (lc->png_info_ptr) + png_destroy_read_struct(&lc->png_read_ptr, NULL, NULL); + g_free(lc); +@@ -531,7 +532,7 @@ + lc->error = error; + + /* Invokes our callbacks as needed */ +- if (setjmp (lc->png_read_ptr->jmpbuf)) { ++ if (setjmp (lc->png_read_ptr->png_jmpbuf)) { + lc->error = NULL; + return FALSE; + } else { +@@ -769,7 +770,7 @@ + error_msg); + } + +- longjmp (png_read_ptr->jmpbuf, 1); ++ longjmp (png_read_ptr->png_jmpbuf, 1); + } + + static void +@@ -978,7 +979,7 @@ + success = FALSE; + goto cleanup; + } +- if (setjmp (png_ptr->jmpbuf)) { ++ if (setjmp (png_ptr->png_jmpbuf)) { + success = FALSE; + goto cleanup; + } +--- misc/gdk-pixbuf-2.23.0/gdk-pixbuf/makefile.msc 2010-06-25 23:40:10.000000000 +0200 ++++ misc/build/gdk-pixbuf-2.23.0/gdk-pixbuf/makefile.msc 2011-03-24 06:13:30.515625000 +0100 +@@ -1,9 +1,19 @@ +-TOP = ..\.. + PRJ_TOP = .. ++GLIB_TOP = + PACKAGE = gdk_pixbuf + PKG_VER = $(GDK_PIXBUF_VER) ++GLIB_INC = -I$(OUTDIR)\inc\external\glib-2.0 ++LIBPNG_INC = -I$(OUTDIR)\inc\external\libpng ++LIBJPEG_INC = -I$(OUTDIR)\inc\external\libjpeg ++ ++INTL_LIB = $(OUTDIR)\lib\intl.lib ++GLIB_LIB = $(OUTDIR)\lib\glib-2.0.lib $(OUTDIR)\lib\gobject-2.0.lib $(OUTDIR)\lib\gmodule-2.0.lib $(OUTDIR)\lib\gio-2.0.lib $(OUTDIR)\lib\gthread-2.0.lib ++LIBJPEG_LIB = $(OUTDIR)\lib\jpeg.lib ++LIBPNG_LIB = $(OUTDIR)\lib\libpng.lib ++ZLIB_LIB = $(OUTDIR)\lib\zlib.lib ++GDIPLUS_LIB = gdiplus.lib + +-!INCLUDE $(TOP)/glib/build/win32/make.msc ++!INCLUDE $(OUTDIR)\inc\external\glib-2.0\make.msc + + !IFNDEF PERL + PERL = perl +@@ -13,22 +23,22 @@ + + # -DINCLUDE_gdiplus _replaces_ -DINCLUDE_bmp -DINCLUDE_gif -DINCLUDE_ico -DINCLUDE_jpeg -DINCLUDE_tiff + # but not yet -DINCLUDE_png +-##USEGDIP=1 ++USEGDIP=1 + # to get _working_ include modules we need respective defines ... + # + BUILT_IN_FORMATS = \ + !IFDEF USEGDIP + -DINCLUDE_gdiplus \ + !ELSE +- -DINCLUDE_bmp -DINCLUDE_gif -DINCLUDE_ico -DINCLUDE_jpeg -DINCLUDE_tiff \ ++ -DINCLUDE_bmp -DINCLUDE_gif -DINCLUDE_ico -DINCLUDE_jpeg \ + !ENDIF + -DINCLUDE_png \ + -DINCLUDE_xpm -DINCLUDE_wbmp \ + -DINCLUDE_pnm -DINCLUDE_ras + +-PKG_CFLAGS = -FImsvc_recommended_pragmas.h \ ++PKG_CFLAGS = -FI$(PRJ_TOP)\msvc_recommended_pragmas.h \ + !IFNDEF USEGDIP +- $(JPEG_CFLAGS) $(TIFF_CFLAGS) \ ++ $(JPEG_CFLAGS) \ + !ENDIF + -I. -I.. $(GLIB_CFLAGS) \ + $(BUILT_IN_FORMATS) \ +@@ -39,13 +49,14 @@ + -UUSE_GMODULE # use built-in + # -DUSE_GMODULE -DPIXBUF_LIBDIR=\".\" + +-PKG_LINK = $(GLIB_LIBS) \ +-!IFNDEF USEGDIP +- $(TIFF_LIBS) $(JPEG_LIBS) \ +-!ENDIF +- $(PNG_LIBS) $(INTL_LIBS) \ +- pixops\pixops.lib \ +- ++PKG_LINK = $(INTL_LIB) \ ++ $(GLIB_LIB) \ ++ $(LIBPNG_LIB) \ ++ $(LIBJPEG_LIB) \ ++ $(ZLIB_LIB) \ ++ $(GDIPLUS_LIB) \ ++ pixops\pixops.lib ++ + OBJECTS_NON_NATIVE = \ + io-bmp.obj \ + io-gif.obj \ +@@ -95,13 +106,13 @@ + gdk-pixbuf-transform.h + + gdk-pixbuf-marshal.h: gdk-pixbuf-marshal.list +- ..\..\glib\gobject\glib-genmarshal --prefix=_gdk_pixbuf_marshal gdk-pixbuf-marshal.list --header >gdk-pixbuf-marshal.h ++ $(OUTDIR)\bin\glib-genmarshal --prefix=_gdk_pixbuf_marshal gdk-pixbuf-marshal.list --header >gdk-pixbuf-marshal.h + + gdk-pixbuf-marshal.c: gdk-pixbuf-marshal.h gdk-pixbuf-marshal.list +- ..\..\glib\gobject\glib-genmarshal --prefix=_gdk_pixbuf_marshal gdk-pixbuf-marshal.list --body >gdk-pixbuf-marshal.c ++ $(OUTDIR)\bin\glib-genmarshal --prefix=_gdk_pixbuf_marshal gdk-pixbuf-marshal.list --body >gdk-pixbuf-marshal.c + +-gdk-pixbuf-alias.h: gdk-pixbuf.symbols +- perl makegdkpixbufalias.pl < gdk-pixbuf.symbols > gdk-pixbuf-alias.h ++#gdk-pixbuf-alias.h: gdk-pixbuf.symbols ++# perl makegdkpixbufalias.pl < gdk-pixbuf.symbols > gdk-pixbuf-alias.h + + gdk_pixbuf.def: gdk-pixbuf.symbols makefile.msc + echo EXPORTS > gdk_pixbuf.def +@@ -109,14 +120,15 @@ + -DG_GNUC_MALLOC= -DG_GNUC_CONST= -DG_GNUC_NULL_TERMINATED= -DG_GNUC_NORETURN= -DG_GNUC_PRINTF=;G_GNUC_PRINTF \ + gdk-pixbuf.symbols >> gdk_pixbuf.def + +-gdk-pixbuf-aliasdef.c: gdk-pixbuf.symbols +- perl makegdkpixbufalias.pl -def < gdk-pixbuf.symbols > gdk-pixbuf-aliasdef.c ++#gdk-pixbuf-aliasdef.c: gdk-pixbuf.symbols ++# perl makegdkpixbufalias.pl -def < gdk-pixbuf.symbols > gdk-pixbuf-aliasdef.c + + ## common stuff + + INSTALL = copy + +-CFLAGS = -I. -DHAVE_CONFIG_H ++CFLAGS = -I. $(SOLARINC) $(GLIB_INC) $(LIBPNG_INC) $(LIBJPEG_INC) \ ++ -DHAVE_CONFIG_H -DGDK_PIXBUF_LOCALEDIR="\"locale_dummy\"" + + sub-pixops : + cd pixops +@@ -126,19 +138,19 @@ + ## targets + all : \ + $(PRJ_TOP)\config.h \ +- gdk-pixbuf-alias.h \ +- gdk-pixbuf-aliasdef.c \ ++# gdk-pixbuf-alias.h \ ++# gdk-pixbuf-aliasdef.c \ + gdk-pixbuf-marshal.h \ + gdk-pixbuf-marshal.c \ + sub-pixops \ + lib$(PACKAGE)-$(PKG_VER)-0.dll \ +- $(PACKAGE)-$(PKG_VER)s.lib \ ++ $(PACKAGE)-$(PKG_VER)s.lib + # make-inline-pixbuf.exe \ +- gdk-pixbuf-csource.exe \ +- test-gdk-pixbuf.exe ++# gdk-pixbuf-csource.exe \ ++# test-gdk-pixbuf.exe + + $(PACKAGE).res : $(PACKAGE).rc +- rc -DBUILDNUMBER=0 -r -fo $(PACKAGE).res $(PACKAGE).rc ++ rc -I $(SOLARINCLUDES) -DBUILDNUMBER=0 -r -fo $(PACKAGE).res $(PACKAGE).rc + + $(PACKAGE)-$(PKG_VER)s.lib : $(OBJECTS) + lib /out:$(PACKAGE)-$(PKG_VER)s.lib $(OBJECTS) pixops\pixops.lib +@@ -160,7 +172,7 @@ + # gdk-pixbuf-enum-types.h + # + gdk-pixbuf-enum-types.h : $(gdk_pixbuf_headers) makefile.msc +- $(PERL) $(GLIB)\gobject\glib-mkenums \ ++ perl $(OUTDIR)\bin\glib-mkenums \ + --fhead "#ifndef __GDK_PIXBUF__ENUM_TYPES_H__\n#define __GDK_PIXBUF_ENUM_TYPES_H__\n" \ + --fprod "/* enumerations from \"@filename@\" */\n" \ + --vhead "GType @enum_name@_get_type (void);\n#define GDK_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \ +@@ -171,8 +183,8 @@ + # gdk-pixbuf-enum-types.c + # + gdk-pixbuf-enum-types.c: $(gdk_pixbuf_headers) makefile.msc +- $(PERL) $(GLIB)\gobject\glib-mkenums \ +- --fhead "#include <gdk-pixbuf/gdk-pixbuf.h>" \ ++ perl $(OUTDIR)\bin\glib-mkenums \ ++ --fhead "#include <gdk-pixbuf.h>" \ + --fprod "\n/* enumerations from \"@filename@\" */" \ + --vhead "GType\n@enum_name@_get_type (void)\n{\n static GType etype = 0;\n if (etype == 0) {\n static const G@Type@Value values[] = {" \ + --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \ +@@ -188,10 +200,10 @@ + $(CC) $(CFLAGS) -GD -c $(PKG_CFLAGS) $< + + clean:: +- del config.h +- del gdk-pixbuf-marshal.h +- del gdk-pixbuf-marshal.c +- del gdk-pixbuf-alaias.h ++ rm config.h ++ rm gdk-pixbuf-marshal.h ++ rm gdk-pixbuf-marshal.c ++ rm gdk-pixbuf-alaias.h + + + +--- misc/gdk-pixbuf-2.23.0/gdk-pixbuf/pixops/makefile.msc 2010-06-25 23:40:10.000000000 +0200 ++++ misc/build/gdk-pixbuf-2.23.0/gdk-pixbuf/pixops/makefile.msc 2011-03-24 06:03:59.062500000 +0100 +@@ -1,10 +1,11 @@ +-TOP = ../../.. +-PACKAGE = pixops + PRJ_TOP = ..\.. ++PACKAGE = pixops ++GLIB_TOP = ++GLIB_INC = -I$(OUTDIR)\inc\external\glib-2.0 + +-!INCLUDE $(TOP)/glib/build/win32/make.msc ++!INCLUDE $(OUTDIR)\inc\external\glib-2.0\make.msc + +-PKG_CFLAGS = -I.. $(GLIB_CFLAGS) ++PKG_CFLAGS = -I.. $(SOLARINC) $(GLIB_INC) $(GLIB_CFLAGS) + + OBJECTS = \ + pixops.obj \ +@@ -50,16 +51,16 @@ + $(CC) $(CFLAGS) -GD -c $(PKG_CFLAGS) $< + + clean:: +- del config.h +- del *.exe +- del *.obj +- del *.dll +- del *.lib +- del *.err +- del *.map +- del *.sym +- del *.exp +- del *.lk1 +- del *.mk1 +- del *.pdb +- del *.ilk ++ rm config.h ++ rm *.exe ++ rm *.obj ++ rm *.dll ++ rm *.lib ++ rm *.err ++ rm *.map ++ rm *.sym ++ rm *.exp ++ rm *.lk1 ++ rm *.mk1 ++ rm *.pdb ++ rm *.ilk +--- misc/gdk-pixbuf-2.23.0/gdk-pixbuf/pixops/pixops.c 2010-06-25 23:40:10.000000000 +0200 ++++ misc/build/gdk-pixbuf-2.23.0/gdk-pixbuf/pixops/pixops.c 2011-03-22 01:58:24.281250000 +0100 +@@ -21,7 +21,7 @@ + */ + #include "config.h" + #include <math.h> +-#include <glib.h> ++#include <glib-2.0\glib.h> + + #include "pixops.h" + #include "pixops-internal.h" +--- misc/gdk-pixbuf-2.23.0/msvc_recommended_pragmas.h 2011-03-24 04:59:07.625000000 +0100 ++++ misc/build/gdk-pixbuf-2.23.0/msvc_recommended_pragmas.h 2011-03-22 01:58:24.359375000 +0100 +@@ -1 +1,31 @@ +-dummy ++#ifndef _MSC_VER ++#pragma error "This header is for Microsoft VC only." ++#endif /* _MSC_VER */ ++ ++/* Make MSVC more pedantic, this is a recommended pragma list ++ * from _Win32_Programming_ by Rector and Newcomer. ++ */ ++#pragma warning(error:4002) /* too many actual parameters for macro */ ++#pragma warning(error:4003) /* not enough actual parameters for macro */ ++#pragma warning(1:4010) /* single-line comment contains line-continuation character */ ++#pragma warning(error:4013) /* 'function' undefined; assuming extern returning int */ ++#pragma warning(1:4016) /* no function return type; using int as default */ ++#pragma warning(error:4020) /* too many actual parameters */ ++#pragma warning(error:4021) /* too few actual parameters */ ++#pragma warning(error:4027) /* function declared without formal parameter list */ ++#pragma warning(error:4029) /* declared formal parameter list different from definition */ ++#pragma warning(error:4033) /* 'function' must return a value */ ++#pragma warning(error:4035) /* 'function' : no return value */ ++#pragma warning(error:4045) /* array bounds overflow */ ++#pragma warning(error:4047) /* different levels of indirection */ ++#pragma warning(error:4049) /* terminating line number emission */ ++#pragma warning(error:4053) /* An expression of type void was used as an operand */ ++#pragma warning(error:4071) /* no function prototype given */ ++#pragma warning(disable:4101) /* unreferenced local variable */ ++#pragma warning(error:4150) ++ ++#pragma warning(disable:4244) /* No possible loss of data warnings */ ++#pragma warning(disable:4305) /* No truncation from int to char warnings */ ++ ++/* work around Microsoft's premature attempt to deprecate the C-Library */ ++#pragma warning(disable:4996) /* This function or variable may be unsafe. */ diff --git a/gdk-pixbuf/gdk-pixbuf-2.23.0.patch b/gdk-pixbuf/gdk-pixbuf-2.23.0.patch new file mode 100644 index 000000000000..fccd992da74f --- /dev/null +++ b/gdk-pixbuf/gdk-pixbuf-2.23.0.patch @@ -0,0 +1,171 @@ +--- misc/gdk-pixbuf-2.23.0/configure 2010-12-23 15:18:11.000000000 +0100 ++++ misc/build/gdk-pixbuf-2.23.0/configure 2011-06-14 15:20:05.000000000 +0200 +@@ -16839,7 +16839,7 @@ + + + +- ++if false; then + + if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + if test -n "$ac_tool_prefix"; then +@@ -17158,14 +17158,18 @@ + + + rm -f conf.glibtest +- ++else ++ GLIB_MKENUMS=glib-mkenums ++ GLIB_GENMARSHAL=glib-genmarshal ++ GOBJECT_QUERY=gobject-query ++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_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 @@ + + #include "config.h" + #include <string.h> ++#ifdef ENABLE_NLS + #include <libintl.h> ++#endif + + #include "gdk-pixbuf-transform.h" + #include "gdk-pixbuf-private.h" +@@ -336,15 +338,19 @@ + const gchar * + gdk_pixbuf_gettext (const gchar *msgid) + { ++#ifdef ENABLE_NLS + static gsize gettext_initialized = FALSE; + + if (G_UNLIKELY (g_once_init_enter (&gettext_initialized))) { + bindtextdomain (GETTEXT_PACKAGE, GDK_PIXBUF_LOCALEDIR); + #ifdef HAVE_BIND_TEXTDOMAIN_CODESET + bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); + #endif + g_once_init_leave (&gettext_initialized, TRUE); + } + + return g_dgettext (GETTEXT_PACKAGE, msgid); ++#else ++ return msgid; ++#endif + } +From: Maarten Bosmans <mkbosmans@gmail.com> +Date: Mon, 24 Jan 2011 10:39:22 +0000 +Subject: Use png_jmpbuf macro + +This makes the png loader compatible with libpng 1.5 + +diff --git a/gdk-pixbuf/io-png.c b/gdk-pixbuf/io-png.c +index 79c81fd..76f3304 100644 +--- misc/build/gdk-pixbuf-2.23.0/gdk-pixbuf/io-png.c ++++ misc/build/gdk-pixbuf-2.23.0/gdk-pixbuf/io-png.c +@@ -183,7 +183,7 @@ png_simple_error_callback(png_structp png_save_ptr, + error_msg); + } + +- longjmp (png_save_ptr->jmpbuf, 1); ++ longjmp (png_jmpbuf (png_save_ptr), 1); + } + + static void +@@ -287,7 +287,7 @@ gdk_pixbuf__png_image_load (FILE *f, GError **error) + return NULL; + } + +- if (setjmp (png_ptr->jmpbuf)) { ++ if (setjmp (png_jmpbuf (png_ptr))) { + g_free (rows); + + if (pixbuf) +@@ -459,7 +459,7 @@ gdk_pixbuf__png_image_begin_load (GdkPixbufModuleSizeFunc size_func, + return NULL; + } + +- if (setjmp (lc->png_read_ptr->jmpbuf)) { ++ if (setjmp (png_jmpbuf (lc->png_read_ptr))) { + if (lc->png_info_ptr) + png_destroy_read_struct(&lc->png_read_ptr, NULL, NULL); + g_free(lc); +@@ -531,7 +531,7 @@ gdk_pixbuf__png_image_load_increment(gpointer context, + lc->error = error; + + /* Invokes our callbacks as needed */ +- if (setjmp (lc->png_read_ptr->jmpbuf)) { ++ if (setjmp (png_jmpbuf (lc->png_read_ptr))) { + lc->error = NULL; + return FALSE; + } else { +@@ -769,7 +769,7 @@ png_error_callback(png_structp png_read_ptr, + error_msg); + } + +- longjmp (png_read_ptr->jmpbuf, 1); ++ longjmp (png_jmpbuf (png_read_ptr), 1); + } + + static void +@@ -978,7 +978,7 @@ static gboolean real_save_png (GdkPixbuf *pixbuf, + success = FALSE; + goto cleanup; + } +- if (setjmp (png_ptr->jmpbuf)) { ++ if (setjmp (png_jmpbuf (png_ptr))) { + success = FALSE; + goto cleanup; + } diff --git a/gdk-pixbuf/makefile.mk b/gdk-pixbuf/makefile.mk new file mode 100644 index 000000000000..74f32012f63a --- /dev/null +++ b/gdk-pixbuf/makefile.mk @@ -0,0 +1,124 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +PRJ=. + +PRJNAME=gdk-pixbuf +TARGET=so_gdk-pixbuf + +# --- Settings ----------------------------------------------------- + +.INCLUDE : settings.mk + +.IF "$(SYSTEM_GDKPIXBUF)" == "YES" +all: + @echo "An already available installation of gdk-pixbuf should exist on your system." + @echo "Therefore the version provided here does not need to be built in addition." +.ENDIF + +# --- Files -------------------------------------------------------- + +GDKPIXBUFVERSION=2.23.0 + +TARFILE_NAME=$(PRJNAME)-$(GDKPIXBUFVERSION) +TARFILE_MD5=a7d6c5f2fe2d481149ed3ba807b5c043 + +.IF "$(OS)"=="MACOSX" + +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_LIBS=" " \ + GDK_PIXBUF_XLIB_DEP_CFLAGS="-I$(SOLARINCDIR)$/external -I$(SOLARINCDIR)$/external/glib-2.0" \ + GDK_PIXBUF_XLIB_DEP_LIBS=" " \ + ./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) + +EXTRPATH=LOADER +OUT2LIB+=gdk-pixbuf/.libs/libgdk_pixbuf-2.0.0.dylib + +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 + +.ELIF "$(OS)"=="WNT" + +PATCH_FILES=gdk-pixbuf-2.23.0-win32.patch +ADDITIONAL_FILES=config.h.win32 glib-mkenums.pl msvc_recommended_pragmas.h +CONFIGURE_DIR= +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 + +.ELSE + +.ENDIF + +# --- Targets ------------------------------------------------------ + +.INCLUDE : set_ext.mk +.INCLUDE : target.mk +.INCLUDE : tg_ext.mk diff --git a/gdk-pixbuf/prj/build.lst b/gdk-pixbuf/prj/build.lst new file mode 100644 index 000000000000..550466a7b9ed --- /dev/null +++ b/gdk-pixbuf/prj/build.lst @@ -0,0 +1,3 @@ +gp gdk-pixbuf : glib gettext jpeg libpng soltools NULL +gp gdk-pixbuf usr1 - all gp_mkout NULL +gp gdk-pixbuf nmake - all gp_gdk-pixbuf NULL diff --git a/gdk-pixbuf/prj/d.lst b/gdk-pixbuf/prj/d.lst new file mode 100755 index 000000000000..a6dac87058e5 --- /dev/null +++ b/gdk-pixbuf/prj/d.lst @@ -0,0 +1,20 @@ +mkdir: %_DEST%\inc\external +mkdir: %_DEST%\inc\external\gdk-pixbuf-2.0 +mkdir: %_DEST%\inc\external\gdk-pixbuf-2.0\gdk-pixbuf + +..\%__SRC%\inc\gdk-pixbuf-animation.h %_DEST%\inc\external\gdk-pixbuf-2.0\gdk-pixbuf\gdk-pixbuf-animation.h +..\%__SRC%\inc\gdk-pixbuf-features.h %_DEST%\inc\external\gdk-pixbuf-2.0\gdk-pixbuf\gdk-pixbuf-features.h +..\%__SRC%\inc\gdk-pixbuf-marshal.h %_DEST%\inc\external\gdk-pixbuf-2.0\gdk-pixbuf\gdk-pixbuf-marshal.h +..\%__SRC%\inc\gdk-pixbuf.h %_DEST%\inc\external\gdk-pixbuf-2.0\gdk-pixbuf\gdk-pixbuf.h +..\%__SRC%\inc\gdk-pixbuf-core.h %_DEST%\inc\external\gdk-pixbuf-2.0\gdk-pixbuf\gdk-pixbuf-core.h +..\%__SRC%\inc\gdk-pixbuf-io.h %_DEST%\inc\external\gdk-pixbuf-2.0\gdk-pixbuf\gdk-pixbuf-io.h +..\%__SRC%\inc\gdk-pixbuf-simple-anim.h %_DEST%\inc\external\gdk-pixbuf-2.0\gdk-pixbuf\gdk-pixbuf-simple-anim.h +..\%__SRC%\inc\gdk-pixdata.h %_DEST%\inc\external\gdk-pixbuf-2.0\gdk-pixbuf\gdk-pixdata.h +..\%__SRC%\inc\gdk-pixbuf-enum-types.h %_DEST%\inc\external\gdk-pixbuf-2.0\gdk-pixbuf\gdk-pixbuf-enum-types.h +..\%__SRC%\inc\gdk-pixbuf-loader.h %_DEST%\inc\external\gdk-pixbuf-2.0\gdk-pixbuf\gdk-pixbuf-loader.h +..\%__SRC%\inc\gdk-pixbuf-transform.h %_DEST%\inc\external\gdk-pixbuf-2.0\gdk-pixbuf\gdk-pixbuf-transform.h + +..\%__SRC%\lib\libgdk_pixbuf-2.0.0.dylib %_DEST%\lib\libgdk_pixbuf-2.0.0.dylib +symlink: %_DEST%\lib\libgdk_pixbuf-2.0.0.dylib %_DEST%\lib\libgdk_pixbuf-2.0.dylib +..\%__SRC%\bin\*.dll %_DEST%\bin +..\%__SRC%\lib\gdk_pixbuf-2.0.lib %_DEST%\lib\gdk_pixbuf-2.0.lib |