[libreoffice] 01/02: git update; the gltf/collada stuff got removed

Rene Engelhard rene at moszumanska.debian.org
Mon Oct 30 15:24:42 UTC 2017 

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch debian-experimental-6.0
in repository libreoffice.

commit d376baf2acaeffb4875f364c5cd3afdeee67da0b
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Oct 30 09:18:05 2017 +0100

    git update; the gltf/collada stuff got removed
---
 changelog                     |  2 +-
 control                       |  6 -----
 patches/cppunit-optional.diff |  2 +-
 patches/no-openssl.diff       |  8 +++---
 rules                         | 61 +------------------------------------------
 5 files changed, 7 insertions(+), 72 deletions(-)

diff --git a/changelog b/changelog
index 5c700a4..18c2e92 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:6.0.0~beta1~git20171026-1) UNRELEASED; urgency=medium
+libreoffice (1:6.0.0~beta1~git20171030-1) UNRELEASED; urgency=medium
 
   * New upstream snapshot
 
diff --git a/control b/control
index ac9baef..8e6061b 100644
--- a/control
+++ b/control
@@ -59,7 +59,6 @@ Build-Depends: ant (>= 1.7.0) [!hppa !ia64 !mips64 !s390 !sparc],
                libcdr-dev (>= 0.1),
                libclucene-dev (>= 2.3.3.4-4.1),
                libcmis-dev (>= 0.5.0-3),
-               libcollada2gltfconvert-dev (>= 20140924-2)[amd64 i386],
                libcppunit-dev (>= 1.14) [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] <!nocheck>,
                libcups2-dev,
                libcurl4-gnutls-dev,
@@ -82,7 +81,6 @@ Build-Depends: ant (>= 1.7.0) [!hppa !ia64 !mips64 !s390 !sparc],
                libgl1-mesa-dev,
                libglib2.0-dev (>= 2.38.0),
                libglm-dev (>= 0.9.6.3),
-               libgltf-dev (>= 0.1.0),
                libgpg-error-dev,
                libgpgme-dev,
                libgpgmepp-dev,
@@ -111,11 +109,9 @@ Build-Depends: ant (>= 1.7.0) [!hppa !ia64 !mips64 !s390 !sparc],
                libneon27-gnutls-dev,
                libnspr4-dev,
                libnss3-dev (>= 3.12.3),
-               libo3dgc-dev (>= 0~20131011-2) [amd64 i386],
                libodfgen-dev (>= 0.1),
                liborcus-dev (>= 0.12),
                libpagemaker-dev,
-               libpcre3-dev [amd64 i386],
                libpng-dev,
                libpoppler-cpp-dev,
                libpoppler-dev (>= 0.12.0),
@@ -152,12 +148,10 @@ Build-Depends: ant (>= 1.7.0) [!hppa !ia64 !mips64 !s390 !sparc],
                locales [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] <!nocheck>,
                lp-solve (>= 5.5.0.13-5+b1),
                maven-repo-helper,
-               opencollada-dev (>= 0.1.0~20140703.ddf8f47+dfsg1-2) [amd64 i386],
                pkg-config,
                pstoedit [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] <!nocheck>,
                python3,
                python3-dev (>= 3.3),
-               rapidjson-dev [amd64 i386],
                ucpp,
                unixodbc-dev (>= 2.2.11),
                unzip,
diff --git a/patches/cppunit-optional.diff b/patches/cppunit-optional.diff
index 5540d95..b9b1c14 100644
--- a/patches/cppunit-optional.diff
+++ b/patches/cppunit-optional.diff
@@ -32,9 +32,9 @@ index 880895e3c00f..a3dab3e00979 100644
 --- a/config_host.mk.in
 +++ b/config_host.mk.in
 @@ -114,6 +115,7 @@ export SYSTEM_COINMP=@SYSTEM_COINMP@
+ export SYSTEM_COINMP=@SYSTEM_COINMP@
  export COINMP_CFLAGS=@COINMP_CFLAGS@
  export COINMP_LIBS=@COINMP_LIBS@
