Skip to content

C
core
Kaydet (Commit) cc850798 authored tarafından Fridrich Štrba's avatar Fridrich Štrba
Dosyalara gözat
Seçenekler

Upgrading internal cairo/pixman (phase 1)

üst 5e57d6d5
Hide whitespace changes
Inline Side-by-side
Showing with 285 additions and 392 deletions
cairo/cairo-1.10.2.ios.patch 0 → 100644
Dosyayı görüntüle @ cc850798
--- misc/cairo-1.10.2/configure 2011-12-16 10:02:39.626077757 +0100
+++ misc/build/cairo-1.10.2/configure 2011-12-16 10:02:23.518237109 +0100
@@ -22766,11 +22766,13 @@
ac_fn_c_check_header_mongrel "$LINENO" "ApplicationServices/ApplicationServices.h" "ac_cv_header_ApplicationServices_ApplicationServices_h" "$ac_includes_default"
+if false; then
if test "x$ac_cv_header_ApplicationServices_ApplicationServices_h" = x""yes; then :
else
use_quartz="no (requires ApplicationServices framework)"
fi
+fi
if test "x$use_quartz" != "xyes" ; then
--- misc/cairo-1.10.2/src/cairo-quartz.h 2011-12-16 10:02:39.639079241 +0100
+++ misc/build/cairo-1.10.2/src/cairo-quartz.h 2011-12-16 10:01:18.404789245 +0100
@@ -40,7 +40,7 @@
#if CAIRO_HAS_QUARTZ_SURFACE
-#include <ApplicationServices/ApplicationServices.h>
+#include <CoreGraphics/CoreGraphics.h>
CAIRO_BEGIN_DECLS
cairo/cairo-1.8.0.no-atsui.patch → cairo/cairo-1.10.2.no-atsui.patch
Dosyayı görüntüle @ cc850798
--- misc/build/cairo-1.8.0.org/src/cairo-quartz.h --- misc/cairo-1.10.2/src/cairo-quartz-font.c 2010-12-25 15:21:34.000000000 +0100
+++ misc/build/cairo-1.8.0/src/cairo-quartz.h +++ misc/build/cairo-1.10.2/src/cairo-quartz-font.c 2011-12-16 09:54:18.672445207 +0100
@@ -66,8 +66,12 @@ @@ -777,7 +777,7 @@
cairo_public cairo_font_face_t * return ffont->cgFont;
cairo_quartz_font_face_create_for_cgfont (CGFontRef font);
+#if 0
+
cairo_public cairo_font_face_t *
cairo_quartz_font_face_create_for_atsu_font_id (ATSUFontID font_id);
+
+#endif /* 0 */
#endif /* CAIRO_HAS_QUARTZ_FONT */
--- misc/build/cairo-1.8.0.org/src/cairo-quartz-font.c
+++ misc/build/cairo-1.8.0/src/cairo-quartz-font.c
@@ -766,6 +766,8 @@
} }
-#ifndef __LP64__
+#if 0 +#if 0
+
/* /*
* compat with old ATSUI backend * compat with old ATSUI backend
*/ */
@@ -808,3 +808,5 @@ --- misc/cairo-1.10.2/src/cairo-quartz.h 2010-06-18 13:47:13.000000000 +0200
{ +++ misc/build/cairo-1.10.2/src/cairo-quartz.h 2011-12-16 09:52:53.081501547 +0100
return cairo_quartz_font_face_create_for_atsu_font_id (font_id); @@ -66,7 +66,7 @@
} cairo_public cairo_font_face_t *
+ cairo_quartz_font_face_create_for_cgfont (CGFontRef font);
+#endif /* 0 */
-#ifndef __LP64__
+#if 0
cairo_public cairo_font_face_t *
cairo_quartz_font_face_create_for_atsu_font_id (ATSUFontID font_id);
#endif
cairo/cairo-1.10.2.patch 0 → 100644
Dosyayı görüntüle @ cc850798
--- misc/cairo-1.10.2/build/Makefile.win32.common 2009-06-14 23:53:24.000000000 +0200
+++ misc/build/cairo-1.10.2/build/Makefile.win32.common 2011-12-16 11:49:42.998709720 +0100
@@ -22,8 +22,8 @@
OPT := -MD -O2
endif
-PIXMAN_CFLAGS := -I$(top_srcdir)/../pixman/pixman
-PIXMAN_LIBS := $(top_builddir)/../pixman/pixman/$(CFG)/pixman-1.lib
+PIXMAN_CFLAGS := -I../../../../inc
+PIXMAN_LIBS := ../../../../lib/pixman-1.lib
CAIRO_LIBS = gdi32.lib msimg32.lib user32.lib
ifeq ($(CAIRO_HAS_PNG_FUNCTIONS),1)
@@ -33,13 +33,15 @@
ifeq ($(CAIRO_HAS_PS_SURFACE)$(CAIRO_HAS_PDF_SURFACE),00)
else
ZLIB_CFLAGS += -I$(top_srcdir)/../zlib/
-CAIRO_LIBS += $(top_builddir)/../zlib/zdll.lib
+CAIRO_LIBS += $(top_builddir)/../zlib/zlib.lib
endif
DEFAULT_CFLAGS = -nologo $(MS_MDFLAGS) $(OPT)
DEFAULT_CFLAGS += -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE
DEFAULT_CFLAGS += -I. -I$(top_srcdir)
DEFAULT_CFLAGS += $(PIXMAN_CFLAGS) $(LIBPNG_CFLAGS) $(ZLIB_CFLAGS)
+DEFAULT_CFLAGS += $(SOLARINC)
+DEFAULT_CFLAGS += -I$(SOLARVER)/$(INPATH)/inc/zlib -I$(SOLARVER)/$(INPATH)/inc/external/libpng -DZLIB_FIX
CAIRO_CFLAGS = $(DEFAULT_CFLAGS) $(CFLAGS)
@@ -61,7 +63,7 @@
$(CFG)/%.obj: %.c
@mkdir -p $(CFG)
- @$(CC) $(CAIRO_CFLAGS) -c -Fo"$@" $<
+ $(CC) $(CAIRO_CFLAGS) -c -Fo"$@" $<
$(CFG)/%-static.obj: %.c
@mkdir -p $(CFG)
--- misc/cairo-1.10.2/build/Makefile.win32.features 2010-08-18 09:47:30.000000000 +0200
+++ misc/build/cairo-1.10.2/build/Makefile.win32.features 2011-12-16 11:50:50.600524156 +0100
@@ -30,7 +30,7 @@
CAIRO_HAS_FC_FONT=0
CAIRO_HAS_PS_SURFACE=1
CAIRO_HAS_PDF_SURFACE=1
-CAIRO_HAS_SVG_SURFACE=1
+CAIRO_HAS_SVG_SURFACE=0
CAIRO_HAS_TEST_SURFACES=0
CAIRO_HAS_TEE_SURFACE=0
CAIRO_HAS_XML_SURFACE=0
--- misc/cairo-1.10.2/build/config.sub 2009-08-14 23:33:32.000000000 +0200
+++ misc/build/cairo-1.10.2/build/config.sub 2011-12-16 11:53:38.935974163 +0100
@@ -1272,7 +1272,7 @@
| -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
| -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+ | -udi* | -androideabi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
| -chorusos* | -chorusrdb* | -cegcc* \
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
| -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
--- misc/cairo-1.10.2/configure 2010-12-25 15:22:57.000000000 +0100
+++ misc/build/cairo-1.10.2/configure 2011-12-16 12:15:47.141406809 +0100
@@ -19259,61 +19228,11 @@
rm -f confcache
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for compress in -lz" >&5
-$as_echo_n "checking for compress in -lz... " >&6; }
-if test "${ac_cv_lib_z_compress+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lz $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char compress ();
-int
-main ()
-{
-return compress ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_z_compress=yes
-else
- ac_cv_lib_z_compress=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_compress" >&5
-$as_echo "$ac_cv_lib_z_compress" >&6; }
-if test "x$ac_cv_lib_z_compress" = x""yes; then :
- ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
-if test "x$ac_cv_header_zlib_h" = x""yes; then :
-
have_libz=yes
$as_echo "#define HAVE_ZLIB 1" >>confdefs.h
-else
- have_libz="no (requires zlib http://www.gzip.org/zlib/)"
-fi
-
-
-else
- have_libz="no (requires zlib http://www.gzip.org/zlib/)"
-fi
-
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlsym in -ldl" >&5
$as_echo_n "checking for dlsym in -ldl... " >&6; }
if test "${ac_cv_lib_dl_dlsym+set}" = set; then :
@@ -26427,7 +26346,7 @@
if test "x$png_REQUIRES" = x; then
# libpng13 is GnuWin32's libpng-1.2.8 :-(
- for l in libpng libpng14 libpng12 libpng13 libpng10; do
+ for l in libpng libpng14 libpng12 libpng15 libpng13 libpng10; do
if $PKG_CONFIG --exists $l ; then
png_REQUIRES=$l
use_png=yes
--- misc/cairo-1.10.2/configure.ac 2010-12-13 17:30:14.000000000 +0100
+++ misc/build/cairo-1.10.2/configure.ac 2011-12-16 11:57:32.007884203 +0100
@@ -33,13 +33,8 @@
dnl ===========================================================================
-AC_CHECK_LIB(z, compress,
- [AC_CHECK_HEADER(zlib.h, [
have_libz=yes
AC_DEFINE(HAVE_ZLIB, 1, [Define to 1 if you have zlib available])
- ],
- [have_libz="no (requires zlib http://www.gzip.org/zlib/)"])],
- [have_libz="no (requires zlib http://www.gzip.org/zlib/)"])
AC_CHECK_LIB(dl, dlsym,
[have_dlsym=yes; have_dl=yes],
@@ -279,7 +271,7 @@
AC_ARG_VAR([png_REQUIRES], [module name for libpng to search for using pkg-config])
if test "x$png_REQUIRES" = x; then
# libpng13 is GnuWin32's libpng-1.2.8 :-(
- for l in libpng libpng14 libpng12 libpng13 libpng10; do
+ for l in libpng libpng14 libpng12 libpng15 libpng13 libpng10; do
if $PKG_CONFIG --exists $l ; then
png_REQUIRES=$l
use_png=yes
--- misc/cairo-1.10.2/src/cairo-deflate-stream.c 2010-06-18 13:47:12.000000000 +0200
+++ misc/build/cairo-1.10.2/src/cairo-deflate-stream.c 2011-12-16 11:48:52.381857312 +0100
@@ -37,7 +37,11 @@
#include "cairoint.h"
#include "cairo-error-private.h"
#include "cairo-output-stream-private.h"
+#ifdef ZLIB_FIX
+#include <zlib/zlib.h>
+#else
#include <zlib.h>
+#endif
#define BUFFER_SIZE 16384
--- misc/cairo-1.10.2/src/cairo-output-stream.c 2010-07-12 10:57:03.000000000 +0200
+++ misc/build/cairo-1.10.2/src/cairo-output-stream.c 2011-12-16 11:48:52.389858238 +0100
@@ -313,7 +313,11 @@
d = 0.0;
locale_data = localeconv ();
+#ifdef __ANDROID__
+ decimal_point = ".";
+#else
decimal_point = locale_data->decimal_point;
+#endif
decimal_point_len = strlen (decimal_point);
assert (decimal_point_len != 0);
--- misc/cairo-1.10.2/src/cairo-pdf-surface.c 2010-12-25 15:21:34.000000000 +0100
+++ misc/build/cairo-1.10.2/src/cairo-pdf-surface.c 2011-12-16 11:48:52.384857660 +0100
@@ -57,7 +57,11 @@
#include "cairo-type3-glyph-surface-private.h"
#include <time.h>
+#ifdef ZLIB_FIX
+#include <zlib/zlib.h>
+#else
#include <zlib.h>
+#endif
/* Issues:
*
--- misc/cairo-1.10.2/src/cairo-ps-surface.c 2010-12-25 15:21:34.000000000 +0100
+++ misc/build/cairo-1.10.2/src/cairo-ps-surface.c 2011-12-16 11:48:52.388858122 +0100
@@ -72,7 +72,11 @@
#include <stdio.h>
#include <ctype.h>
#include <time.h>
+#ifdef ZLIB_FIX
+#include <zlib/zlib.h>
+#else
#include <zlib.h>
+#endif
#include <errno.h>
#define DEBUG_PS 0
cairo/cairo-1.8.0.ios.patch deleted 100644 → 0
Dosyayı görüntüle @ 5e57d6d5
--- misc/build/cairo-1.8.0.org/src/cairo-quartz.h
+++ misc/build/cairo-1.8.0/src/cairo-quartz.h
@@ -40,7 +40,7 @@
#if CAIRO_HAS_QUARTZ_SURFACE
-#include <ApplicationServices/ApplicationServices.h>
+#include <CoreGraphics/CoreGraphics.h>
CAIRO_BEGIN_DECLS
--- misc/build/cairo-1.8.0.org/src/cairo-quartz-surface.c
+++ misc/build/cairo-1.8.0/src/cairo-quartz-surface.c
@@ -152,10 +152,6 @@
CGContextGetAllowsFontSmoothingPtr = dlsym(RTLD_DEFAULT, "CGContextGetAllowsFontSmoothing");
CGContextSetAllowsFontSmoothingPtr = dlsym(RTLD_DEFAULT, "CGContextSetAllowsFontSmoothing");
- if (Gestalt(gestaltSystemVersion, &_cairo_quartz_osx_version) != noErr) {
- // assume 10.4
- _cairo_quartz_osx_version = 0x1040;
- }
_cairo_quartz_symbol_lookup_done = TRUE;
}
@@ -2093,7 +2093,10 @@
yprev = yf;
}
- if (_cairo_quartz_osx_version >= 0x1050 && isClipping) {
+ if (0) {
+ /* Assume the bug mentioned below is not present in iOS,
+ * until proven otherwise.
+ */
/* If we're clipping, OSX 10.5 (at least as of 10.5.2) has a
* bug (apple bug ID #5834794) where the glyph
* advances/positions are not transformed by the text matrix
--- misc/build/cairo-1.8.0.org/configure
+++ misc/build/cairo-1.8.0/configure
@@ -29309,6 +29309,7 @@
quartz_NONPKGCONFIG_LIBS="$ac_env_quartz_NONPKGCONFIG_LIBS_value"
+if false; then
if test "${ac_cv_header_ApplicationServices_ApplicationServices_h+set}" = set; then
{ echo "$as_me:$LINENO: checking for ApplicationServices/ApplicationServices.h" >&5
echo $ECHO_N "checking for ApplicationServices/ApplicationServices.h... $ECHO_C" >&6; }
@@ -29444,6 +29444,7 @@
else
use_quartz="no (requires ApplicationServices framework)"
fi
+fi
if test "x$use_quartz" != "xyes" ; then
if test "${ac_cv_header_CoreGraphics_CoreGraphics_h+set}" = set; then
cairo/cairo-1.8.0.patch deleted 100644 → 0
Dosyayı görüntüle @ 5e57d6d5
diff -ur misc/build/cairo-1.8.0.org/build/Makefile.win32.common misc/build/cairo-1.8.0/build/Makefile.win32.common
--- misc/build/cairo-1.8.0.org/build/Makefile.win32.common 2008-09-25 14:36:35.000000000 +0300
+++ misc/build/cairo-1.8.0/build/Makefile.win32.common 2008-11-14 22:20:08.000000000 +0200
@@ -18,8 +18,8 @@
OPT := -O2
endif
-PIXMAN_CFLAGS := -I$(top_srcdir)/../pixman/pixman
-PIXMAN_LIBS := $(top_builddir)/../pixman/pixman/$(CFG)/pixman-1.lib
+PIXMAN_CFLAGS := -I../../../../inc
+PIXMAN_LIBS := ../../../../lib/pixman-1.lib
CAIRO_LIBS = gdi32.lib msimg32.lib user32.lib
ifeq ($(CAIRO_HAS_PNG_FUNCTIONS),1)
@@ -27,13 +27,15 @@
endif
ifeq ($(CAIRO_HAS_PS_SURFACE)$(CAIRO_HAS_PDF_SURFACE),00)
else
-CAIRO_LIBS += zdll.lib
+CAIRO_LIBS += zlib.lib
endif
DEFAULT_CFLAGS = -MD -nologo $(OPT)
DEFAULT_CFLAGS += -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE
DEFAULT_CFLAGS += -I. -I$(top_srcdir)
DEFAULT_CFLAGS += $(PIXMAN_CFLAGS)
+DEFAULT_CFLAGS += $(SOLARINC)
+DEFAULT_CFLAGS += -I$(SOLARVER)/$(INPATH)/inc/zlib -I$(SOLARVER)/$(INPATH)/inc/external/libpng -DZLIB_FIX
CAIRO_CFLAGS = $(DEFAULT_CFLAGS) $(CFLAGS)
@@ -55,7 +57,7 @@
$(CFG)/%.obj: %.c
@mkdir -p $(CFG)
- @$(CC) $(CAIRO_CFLAGS) -c -Fo"$@" $<
+ $(CC) $(CAIRO_CFLAGS) -c -Fo"$@" $<
$(CFG)/%-static.obj: %.c
@mkdir -p $(CFG)
diff -ur misc/build/cairo-1.8.0.org/build/Makefile.win32.features misc/build/cairo-1.8.0/build/Makefile.win32.features
--- misc/build/cairo-1.8.0.org/build/Makefile.win32.features 2008-09-25 02:15:49.000000000 +0300
+++ misc/build/cairo-1.8.0/build/Makefile.win32.features 2008-11-04 22:19:52.000000000 +0200
@@ -10,11 +10,11 @@
CAIRO_HAS_WIN32_FONT=1
CAIRO_HAS_OS2_SURFACE=0
CAIRO_HAS_BEOS_SURFACE=0
-CAIRO_HAS_PNG_FUNCTIONS=1
+CAIRO_HAS_PNG_FUNCTIONS=1
CAIRO_HAS_GLITZ_SURFACE=0
CAIRO_HAS_DIRECTFB_SURFACE=0
CAIRO_HAS_FT_FONT=0
CAIRO_HAS_PS_SURFACE=1
CAIRO_HAS_PDF_SURFACE=1
-CAIRO_HAS_SVG_SURFACE=1
+CAIRO_HAS_SVG_SURFACE=0
CAIRO_HAS_TEST_SURFACES=0
--- misc/build/cairo-1.8.0.org/build/config.sub
+++ misc/build/cairo-1.8.0/build/config.sub
@@ -1272,7 +1272,7 @@
| -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
| -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+ | -udi* | -androideabi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
| -chorusos* | -chorusrdb* \
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
| -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
diff -ur misc/build/cairo-1.8.0.org/configure misc/build/cairo-1.8.0/configure
--- misc/build/cairo-1.8.0.org/configure 2008-09-26 01:57:30.000000000 +0300
+++ misc/build/cairo-1.8.0/configure 2008-11-04 22:21:26.000000000 +0200
@@ -4397,7 +4397,7 @@
cygwin*)
# func_win32_libid is a shell function defined in ltmain.sh
- 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'
;;
@@ -4406,7 +4406,7 @@
# func_win32_libid shell function, so use a weaker test based on 'objdump',
# unless we find 'file', for example because we are cross-compiling.
if ( 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
lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
@@ -25304,19 +25304,39 @@
rm -f confcache
-{ echo "$as_me:$LINENO: checking for compress in -lz" >&5
-echo $ECHO_N "checking for compress in -lz... $ECHO_C" >&6; }
-if test "${ac_cv_lib_z_compress+set}" = set; then
+save_libs="$LIBS"
+LIBS="$LIBS $ZLIB3RDLIB"
+
+for ac_func in $COMPRESS
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lz $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
@@ -25324,11 +25344,18 @@
#ifdef __cplusplus
extern "C"
#endif
-char compress ();
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_$ac_func || defined __stub___$ac_func
+choke me
+#endif
+
int
main ()
{
-return compress ();
+return $ac_func ();
;
return 0;
}
@@ -25351,22 +25378,25 @@
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
- ac_cv_lib_z_compress=yes
+ eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_lib_z_compress=no
+ eval "$as_ac_var=no"
fi
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_z_compress" >&5
-echo "${ECHO_T}$ac_cv_lib_z_compress" >&6; }
-if test $ac_cv_lib_z_compress = yes; then
- if test "${ac_cv_header_zlib_h+set}" = set; then
+ac_res=`eval echo '${'$as_ac_var'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+ if test "${ac_cv_header_zlib_h+set}" = set; then
{ echo "$as_me:$LINENO: checking for zlib.h" >&5
echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6; }
if test "${ac_cv_header_zlib_h+set}" = set; then
@@ -25506,7 +25536,9 @@
else
have_libz="no (requires zlib http://www.gzip.org/zlib/)"
fi
+done
+LIBS="$save_libs"
{ echo "$as_me:$LINENO: checking for X" >&5
@@ -31723,7 +31723,7 @@
if test "x$png_REQUIRES" = x; then
# libpng13 is GnuWin32's libpng-1.2.8 :-(
- for l in libpng12 libpng13 libpng10 ; do
+ for l in libpng12 libpng13 libpng14 libpng15 libpng10 ; do
if $PKG_CONFIG --exists $l ; then
png_REQUIRES=$l
use_png=yes
@@ -34097,7 +34129,7 @@
# The ps backend requires zlib.
use_ps=$have_libz
- ps_NONPKGCONFIG_LIBS=-lz
+ ps_NONPKGCONFIG_LIBS=$ZLIB3RDLIB
cairo_cv_ps_use=$use_ps
cairo_cv_ps_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS"
@@ -34444,7 +34476,7 @@
# The pdf backend requires zlib.
use_pdf=$have_libz
- pdf_NONPKGCONFIG_LIBS=-lz
+ pdf_NONPKGCONFIG_LIBS=$ZLIB3RDLIB
cairo_cv_pdf_use=$use_pdf
cairo_cv_pdf_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS"
diff -ur misc/build/cairo-1.8.0.org/src/cairo-deflate-stream.c misc/build/cairo-1.8.0/src/cairo-deflate-stream.c
--- misc/build/cairo-1.8.0.org/src/cairo-deflate-stream.c 2008-09-25 13:03:43.000000000 +0300
+++ misc/build/cairo-1.8.0/src/cairo-deflate-stream.c 2008-11-14 22:21:00.000000000 +0200
@@ -36,7 +36,11 @@
#include "cairoint.h"
#include "cairo-output-stream-private.h"
+#ifdef ZLIB_FIX
+#include <zlib/zlib.h>
+#else
#include <zlib.h>
+#endif
#define BUFFER_SIZE 16384
diff -ur misc/build/cairo-1.8.0.org/src/cairo-pdf-surface.c misc/build/cairo-1.8.0/src/cairo-pdf-surface.c
--- misc/build/cairo-1.8.0.org/src/cairo-pdf-surface.c 2008-09-25 14:36:35.000000000 +0300
+++ misc/build/cairo-1.8.0/src/cairo-pdf-surface.c 2008-11-14 22:20:41.000000000 +0200
@@ -51,7 +51,11 @@
#include "cairo-type3-glyph-surface-private.h"
#include <time.h>
+#ifdef ZLIB_FIX
+#include <zlib/zlib.h>
+#else
#include <zlib.h>
+#endif
/* Issues:
*
diff -ur misc/build/cairo-1.8.0.org/src/cairo-ps-surface.c misc/build/cairo-1.8.0/src/cairo-ps-surface.c
--- misc/build/cairo-1.8.0.org/src/cairo-ps-surface.c 2008-09-25 14:36:35.000000000 +0300
+++ misc/build/cairo-1.8.0/src/cairo-ps-surface.c 2008-11-14 22:21:33.000000000 +0200
@@ -67,7 +67,11 @@
#include <stdio.h>
#include <ctype.h>
#include <time.h>
+#ifdef ZLIB_FIX
+#include <zlib/zlib.h>
+#else
#include <zlib.h>
+#endif
#include <errno.h>
#define DEBUG_PS 0
--- misc/build/cairo-1.8.0.org/src/cairo-output-stream.c
+++ misc/build/cairo-1.8.0/src/cairo-output-stream.c
@@ -281,7 +281,11 @@
d = 0.0;
locale_data = localeconv ();
+#ifdef __ANDROID__
+ decimal_point = ".";
+#else
decimal_point = locale_data->decimal_point;
+#endif
decimal_point_len = strlen (decimal_point);
assert (decimal_point_len != 0);
cairo/cairo/makefile.mk
Dosyayı görüntüle @ cc850798
...@@ -42,10 +42,10 @@ all: ...@@ -42,10 +42,10 @@ all:
# --- Files -------------------------------------------------------- # --- Files --------------------------------------------------------
CAIROVERSION=1.8.0 CAIROVERSION=1.10.2
TARFILE_NAME=$(PRJNAME)-$(CAIROVERSION) TARFILE_NAME=$(PRJNAME)-$(CAIROVERSION)
TARFILE_MD5=4ea70ea87b47e92d318d4e7f5b940f47 TARFILE_MD5=f101a9e88b783337b20b2e26dfd26d5f
PATCH_FILES=..$/$(TARFILE_NAME).patch PATCH_FILES=..$/$(TARFILE_NAME).patch
...@@ -55,7 +55,7 @@ PATCH_FILES+=..$/$(TARFILE_NAME).ios.patch ...@@ -55,7 +55,7 @@ PATCH_FILES+=..$/$(TARFILE_NAME).ios.patch
.ENDIF .ENDIF
cairo_CFLAGS=$(SOLARINC) cairo_CFLAGS=$(SOLARINC)
cairo_LDFLAGS=$(SOLARLIB) cairo_LDFLAGS=-L$(SOLARENV)$/$(OUTPATH)$/lib -L$(SOLARVER)$/$(INPATH)$/lib
cairo_CPPFLAGS= cairo_CPPFLAGS=
......
cairo/pixman-0.12.0.patch → cairo/pixman-0.24.0.patch
Dosyayı görüntüle @ cc850798
--- misc/build/pixman-0.12.0/config.sub --- misc/pixman-0.24.0/Makefile.in 2011-11-06 22:11:25.000000000 +0100
+++ misc/build/pixman-0.12.0/config.sub +++ misc/build/pixman-0.24.0/Makefile.in 2011-12-16 09:06:45.317211035 +0100
@@ -1272,7 +1272,7 @@ @@ -272,7 +272,7 @@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-SUBDIRS = pixman demos test
+SUBDIRS = pixman
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = pixman-1.pc
GPGKEY = 6FF7C1A8
--- misc/pixman-0.24.0/config.sub 2008-08-30 00:27:25.000000000 +0200
+++ misc/build/pixman-0.24.0/config.sub 2011-12-16 09:05:14.595773609 +0100
@@ -1247,7 +1247,7 @@
| -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
| -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
...@@ -9,9 +20,9 @@ ...@@ -9,9 +20,9 @@
| -chorusos* | -chorusrdb* \ | -chorusos* | -chorusrdb* \
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
| -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
--- misc/build/pixman-0.12.0/configure.orig 2008-09-17 20:14:40.000000000 +0300 --- misc/pixman-0.24.0/configure 2011-11-06 22:11:27.000000000 +0100
+++ misc/build/pixman-0.12.0/configure 2008-11-08 21:17:00.000000000 +0200 +++ misc/build/pixman-0.24.0/configure 2011-12-16 09:06:16.482898083 +0100
@@ -19740,6 +19740,13 @@ @@ -20202,6 +20202,13 @@
...@@ -25,23 +36,12 @@ ...@@ -25,23 +36,12 @@
for ac_func in getisax for ac_func in getisax
do do
@@ -19834,6 +19841,8 @@ @@ -20304,6 +20311,8 @@
fi
done done
+ ;; + ;;
+esac +esac
{ echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5 { $as_echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6; } $as_echo_n "checking whether byte ordering is bigendian... " >&6; }
if test "${ac_cv_c_bigendian+set}" = set; then if test "${ac_cv_c_bigendian+set}" = set; then
--- misc/pixman-0.12.0/Makefile.in 2008-09-17 19:14:38.000000000 +0200
+++ misc/build/pixman-0.12.0/Makefile.in 2010-09-28 14:27:47.000000000 +0200
@@ -203,7 +203,7 @@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-SUBDIRS = pixman test
+SUBDIRS = pixman
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = pixman-1.pc
GPGKEY = 6FF7C1A8
cairo/pixman/makefile.mk
Dosyayı görüntüle @ cc850798
...@@ -43,10 +43,10 @@ all: ...@@ -43,10 +43,10 @@ all:
# --- Files -------------------------------------------------------- # --- Files --------------------------------------------------------
PIXMANVERSION=0.12.0 PIXMANVERSION=0.24.0
TARFILE_NAME=pixman-$(PIXMANVERSION) TARFILE_NAME=pixman-$(PIXMANVERSION)
TARFILE_MD5=09357cc74975b01714e00c5899ea1881 TARFILE_MD5=db5ffcd50064421176e8afb7b85fd1a7
PATCH_FILES=..$/$(TARFILE_NAME).patch PATCH_FILES=..$/$(TARFILE_NAME).patch
......
ooo.lst.in
Dosyayı görüntüle @ cc850798
http://dev-www.libreoffice.org/src http://dev-www.libreoffice.org/src
48a9f787f43a09c0a9b7b00cd1fddbbf-hyphen-2.7.1.tar.gz 48a9f787f43a09c0a9b7b00cd1fddbbf-hyphen-2.7.1.tar.gz
63ddc5116488985e820075e65fbe6aa4-openssl-0.9.8o.tar.gz 63ddc5116488985e820075e65fbe6aa4-openssl-0.9.8o.tar.gz
09357cc74975b01714e00c5899ea1881-pixman-0.12.0.tar.gz db5ffcd50064421176e8afb7b85fd1a7-pixman-0.24.0.tar.bz2
0b49ede71c21c0599b0cc19b353a6cb3-README_apache-commons.txt 0b49ede71c21c0599b0cc19b353a6cb3-README_apache-commons.txt
e1c178b18f130b40494561f02bc1a948-libexttextcat-3.2.0.tar.bz2 e1c178b18f130b40494561f02bc1a948-libexttextcat-3.2.0.tar.bz2
17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment