[gentoo-commits] gentoo-x86 commit in app-office/libreoffice/files: libreoffice-4.3.5.2-system-opencollada.patch libreoffice-4.3.5.2-detect-KDE5-fallback-to-KDE4UI.patch libreoffice-4.3.5.2-return-IsUserDefined-w-o-negation.patch

[Andreas HAttel (dilfridge)]

dilfridge    14/12/28 17:12:34

  Added:                libreoffice-4.3.5.2-system-opencollada.patch
                        libreoffice-4.3.5.2-detect-KDE5-fallback-to-KDE4UI.patch
                        libreoffice-4.3.5.2-return-IsUserDefined-w-o-negation.patch
  Log:
  Version bump by Andreas Sturmlechner, bug 533160
  
  (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 84AD142F)

Revision  Changes    Path
1.1                  app-office/libreoffice/files/libreoffice-4.3.5.2-system-opencollada.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/libreoffice-4.3.5.2-system-opencollada.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/libreoffice-4.3.5.2-system-opencollada.patch?rev=1.1&content-type=text/plain

Index: libreoffice-4.3.5.2-system-opencollada.patch
===================================================================
From f24c60870531689d95c056037e48cd29ad1d17bb Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@××××××.com>
Date: Mon, 20 Oct 2014 14:21:22 +0200
Subject: [PATCH] allow to build with system opencollada

Change-Id: I6101099c57d429987e06bca0652c843f4a94f8cc
---
 Makefile.fetch              |  2 +-
 RepositoryExternal.mk       | 16 ++++++++++++++++
 config_host.mk.in           |  4 +++-
 configure.ac                | 35 +++++++++++++++++++++++++++++++++++
 external/Module_external.mk |  2 +-
 5 files changed, 56 insertions(+), 3 deletions(-)

diff --git a/Makefile.fetch b/Makefile.fetch
index e8ccf5b..18b12be 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -184,7 +184,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR)
 		$(call fetch_Optional,NSS,NSS_TARBALL) \
 		$(call fetch_Optional_pack,NUMBERTEXT_EXTENSION_PACK) \
 		$(call fetch_Optional,ODFGEN,ODFGEN_TARBALL) \
-		$(call fetch_Optional,COLLADA2GLTF,OPENCOLLADA_TARBALL) \
+		$(call fetch_Optional,OPENCOLLADA,OPENCOLLADA_TARBALL) \
 		$(call fetch_Optional,OPENLDAP,OPENLDAP_TARBALL) \
 		$(call fetch_Optional,OPENSSL,OPENSSL_TARBALL) \
 		$(call fetch_Optional,ORCUS,ORCUS_TARBALL) \
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 5277aea..911dab1 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3371,6 +3371,20 @@ endif # SYSTEN_LIBGLTF
 
 ifeq ($(ENABLE_COLLADA),TRUE)
 
+ifeq ($(SYSTEM_OPENCOLLADA),TRUE)
+
+define gb_LinkTarget__use_opencollada_parser
+$(call gb_LinkTarget_set_include,$(1),\
+	$$(INCLUDE) \
+	$(OPENCOLLADA_CFLAGS) \
+)
+
+$(call gb_LinkTarget_add_libs,$(1),$(OPENCOLLADA_LIBS))
+
+endef
+
+else # !SYSTEM_OPENCOLLADA
+
 define gb_LinkTarget__use_opencollada_parser
 $(call gb_LinkTarget_set_include,$(1),\
 	-I$(call gb_UnpackedTarball_get_dir,opencollada)/COLLADABaseUtils/include \
@@ -3385,6 +3399,8 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\
 )
 endef
 
+endif # SYSTEM_OPENCOLLADA
+
 define gb_LinkTarget__use_collada2gltf
 $(call gb_LinkTarget_set_include,$(1),\
 	-I$(call gb_UnpackedTarball_get_dir,collada2gltf) \
diff --git a/config_host.mk.in b/config_host.mk.in
index 0fefbb0..738c80c 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -431,7 +431,8 @@ export OOOP_SAMPLES_PACK=@OOOP_SAMPLES_PACK@
 export OOOP_TEMPLATES_PACK=@OOOP_TEMPLATES_PACK@
 export OOO_JUNIT_JAR=@OOO_JUNIT_JAR@
 export OOO_VENDOR=@OOO_VENDOR@
-export OPENSSL_CFLAGS=$(gb_SPACE)@OPENSSL_CFLAGS@
+export OPENCOLLADA_CFLAGS=$(gb_SPACE)@OPENCOLLADA_CFLAGS@
+export OPENCOLLADA_LIBS=$(gb_SPACE)@OPENCOLLADA_LIBS@
 export OPENSSL_LIBS=$(gb_SPACE)@OPENSSL_LIBS@
 export ORCUS_CFLAGS=$(gb_SPACE)@ORCUS_CFLAGS@
 export ORCUS_LIBS=$(gb_SPACE)@ORCUS_LIBS@
@@ -558,6 +559,7 @@ export SYSTEM_NPAPI_HEADERS=@SYSTEM_NPAPI_HEADERS@
 export SYSTEM_NSS=@SYSTEM_NSS@
 export SYSTEM_ODBC_HEADERS=@SYSTEM_ODBC_HEADERS@
 export SYSTEM_ODFGEN=@SYSTEM_ODFGEN@
+export SYSTEM_OPENCOLLADA=@SYSTEM_OPENCOLLADA@
 export SYSTEM_OPENLDAP=@SYSTEM_OPENLDAP@
 export SYSTEM_OPENSSL=@SYSTEM_OPENSSL@
 export SYSTEM_PAGEMAKER=@SYSTEM_PAGEMAKER@
diff --git a/configure.ac b/configure.ac
index 17feb1a..5d2198b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1641,6 +1641,11 @@ AC_ARG_WITH(system-ucpp,
         [Use ucpp already on system.]),,
     [])
 
