external/cairo/ExternalPackage_cairo.mk | 2 +-
external/cairo/UnpackedTarball_cairo.mk | 1 -
external/cairo/cairo/libcairo-bundled-soname.patch.0 | 12 ------------
3 files changed, 1 insertion(+), 14 deletions(-)
New commits:
commit 3500c44bccafd442e50da604287342708506bb5c
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Mon Jan 27 17:38:45 2025 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue Jan 28 07:16:10 2025 +0100
remove unnecessary cairo soname patch
This was introduced by
commit 2def5485aa57d7c407a84ecc73b22083579e9a98
Author: Tor Lillqvist <t...@collabora.com>
Date: Tue Sep 20 16:07:14 2022 +0300
Enable opening of downloaded fonts only in ForKit in Online
but we don't need to this, since we rename the .so file when we copy it
in external/cairo/ExternalPackage_cairo.mk
This change makes a later patch less noisy/
Change-Id: I06f78d7ff068df14e95542391e20b669487ebb5b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180794
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/external/cairo/ExternalPackage_cairo.mk
b/external/cairo/ExternalPackage_cairo.mk
index 6bd0800d9f21..3e16e08a97ee 100644
--- a/external/cairo/ExternalPackage_cairo.mk
+++ b/external/cairo/ExternalPackage_cairo.mk
@@ -12,7 +12,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,cairo,cairo))
$(eval $(call gb_ExternalPackage_use_external_project,cairo,cairo))
ifneq ($(DISABLE_DYNLOADING),TRUE)
-$(eval $(call
gb_ExternalPackage_add_file,cairo,$(LIBO_LIB_FOLDER)/libcairo-lo.so.2,src/.libs/libcairo-lo.so.2.1170$(CAIRO_VERSION_MICRO).0))
+$(eval $(call
gb_ExternalPackage_add_file,cairo,$(LIBO_LIB_FOLDER)/libcairo-lo.so.2,src/.libs/libcairo.so.2.1170$(CAIRO_VERSION_MICRO).0))
endif
# vim: set noet sw=4 ts=4:
diff --git a/external/cairo/UnpackedTarball_cairo.mk
b/external/cairo/UnpackedTarball_cairo.mk
index f1697c6d0cc9..a434b750082e 100644
--- a/external/cairo/UnpackedTarball_cairo.mk
+++ b/external/cairo/UnpackedTarball_cairo.mk
@@ -28,7 +28,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,cairo,\
external/cairo/cairo/cairo.ofz46165.patch.1 \
external/cairo/cairo/cairo.ofz50805.patch.1 \
external/cairo/cairo/0025-libtool-pass-use-ld.patch \
- external/cairo/cairo/libcairo-bundled-soname.patch.0 \
external/cairo/cairo/cairo-fd-hack.patch.0 \
external/cairo/cairo/cairo.ofz57493-Timeout.patch.1 \
))
diff --git a/external/cairo/cairo/libcairo-bundled-soname.patch.0
b/external/cairo/cairo/libcairo-bundled-soname.patch.0
deleted file mode 100644
index 92aac5f753df..000000000000
--- a/external/cairo/cairo/libcairo-bundled-soname.patch.0
+++ /dev/null
@@ -1,12 +0,0 @@
-# -*- Mode: Diff -*-
---- src/Makefile.in
-+++ src/Makefile.in
-@@ -2075,7 +2075,7 @@
- $(enabled_cairo_sources) \
- $(NULL)
-
--libcairo_la_LDFLAGS = $(AM_LDFLAGS) -version-info
$(CAIRO_LIBTOOL_VERSION_INFO) -no-undefined $(export_symbols)
-+libcairo_la_LDFLAGS = $(AM_LDFLAGS) -version-info
$(CAIRO_LIBTOOL_VERSION_INFO) -no-undefined $(export_symbols) -release lo
-Wl,-soname -Wl,libcairo-lo.so.2
- libcairo_la_LIBADD = $(CAIRO_LIBS)
- libcairo_la_DEPENDENCIES = $(cairo_def_dependency)
-
