diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-01-17 22:43:15 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-01-17 22:43:15 +0000 |
commit | 52f895faaaf01579a8d9528cafec20bf2c873f5c (patch) | |
tree | d552df2a24a2e21fd08b08caef93840452b9889c /app-office/libreoffice/files | |
parent | 0704956f7256f1f618cc5e03af2c1dbd0e83dbc5 (diff) |
gentoo resync : 17.01.2010
Diffstat (limited to 'app-office/libreoffice/files')
-rw-r--r-- | app-office/libreoffice/files/libreoffice-6.2-ldap-optional.patch | 178 | ||||
-rw-r--r-- | app-office/libreoffice/files/libreoffice-6.2.8.2-poppler-0.82.patch | 123 |
2 files changed, 0 insertions, 301 deletions
diff --git a/app-office/libreoffice/files/libreoffice-6.2-ldap-optional.patch b/app-office/libreoffice/files/libreoffice-6.2-ldap-optional.patch deleted file mode 100644 index c92689732527..000000000000 --- a/app-office/libreoffice/files/libreoffice-6.2-ldap-optional.patch +++ /dev/null @@ -1,178 +0,0 @@ -From 6776c53b7ce2e431d8636f4e5a755f50f787ec8f Mon Sep 17 00:00:00 2001 -From: Andrew Udvare <audvare@gmail.com> -Date: Tue, 8 Jan 2019 04:53:51 -0500 -Subject: Make LDAP support optional - -Change-Id: Ifbd3903494a81e7b155bf6468f6ca2c50b3370a4 -Reviewed-on: https://gerrit.libreoffice.org/65958 -Tested-by: Jenkins -Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> ---- - Repository.mk | 2 +- - RepositoryExternal.mk | 3 ++- - configure.ac | 24 ++++++++++++++++++++++- - connectivity/Library_postgresql-sdbc-impl.mk | 2 +- - extensions/Module_extensions.mk | 7 ++++++- - external/postgresql/ExternalProject_postgresql.mk | 5 +++-- - postprocess/Rdb_services.mk | 2 +- - 7 files changed, 37 insertions(+), 8 deletions(-) - -diff --git a/Repository.mk b/Repository.mk -index 4ae8528..4d8389b 100644 ---- a/Repository.mk -+++ b/Repository.mk -@@ -389,7 +389,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ - hyphen \ - icg \ - $(if $(ENABLE_JAVA),jdbc) \ -- ldapbe2 \ -+ $(if $(ENABLE_LDAP),ldapbe2) \ - $(if $(filter WNT,$(OS)),WinUserInfoBe) \ - localebe1 \ - log \ -diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk -index 602ff6d..3c9be87 100644 ---- a/RepositoryExternal.mk -+++ b/RepositoryExternal.mk -@@ -2900,7 +2900,7 @@ endef - - endif # SYSTEM_HSQLDB - -- -+ifeq ($(ENABLE_LDAP),TRUE) - ifneq ($(SYSTEM_OPENLDAP),) - - define gb_LinkTarget__use_openldap -@@ -2929,6 +2929,7 @@ $(call gb_LinkTarget_add_libs,$(1), \ - ) - - endef -+endif - - define gb_ExternalProject__use_openldap - $(call gb_ExternalProject_use_external_project,$(1),openldap) -diff --git a/configure.ac b/configure.ac -index f880308..35c7e02 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1519,6 +1519,11 @@ libo_FUZZ_ARG_ENABLE(formula-logger, - ) - ) - -+AC_ARG_ENABLE(ldap, -+ AS_HELP_STRING([--disable-ldap], -+ [Disable LDAP support.]), -+,enable_ldap=yes) -+ - dnl =================================================================== - dnl Optional Packages (--with/without-) - dnl =================================================================== -@@ -9214,12 +9219,29 @@ else - fi - AC_SUBST(SYSTEM_ODBC_HEADERS) - -+dnl =================================================================== -+dnl Enable LDAP support -+dnl =================================================================== -+ -+if test "$_os" != "WINNT" -a "$_os" != "iOS" -a "$_os" != "Android"; then -+AC_MSG_CHECKING([whether to enable LDAP support]) -+ if test "$enable_ldap" != "yes"; then -+ AC_MSG_RESULT([no]) -+ ENABLE_LDAP="" -+ enable_ldap=no -+ else -+ AC_MSG_RESULT([yes]) -+ ENABLE_LDAP="TRUE" -+ AC_DEFINE(HAVE_FEATURE_LDAP) -+ fi -+fi -+AC_SUBST(ENABLE_LDAP) - - dnl =================================================================== - dnl Check for system openldap - dnl =================================================================== - --if test "$_os" != "WINNT" -a "$_os" != "iOS" -a "$_os" != "Android"; then -+if test "$_os" != "WINNT" -a "$_os" != "iOS" -a "$_os" != "Android" -a "$ENABLE_LDAP" != ""; then - AC_MSG_CHECKING([which openldap library to use]) - if test "$with_system_openldap" = "yes"; then - AC_MSG_RESULT([external]) -diff --git a/connectivity/Library_postgresql-sdbc-impl.mk b/connectivity/Library_postgresql-sdbc-impl.mk -index 53cebd0..3d048f3 100644 ---- a/connectivity/Library_postgresql-sdbc-impl.mk -+++ b/connectivity/Library_postgresql-sdbc-impl.mk -@@ -47,7 +47,7 @@ $(eval $(call gb_Library_use_externals,postgresql-sdbc-impl,\ - postgresql \ - $(if $(filter-out MSC,$(COM)), \ - openssl \ -- openldap \ -+ $(if $(ENABLE_LDAP),openldap) \ - nss3 \ - plc4 \ - ssl3 \ -diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk -index f84a9ca..43dd929 100644 ---- a/extensions/Module_extensions.mk -+++ b/extensions/Module_extensions.mk -@@ -16,7 +16,6 @@ $(eval $(call gb_Module_add_l10n_targets,extensions,\ - ifneq ($(filter-out iOS ANDROID,$(OS)),) - $(eval $(call gb_Module_add_targets,extensions,\ - Library_abp \ -- Library_ldapbe2 \ - $(if $(filter WNT,$(OS)),Library_WinUserInfoBe) \ - Library_log \ - Library_scn \ -@@ -28,6 +27,12 @@ $(eval $(call gb_Module_add_targets,extensions,\ - )) - endif - -+ifeq ($(ENABLE_LDAP),TRUE) -+$(eval $(call gb_Module_add_targets,extensions,\ -+ Library_ldapbe2 \ -+)) -+endif -+ - ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE))) - $(eval $(call gb_Module_add_targets,extensions,\ - Library_bib \ -diff --git a/external/postgresql/ExternalProject_postgresql.mk b/external/postgresql/ExternalProject_postgresql.mk -index f6617e5..fc4342c 100644 ---- a/external/postgresql/ExternalProject_postgresql.mk -+++ b/external/postgresql/ExternalProject_postgresql.mk -@@ -10,7 +10,7 @@ - $(eval $(call gb_ExternalProject_ExternalProject,postgresql)) - - $(eval $(call gb_ExternalProject_use_externals,postgresql,\ -- openldap \ -+ $(if $(ENABLE_LDAP),openldap) \ - openssl \ - zlib \ - )) -@@ -64,9 +64,10 @@ $(call gb_ExternalProject_get_state_target,postgresql,build) : - $(if $(DISABLE_OPENSSL),,--with-openssl \ - $(if $(WITH_KRB5), --with-krb5) \ - $(if $(WITH_GSSAPI),--with-gssapi)) \ -+ $(if $(ENABLE_LDAP),,--with-ldap=no) \ - CPPFLAGS="$(postgresql_CPPFLAGS)" \ - LDFLAGS="$(postgresql_LDFLAGS)" \ -- EXTRA_LDAP_LIBS="-llber -lssl3 -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4" \ -+ $(if $(ENABLE_LDAP),EXTRA_LDAP_LIBS="-llber -lssl3 -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4") \ - && cd src/interfaces/libpq \ - && MAKEFLAGS= && $(MAKE) all-static-lib) - -diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk -index c70d1ca..342f19b 100644 ---- a/postprocess/Rdb_services.mk -+++ b/postprocess/Rdb_services.mk -@@ -293,7 +293,7 @@ $(eval $(call gb_Rdb_add_components,services,\ - desktop/source/offacc/offacc \ - $(if $(DISABLE_GUI),,desktop/source/splash/spl) \ - extensions/source/abpilot/abp \ -- extensions/source/config/ldap/ldapbe2 \ -+ $(if $(ENABLE_LDAP),extensions/source/config/ldap/ldapbe2) \ - $(if $(filter WNT,$(OS)),\ - extensions/source/config/WinUserInfo/WinUserInfoBe \ - ) \ --- -cgit v1.1 diff --git a/app-office/libreoffice/files/libreoffice-6.2.8.2-poppler-0.82.patch b/app-office/libreoffice/files/libreoffice-6.2.8.2-poppler-0.82.patch deleted file mode 100644 index b6c30cd92a16..000000000000 --- a/app-office/libreoffice/files/libreoffice-6.2.8.2-poppler-0.82.patch +++ /dev/null @@ -1,123 +0,0 @@ -From 2eadd46ab81058087af95bdfc1fea28fcdb65998 Mon Sep 17 00:00:00 2001 -From: Rasmus Thomsen <oss@cogitri.dev> -Date: Sat, 26 Oct 2019 14:11:35 +0200 -Subject: Fix build with poppler-0.82 - -Change-Id: I3b6b3faea7986f3e5a6ae4790580d03bc9c955fc -Reviewed-on: https://gerrit.libreoffice.org/81545 -Tested-by: Jenkins -Reviewed-by: Michael Stahl <michael.stahl@cib.de> ---- - .../pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 25 ++++++++++++++++++++++ - .../pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 16 +++++++++++++- - 2 files changed, 40 insertions(+), 1 deletion(-) - -diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -index ce32a41..3ae3bdc 100644 ---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -@@ -863,11 +863,20 @@ void PDFOutDev::eoClip(GfxState *state) - local offset of character (zero for horizontal writing mode). not - taken into account for output pos updates. Used for vertical writing. - */ -+ -+#if POPPLER_CHECK_VERSION(0, 82, 0) -+void PDFOutDev::drawChar(GfxState *state, double x, double y, -+ double dx, double dy, -+ double originX, double originY, -+ CharCode, int /*nBytes*/, const Unicode *u, int uLen) -+{ -+#else - void PDFOutDev::drawChar(GfxState *state, double x, double y, - double dx, double dy, - double originX, double originY, - CharCode, int /*nBytes*/, Unicode *u, int uLen) - { -+#endif - assert(state); - - if( u == nullptr ) -@@ -979,11 +988,19 @@ void PDFOutDev::drawImageMask(GfxState* pState, Object*, Stream* str, - writeBinaryBuffer(aBuf); - } - -+#if POPPLER_CHECK_VERSION(0, 82, 0) -+void PDFOutDev::drawImage(GfxState*, Object*, Stream* str, -+ int width, int height, GfxImageColorMap* colorMap, -+ poppler_bool /*interpolate*/, -+ const int* maskColors, poppler_bool /*inlineImg*/ ) -+{ -+#else - void PDFOutDev::drawImage(GfxState*, Object*, Stream* str, - int width, int height, GfxImageColorMap* colorMap, - poppler_bool /*interpolate*/, - int* maskColors, poppler_bool /*inlineImg*/ ) - { -+#endif - if (m_bSkipImages) - return; - OutputBuffer aBuf; initBuf(aBuf); -@@ -1004,12 +1021,20 @@ void PDFOutDev::drawImage(GfxState*, Object*, Stream* str, - { - GfxRGB aMinRGB; - colorMap->getColorSpace()->getRGB( -+#if POPPLER_CHECK_VERSION(0, 82, 0) -+ reinterpret_cast<const GfxColor*>(maskColors), -+#else - reinterpret_cast<GfxColor*>(maskColors), -+#endif - &aMinRGB ); - - GfxRGB aMaxRGB; - colorMap->getColorSpace()->getRGB( -+#if POPPLER_CHECK_VERSION(0, 82, 0) -+ reinterpret_cast<const GfxColor*>(maskColors)+gfxColorMaxComps, -+#else - reinterpret_cast<GfxColor*>(maskColors)+gfxColorMaxComps, -+#endif - &aMaxRGB ); - - aMaskBuf.push_back( colToByte(aMinRGB.r) ); -diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx -index 1a0c3f0..02f6b59 100644 ---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx -+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx -@@ -232,10 +232,17 @@ namespace pdfi - virtual void eoClip(GfxState *state) override; - - //----- text drawing -+#if POPPLER_CHECK_VERSION(0, 82, 0) -+ virtual void drawChar(GfxState *state, double x, double y, -+ double dx, double dy, -+ double originX, double originY, -+ CharCode code, int nBytes, const Unicode *u, int uLen) override; -+#else - virtual void drawChar(GfxState *state, double x, double y, - double dx, double dy, - double originX, double originY, - CharCode code, int nBytes, Unicode *u, int uLen) override; -+#endif - #if POPPLER_CHECK_VERSION(0, 64, 0) - virtual void drawString(GfxState *state, const GooString *s) override; - #else -@@ -248,10 +255,17 @@ namespace pdfi - int width, int height, poppler_bool invert, - poppler_bool interpolate, - poppler_bool inlineImg) override; -+#if POPPLER_CHECK_VERSION(0, 82, 0) - virtual void drawImage(GfxState *state, Object *ref, Stream *str, - int width, int height, GfxImageColorMap *colorMap, - poppler_bool interpolate, -- int* maskColors, poppler_bool inlineImg) override; -+ const int* maskColors, poppler_bool inlineImg) override; -+#else -+ virtual void drawImage(GfxState *state, Object *ref, Stream *str, -+ int width, int height, GfxImageColorMap *colorMap, -+ poppler_bool interpolate, -+ int* maskColors, poppler_bool inlineImg) override; -+#endif - virtual void drawMaskedImage(GfxState *state, Object *ref, Stream *str, - int width, int height, - GfxImageColorMap *colorMap, --- -cgit v1.1 |