diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-08-24 18:16:15 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-08-24 18:14:53 +0000 |
| commit | 13d139b934a705dfef377699ae6b753d9aa4ddfb (patch) | |
| tree | b1bc02d39c49f1513f2ce452b25c8cf123010e28 /external/cairo/ExternalPackage_cairo.mk | |
| parent | 1efbdfcffff97ec0834274d13abe0f0d318b5f3c (diff) | |
cairo: upgrade pixman to release 0.34.0, cairo to release 1.14.6
* from pixman-0.24.4.patch drop:
- Android support config.sub: obsoleted by new upstream autoconf
- configure Mac OS X 10.4 (unsupported) linker warning
- configure getisax Solaris check: it's unclear why this would
give a wrong result on Linux, it certainly does't on Fedora 24...
- __inline__ workaround looks fixed upstream
* drop pixman-0.24.4.android.patch:
obsoleted by new upstream autoconf
* from cairo-1.10.2.patch drop:
- Makefile.win32.common: drop this for now, we don't build
cairo on windows and paths in this patch are still dmake INPATH...
- Android support config.sub: obsoleted by new upstream autoconf
- configure "libpng15" should be obsolete since it's overridden
by png_CFLAGS/png_LIBS anyway
- configure Mac OS X 10.4 (unsupported) linker warning
- cairo-output-stream.c: fixed upstream
- cairo-ft-font.c: presumed obsolete, FcResultOutOfMemory added in 2004
* drop cairo.dlsym.lcdfilter.patch:
FT_Library_SetLcdFilter since 2.3.0 so exists in RHEL 6 baseline (2.3.11)
* drop cairo-1.10.2-oldfontconfig.patch:
RHEL 6 baseline has fontconfig 2.8.0 so 2.2.95 isn't "too new"
* drop cairo-1.10.2.wntmsc.patch:
we don't build cairo on windows currently, and this doesn't apply
* drop no-flto-clang.patch:
fixed upstream
* remove definition of COMPRESS var that appears to be completely unused
Change-Id: I5d782b9267c348c266ef369db2f8ac2c3c70b90d
Reviewed-on: https://gerrit.libreoffice.org/28365
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'external/cairo/ExternalPackage_cairo.mk')
| -rw-r--r-- | external/cairo/ExternalPackage_cairo.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/external/cairo/ExternalPackage_cairo.mk b/external/cairo/ExternalPackage_cairo.mk index 720927670c39..b1686973537a 100644 --- a/external/cairo/ExternalPackage_cairo.mk +++ b/external/cairo/ExternalPackage_cairo.mk @@ -13,7 +13,7 @@ $(eval $(call gb_ExternalPackage_use_external_project,cairo,cairo)) ifneq ($(OS),ANDROID) -$(eval $(call gb_ExternalPackage_add_file,cairo,$(LIBO_LIB_FOLDER)/libcairo.so.2,src/.libs/libcairo.so.2.11000.2)) +$(eval $(call gb_ExternalPackage_add_file,cairo,$(LIBO_LIB_FOLDER)/libcairo.so.2,src/.libs/libcairo.so.2.11400.6)) endif |