- export ENABLE_COLLADA=@ENABLE_COLLADA@
 +export ENABLE_CPPUNIT=@ENABLE_CPPUNIT@
  export ENABLE_CUPS=@ENABLE_CUPS@
  export ENABLE_CURL=@ENABLE_CURL@
diff --git a/patches/no-openssl.diff b/patches/no-openssl.diff
index f7b70fe..d382f8c 100644
--- a/patches/no-openssl.diff
+++ b/patches/no-openssl.diff
@@ -44,17 +44,17 @@ index ddd144e..19f8368 100644
  export DLOPEN_LIBS=@DLOPEN_LIBS@
  export DLLTOOL=@DLLTOOL@
 @@ -438,8 +439,6 @@ export OOO_JUNIT_JAR=@OOO_JUNIT_JAR@
+ export BFFVALIDATOR=@BFFVALIDATOR@
+ export OOO_JUNIT_JAR=@OOO_JUNIT_JAR@
  export OOO_VENDOR=@OOO_VENDOR@
- export OPENCOLLADA_CFLAGS=$(gb_SPACE)@OPENCOLLADA_CFLAGS@
- export OPENCOLLADA_LIBS=$(gb_SPACE)@OPENCOLLADA_LIBS@
 -export OPENSSL_CFLAGS=$(gb_SPACE)@OPENSSL_CFLAGS@
 -export OPENSSL_LIBS=$(gb_SPACE)@OPENSSL_LIBS@
  export ORCUS_CFLAGS=$(gb_SPACE)@ORCUS_CFLAGS@
  export ORCUS_LIBS=$(gb_SPACE)@ORCUS_LIBS@
  export OS=@OS@
 @@ -569,7 +568,6 @@ export SYSTEM_ODBC_HEADERS=@SYSTEM_ODBC_HEADERS@