+AC_ARG_WITH(system-opencollada,
+    AS_HELP_STRING([--with-system-opencollada],
+        [Use openCOLLADA already on system.]),,
+    [with_system_opencollada=no])
+
 AC_ARG_WITH(system-openldap,
     AS_HELP_STRING([--with-system-openldap],
         [Use the OpenLDAP LDAP SDK already on system.]),,
@@ -10342,11 +10347,41 @@ if test "$enable_collada" != "no" -a "$ENABLE_GLTF" = "TRUE"; then
     AC_MSG_RESULT([yes])
     ENABLE_COLLADA=TRUE
     AC_DEFINE(HAVE_FEATURE_COLLADA,1)
+    AC_MSG_CHECKING([which OPENCOLLADA to use])
+    if test "$with_system_opencollada" = "yes"; then
+        AC_MSG_RESULT([external])
+        SYSTEM_OPENCOLLADA=TRUE
+        AS_IF([test -n "$OPENCOLLADA_CFLAGS"],[],[AC_MSG_ERROR([export OPENCOLLADA_CFLAGS])])
+        AS_IF([test -n "$OPENCOLLADA_LIBS"],[],[AC_MSG_ERROR([export OPENCOLLADA_LIBS])])
+        AC_LANG_PUSH([C++])
+        save_CXXFLAGS=$CXXFLAGS
+        save_CPPFLAGS=$CPPFLAGS
+        CXXFLAGS="$CXXFLAGS $OPENCOLLADA_CFLAGS"
+        CPPFLAGS="$CPPFLAGS $OPENCOLLADA_CFLAGS"
+        AC_CHECK_HEADERS(
+                COLLADABU.h \
+                COLLADAFW.h \
+                COLLADASaxFWLLoader.h \
+                GeneratedSaxParser.h,
+            [],
+            [AC_MSG_ERROR([openCOLLADA headers not found. Install openCOLLADA])],
+            [])
+        CXXFLAGS=$save_CXXFLAGS
+        CPPFLAGS=$save_CPPFLAGS
+        AC_LANG_POP([C++])
+        OPENCOLLADA_CFLAGS=$(printf '%s' "$OPENCOLLADA_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
+    else
+        AC_MSG_RESULT([internal])
+        BUILD_TYPE="$BUILD_TYPE OPENCOLLADA"
+    fi
     BUILD_TYPE="$BUILD_TYPE COLLADA2GLTF"
 else
     AC_MSG_RESULT([no])
 fi
 AC_SUBST(ENABLE_COLLADA)
+AC_SUBST([OPENCOLLADA_CFLAGS])
+AC_SUBST([OPENCOLLADA_LIBS])
+AC_SUBST([SYSTEM_OPENCOLLADA])
 
 # pdf import?
 AC_MSG_CHECKING([whether to build the PDF import feature])
diff --git a/external/Module_external.mk b/external/Module_external.mk
index c95ea20..688e335 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -75,7 +75,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
 	$(call gb_Helper_optional,NEON,neon) \
 	$(call gb_Helper_optional,NSS,nss) \
 	$(call gb_Helper_optional,ODFGEN,libodfgen) \
-	$(call gb_Helper_optional,COLLADA2GLTF,opencollada) \
+	$(call gb_Helper_optional,OPENCOLLADA,opencollada) \
 	$(call gb_Helper_optional,OPENLDAP,openldap) \
 	$(call gb_Helper_optional,OPENSSL,openssl) \
 	$(call gb_Helper_optional,ORCUS,liborcus) \
-- 
2.2.1




1.1                  app-office/libreoffice/files/libreoffice-4.3.5.2-detect-KDE5-fallback-to-KDE4UI.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/libreoffice-4.3.5.2-detect-KDE5-fallback-to-KDE4UI.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/libreoffice-4.3.5.2-detect-KDE5-fallback-to-KDE4UI.patch?rev=1.1&content-type=text/plain

Index: libreoffice-4.3.5.2-detect-KDE5-fallback-to-KDE4UI.patch
===================================================================
From e04b8afe7aef5db535311630834bc25316433dae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tomas.chvatal@×××××.com>
Date: Mon, 3 Nov 2014 10:01:52 +0100
Subject: [PATCH] Detect KDE5 and fallback to KDE4UI there

Change-Id: I8da53d7b81d28b0051be96c0c4ee0a29d8ed8360
Reviewed-on: https://gerrit.libreoffice.org/12209
Reviewed-by: Samuel Mehrbrodt <s.mehrbrodt@×××××.com>
Tested-by: Samuel Mehrbrodt <s.mehrbrodt@×××××.com>
---
 vcl/unx/generic/desktopdetect/desktopdetector.cxx | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/vcl/unx/generic/desktopdetect/desktopdetector.cxx b/vcl/unx/generic/desktopdetect/desktopdetector.cxx
index 163d48e..e1f253d 100644
--- a/vcl/unx/generic/desktopdetect/desktopdetector.cxx
+++ b/vcl/unx/generic/desktopdetect/desktopdetector.cxx
@@ -272,6 +272,23 @@ static bool is_kde4_desktop( Display* pDisplay )
     return false;
 }
 
+static bool is_kde5_desktop( Display* pDisplay )
+{
+    if ( NULL != getenv( "KDE_FULL_SESSION" ) )
+    {
+        OUString aVer( "5" );
+
+        const char *pVer = getenv( "KDE_SESSION_VERSION" );
+        if ( pVer && aVer.equalsIgnoreAsciiCaseAscii( pVer ) )
+            return true;
+    }
+
+    if ( KDEVersion( pDisplay ) == 5 )
+        return true;
+
+    return false;
+}
+
 extern "C"
 {
 
@@ -285,6 +302,8 @@ DESKTOP_DETECTOR_PUBLIC DesktopType get_desktop_environment()
 
         if ( aOver.equalsIgnoreAsciiCase( "tde" ) )
             return DESKTOP_TDE;
+        if ( aOver.equalsIgnoreAsciiCase( "kde5" ) )
+            return DESKTOP_KDE4;
         if ( aOver.equalsIgnoreAsciiCase( "kde4" ) )
             return DESKTOP_KDE4;
         if ( aOver.equalsIgnoreAsciiCase( "gnome" ) )
@@ -371,6 +390,8 @@ DESKTOP_DETECTOR_PUBLIC DesktopType get_desktop_environment()
 
     // these guys can be slower, with X property fetches,
     // round-trips etc. and so are done later.
+    else if ( is_kde5_desktop( pDisplay ) )
+        ret = DESKTOP_KDE4;
     else if ( is_kde4_desktop( pDisplay ) )
         ret = DESKTOP_KDE4;
     else if ( is_gnome_desktop( pDisplay ) )
-- 
2.2.1




1.1                  app-office/libreoffice/files/libreoffice-4.3.5.2-return-IsUserDefined-w-o-negation.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/libreoffice-4.3.5.2-return-IsUserDefined-w-o-negation.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/libreoffice-4.3.5.2-return-IsUserDefined-w-o-negation.patch?rev=1.1&content-type=text/plain

Index: libreoffice-4.3.5.2-return-IsUserDefined-w-o-negation.patch
===================================================================
From ec8beb2fa279b8d7b1efbd9f5414895b17dfbe8b Mon Sep 17 00:00:00 2001
From: Katarina Behrens <bubli@×××××.org>
Date: Fri, 5 Sep 2014 14:11:15 +0200
Subject: [PATCH] fdo#82681: return IsUserDefined w/o negation

when the predicate is called StyleSheetIsUserDefinedPredicate

Returning negation thereof somewhere, somehow, corrupts one of
SfxItem pools. Thus, invalid read happens and crashes Impress
and Draw.

Now the loop in SdStyleSheetPool::UpdateStdNames does nothing
(it iterates through user-defined styles, but its body does
something for non-user-defined styles), so more investigation
here is needed.

This is partial revert of commit 3440766f0ad43454287a874b5fd34b6f2af6bdf1

Change-Id: I06f0da320c49674dac2adf43b7c374babbdadb57
(cherry picked from commit a784c33fd48eeb3394dc63610e384cf866233093)
Signed-off-by: Andras Timar <andras.timar@×××××××××.com>
---
 sd/source/core/stlpool.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index 17ca4f0..c98dff7 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -943,7 +943,7 @@ struct StyleSheetIsUserDefinedPredicate : svl::StyleSheetPredicate
 
     bool Check(const SfxStyleSheetBase& sheet) SAL_OVERRIDE
     {
-        return !sheet.IsUserDefined();
+        return sheet.IsUserDefined();
     }
 };
 }
-- 
2.2.1