From: Peter Michael Green Date: Sat, 3 Aug 2024 19:33:47 +0000 (+0000) Subject: Disable skia X-Git-Tag: archive/raspbian/4%24.2.5-1+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=24934fe4e68d7ce976bf6df14aafde18de817027;p=libreoffice.git Disable skia --- diff --git a/debian/changelog b/debian/changelog index 546f1a2c17e..7928fc11e85 100644 Binary files a/debian/changelog and b/debian/changelog differ diff --git a/debian/rules b/debian/rules index 06deaf045d2..d7b7ccfc51a 100755 --- a/debian/rules +++ b/debian/rules @@ -390,16 +390,16 @@ ENABLE_POPPLER=y SYSTEM_STUFF += poppler ENABLE_PDFIUM=n PACKAGE_GEN=y -ifeq "$(PACKAGE_GEN)" "y" - # keep packaging gen (s390x is a release arch...), just disable skia. In contrast for - # alpha and ia64 (ports-only) where skia also is disabled we set PACKAGE_GEN=n later in - # the architecture specific settings - ifneq (big,$(DEB_HOST_ARCH_ENDIAN)) - ENABLE_SKIA=y - endif -else +#ifeq "$(PACKAGE_GEN)" "y" +# # keep packaging gen (s390x is a release arch...), just disable skia. In contrast for +# # alpha and ia64 (ports-only) where skia also is disabled we set PACKAGE_GEN=n later in +# # the architecture specific settings +# ifneq (big,$(DEB_HOST_ARCH_ENDIAN)) +# ENABLE_SKIA=y +# endif +#else ENABLE_SKIA=n -endif +#endif SYSTEM_STUFF += libpng ENABLE_NSS=y ifeq "$(ENABLE_NSS)" "y" diff --git a/debian/stampdir/prepare b/debian/stampdir/prepare new file mode 100644 index 00000000000..e69de29bb2d