+ 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@
@@ -122,8 +122,8 @@ index 44280e3..44c1c63 100644
 --- a/external/Module_external.mk
 +++ b/external/Module_external.mk
 @@ -82,7 +82,6 @@ $(eval $(call gb_Module_add_moduledirs,external,\
+ 	$(call gb_Helper_optional,NSS,nss) \
  	$(call gb_Helper_optional,ODFGEN,libodfgen) \
- 	$(call gb_Helper_optional,OPENCOLLADA,opencollada) \
  	$(call gb_Helper_optional,OPENLDAP,openldap) \
 -	$(call gb_Helper_optional,OPENSSL,openssl) \
  	$(call gb_Helper_optional,ORCUS,liborcus) \
diff --git a/rules b/rules
index 12ede98..299f1e5 100755
--- a/rules
+++ b/rules
@@ -353,9 +353,6 @@ PARALLEL_BUILD=y
 ENABLE_LDAP=y
 USE_OPENLDAP=y
 SYSTEM_STUFF += epoxy
-ENABLE_GLTF=y
-SYSTEM_STUFF += libgltf
-LIBGLTF_MINVER=0.1.0
 ifeq "$(ENABLE_JAVA)" "y"
   ENABLE_REPORTDESIGN=y
   SYSTEM_STUFF += jfreereport
@@ -599,10 +596,6 @@ OOO_REPORTDESIGN_ARCHS := $(OOO_BASE_ARCHS)
 $(eval $(call gen_no_archs,OOO_REPORTDESIGN_ARCHS))
 OOO_FIREBIRD_ARCHS := $(OOO_LE_ARCHS)
 $(eval $(call gen_no_archs,OOO_FIREBIRD_ARCHS))
-# enable COLLADA (if any) only on i386/amd64 for now, rapidjson does seem
-# to have alignment problems on other archs (e.g. arm*)
-OOO_COLLADA_ARCHS=amd64 i386
-$(eval $(call gen_no_archs,OOO_COLLADA_ARCHS))
 # chromium only available here.
 OOO_GDRIVE_ARCHS=amd64 arm64 armhf i386
 
@@ -681,7 +674,7 @@ endif
 # Debian Stretch
 ifeq "$(shell dpkg-parsechangelog | grep Distribution | awk '{ print $$2 }')" "stretch-backports"
   BUGS=mailto:debian-backports at lists.debian.org
-  SYSTEM_STUFF := $(filter-out libzmf libstaroffice orcus libgltf cppunit xmlsec libqxp,$(SYSTEM_STUFF))
+  SYSTEM_STUFF := $(filter-out libzmf libstaroffice orcus cppunit xmlsec libqxp,$(SYSTEM_STUFF))
   # needs newer stuff for tests, we can't make it conditional on RUN_MAKE_CHECK since
   # BE archs don't run them anyway and this wouldn't be in effect...
   SYSTEM_STUFF := $(filter-out libwps libmwaw,$(SYSTEM_STUFF))
@@ -743,10 +736,6 @@ else
 	BUILD_DEPS += , clang-$(CLANG_VERSION)
 	CONFIGURE_FLAGS+= CC=clang-$(CLANG_VERSION) CXX=clang++-$(CLANG_VERSION)
   endif
-  # would need external/opencollada/patches/opencollada.clang.patch.0 applied
-  # See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=793930 and the
-  # upstream issue (https://github.com/KhronosGroup/OpenCOLLADA/issues/293)
-  SYSTEM_STUFF := $(filter-out opencollada collada2gltf,$(SYSTEM_STUFF))
   ifeq "$(ENABLE_COMPILER_PLUGINS)" "y"
   	CONFIGURE_FLAGS += --enable-compiler-plugins
   	CLANGDIR := /usr/lib/llvm-$(shell $(CLANG) --version | head -n 1 | awk '{ print $$3 }' | cut -d. -f1,2)
@@ -764,46 +753,6 @@ ifeq "$(USE_DWZ)" "y"
 	BUILD_DEPS += , dwz
 endif
 
-ifneq "$(ENABLE_GLTF)" "y"
-	CONFIGURE_FLAGS += --disable-gltf
-else
-  ifneq (,$(findstring libgltf,$(SYSTEM_STUFF)))
-	BUILD_DEPS += , libgltf-dev (>= $(LIBGLTF_MINVER))
-  endif
-  ENABLE_COLLADA=n
-  ifneq (,$(findstring $(DEB_HOST_ARCH),$(OOO_COLLADA_ARCHS)))
-    ENABLE_COLLADA=y
-  endif
-  ifeq "$(ENABLE_COLLADA)" "y"
-    SYSTEM_STUFF += opencollada
-    OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser -I/usr/include/opencollada"
-    OPENCOLLADA_LIBS="-L/usr/lib/opencollada -lUTF -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser -lMathMLSolver -lpcre"
-    SYSTEM_STUFF += collada2gltf
-    COLLADA2GLTF_CFLAGS="-I/usr/include/collada2gltf -I/usr/include/collada2gltf/JSON -I/usr/include/collada2gltf/GLTF -I/usr/include/collada2gltf/helpers -I/usr/include/collada2gltf/assetModifiers -I/usr/include/rapidjson" 
-    COLLADA2GLTF_LIBS="-lcollada2gltfConvert -lo3dgc_common_lib -lo3dgc_dec_lib -lo3dgc_enc_lib"
-  endif
-  ifeq "$(GCC_VERSION_5_OR_GREATER)" "y"
-    OPENCOLLADA_MINVER=(>= 0.1.0~20140703.ddf8f47+dfsg1-2)
-    COLLADA2GLTF_MINVER=(>= 20140924-2)
-  else
-    OPENCOLLADA_MINVER=
-    COLLADA2GLTF_MINVER=
-  endif
-  ifneq "$(ENABLE_COLLADA)" "y"
-	CONFIGURE_FLAGS += --disable-collada
-  else
-    ifneq (,$(findstring opencollada,$(SYSTEM_STUFF)))
-       BUILD_DEPS += , opencollada-dev $(OPENCOLLADA_MINVER) [$(OOO_COLLADA_ARCHS)]
-       BUILD_DEPS += , libpcre3-dev [$(OOO_COLLADA_ARCHS)]
-    endif
-    ifneq (,$(findstring collada2gltf,$(SYSTEM_STUFF)))
-       BUILD_DEPS += , libcollada2gltfconvert-dev $(COLLADA2GLTF_MINVER)[$(OOO_COLLADA_ARCHS)]
-       BUILD_DEPS += , rapidjson-dev [$(OOO_COLLADA_ARCHS)]
-       BUILD_DEPS += , libo3dgc-dev (>= 0~20131011-2) [$(OOO_COLLADA_ARCHS)]
-    endif
-  endif
-endif
-
 ifneq "$(PACKAGE_SDK)" "y"
 	CONFIGURE_FLAGS += --disable-odk
  ifneq "$(PACKAGE_SDK_DOCS)" "y"
@@ -1946,8 +1895,6 @@ config_host.mk:
 	CLANGDIR=$(CLANGDIR) \
 	MARIADBCONFIG=$(MARIADBCONFIG) \
 	FIREBIRD_CFLAGS=$(FIREBIRD_CFLAGS) FIREBIRD_LIBS=$(FIREBIRD_LIBS) \
-	OPENCOLLADA_CFLAGS=$(OPENCOLLADA_CFLAGS) OPENCOLLADA_LIBS=$(OPENCOLLADA_LIBS) \
-	COLLADA2GLTF_CFLAGS=$(COLLADA2GLTF_CFLAGS) COLLADA2GLTF_LIBS=$(COLLADA2GLTF_LIBS) \
 	./autogen.sh $(CONFIGURE_FLAGS)
 
 build:
@@ -1967,8 +1914,6 @@ $(STAMP_DIR)/build-arch:
 	CLANGDIR=$(CLANGDIR) \
 	MARIADBCONFIG=$(MARIADBCONFIG) \
 	FIREBIRD_CFLAGS=$(FIREBIRD_CFLAGS) FIREBIRD_LIBS=$(FIREBIRD_LIBS) \
-	OPENCOLLADA_CFLAGS=$(OPENCOLLADA_CFLAGS) OPENCOLLADA_LIBS=$(OPENCOLLADA_LIBS) \
-	COLLADA2GLTF_CFLAGS=$(COLLADA2GLTF_CFLAGS) COLLADA2GLTF_LIBS=$(COLLADA2GLTF_LIBS) \
 	./autogen.sh $(CONFIGURE_FLAGS) --without-junit --without-cppunit \
 		--without-doxygen --without-javadoc --disable-ext-wiki-publisher \
 		--disable-report-builder --disable-scripting-javascript \
@@ -2006,8 +1951,6 @@ endif
 	PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) \
 	MARIADBCONFIG=$(MARIADBCONFIG) \
 	FIREBIRD_CFLAGS=$(FIREBIRD_CFLAGS) FIREBIRD_LIBS=$(FIREBIRD_LIBS) \
-	OPENCOLLADA_CFLAGS=$(OPENCOLLADA_CFLAGS) OPENCOLLADA_LIBS=$(OPENCOLLADA_LIBS) \
-	COLLADA2GLTF_CFLAGS=$(COLLADA2GLTF_CFLAGS) COLLADA2GLTF_LIBS=$(COLLADA2GLTF_LIBS) \
 	./autogen.sh $(CONFIGURE_FLAGS) $(CONFIGURE_FLAGS_INDEP)
 
 	PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) ARCH_FLAGS=$(ARCH_FLAGS) TMP=`mktemp -q -d` $(MAKE) build-nocheck
@@ -2038,8 +1981,6 @@ endif
 	CLANGDIR=$(CLANGDIR) \
 	MARIADBCONFIG=$(MARIADBCONFIG) \
 	FIREBIRD_CFLAGS=$(FIREBIRD_CFLAGS) FIREBIRD_LIBS=$(FIREBIRD_LIBS) \
-	OPENCOLLADA_CFLAGS=$(OPENCOLLADA_CFLAGS) OPENCOLLADA_LIBS=$(OPENCOLLADA_LIBS) \
-	COLLADA2GLTF_CFLAGS=$(COLLADA2GLTF_CFLAGS) COLLADA2GLTF_LIBS=$(COLLADA2GLTF_LIBS) \
 	./autogen.sh $(CONFIGURE_FLAGS) \
 		--without-doxygen --without-javadoc --disable-ext-wiki-publisher \
 		--disable-report-builder --disable-scripting-javascript \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git

More information about the Pkg-openoffice-commits mailing list