[libreoffice] 04/04: remove obsolete patches
Rene Engelhard
rene at moszumanska.debian.org
Thu Jun 15 17:10:43 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 b3098fccecbebe81c5ec7c0d0aad63c0d8ae4902
Author: Rene Engelhard <rene at rene-engelhard.de>
Date: Thu Jun 15 16:30:06 2017 +0200
remove obsolete patches
---
patches/gb_SUPPRESS_TESTS.diff | 244 -------------------------------
patches/gerrit_38597.diff | 62 --------
patches/odk-settings-JAVA_PROC_TYPE.diff | 52 -------
3 files changed, 358 deletions(-)
diff --git a/patches/gb_SUPPRESS_TESTS.diff b/patches/gb_SUPPRESS_TESTS.diff
deleted file mode 100644
index 78b318b..0000000
--- a/patches/gb_SUPPRESS_TESTS.diff
+++ /dev/null
@@ -1,244 +0,0 @@
-From 09f38f4df1177768fbeefc31e6e73137b2784c49 Mon Sep 17 00:00:00 2001
-From: Stephan Bergmann <sbergman at redhat.com>
-Date: Sat, 3 Jun 2017 21:38:24 +0200
-Subject: gb_SUPPRESS_TESTS to build tests but not run them
-
-Change-Id: I390b97bbacfc123b952be2b54cf1333b4d5c24a7
-
-diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
-index 6595726..4bccabf 100644
---- a/solenv/gbuild/CppunitTest.mk
-+++ b/solenv/gbuild/CppunitTest.mk
-@@ -106,6 +106,9 @@ $(call gb_CppunitTest_get_clean_target,%) :
-
- .PHONY : $(call gb_CppunitTest_get_target,%)
- $(call gb_CppunitTest_get_target,%) :| $(gb_CppunitTest_RUNTIMEDEPS)
-+ifneq ($(gb_SUPPRESS_TESTS),)
-+ @true
-+else
- $(call gb_Output_announce,$*,$(true),CUT,2)
- $(call gb_Helper_abbreviate_dirs,\
- $(if $(gb_CppunitTest_vcl_hide_windows),export VCL_HIDE_WINDOWS=1 && ) \
-@@ -140,6 +143,7 @@ $(call gb_CppunitTest_get_target,%) :| $(gb_CppunitTest_RUNTIMEDEPS)
- RET=$$?; \
- $(call gb_CppunitTest_postprocess,$(gb_CppunitTest_CPPTESTCOMMAND),$@.core,$$RET) >> $@.log 2>&1;) \
- cat $@.log; $(gb_CppunitTest_UNITTESTFAILED) Cppunit $*)))
-+endif
-
- define gb_CppunitTest_CppunitTest
- $(call gb_CppunitTest__CppunitTest_impl,$(1),$(call gb_CppunitTest_get_linktarget,$(1)))
-diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk
-index 30e226d..36f29b5 100644
---- a/solenv/gbuild/JunitTest.mk
-+++ b/solenv/gbuild/JunitTest.mk
-@@ -32,6 +32,9 @@ ifneq (,$(strip $(OOO_JUNIT_JAR)))
-
- .PHONY : $(call gb_JunitTest_get_target,%)
- $(call gb_JunitTest_get_target,%) :
-+ifneq ($(gb_SUPPRESS_TESTS),)
-+ @true
-+else
- $(call gb_Output_announce,$*,$(true),JUT,2)
- $(call gb_Helper_abbreviate_dirs,\
- rm -rf $(call gb_JunitTest_get_userdir,$*) && \
-@@ -53,6 +56,7 @@ $(call gb_JunitTest_get_target,%) :
- && echo \
- && false)))
- $(CLEAN_CMD)
-+endif
-
- define gb_JunitTest_JunitTest
- $(call gb_JunitTest_get_target,$(1)) : T_CP := $(call gb_JavaClassSet_get_classdir,$(call gb_JunitTest_get_classsetname,$(1)))$$(gb_CLASSPATHSEP)$(OOO_JUNIT_JAR)$(if $(HAMCREST_JAR),$$(gb_CLASSPATHSEP)$(HAMCREST_JAR))$$(gb_CLASSPATHSEP)$(INSTROOT)/$(LIBO_URE_LIB_FOLDER)
-@@ -152,7 +156,9 @@ else # OOO_JUNIT_JAR
-
- .PHONY : $(call gb_JunitTest_get_target,$(1))
- $(call gb_JunitTest_get_target,%) :
-+ifeq ($(gb_SUPPRESS_TESTS),)
- $(call gb_Output_announce,$* (skipped - no Junit),$(true),JUT,2)
-+endif
- @true
-
- define gb_JunitTest_JunitTest
-diff --git a/solenv/gbuild/PythonTest.mk b/solenv/gbuild/PythonTest.mk
-index eeff6a0..8ac62c4 100644
---- a/solenv/gbuild/PythonTest.mk
-+++ b/solenv/gbuild/PythonTest.mk
-@@ -32,6 +32,9 @@ ifneq ($(DISABLE_PYTHON),TRUE)
-
- .PHONY : $(call gb_PythonTest_get_target,%)
- $(call gb_PythonTest_get_target,%) :| $(gb_PythonTest_DEPS)
-+ifneq ($(gb_SUPPRESS_TESTS),)
-+ @true
-+else
- $(call gb_Output_announce,$*,$(true),PYT,2)
- $(call gb_Helper_abbreviate_dirs,\
- rm -rf $(dir $(call gb_PythonTest_get_target,$*)) && \
-@@ -61,6 +64,7 @@ $(call gb_PythonTest_get_target,%) :| $(gb_PythonTest_DEPS)
- RET=$$?; \
- $(call gb_CppunitTest_postprocess,$(gb_PythonTest_EXECUTABLE_GDB),$@.core,$$RET) >> $@.log 2>&1;) \
- cat $@.log; $(gb_PythonTest_UNITTESTFAILED) Python $*))))
-+endif
-
- # always use udkapi and URE services
- define gb_PythonTest_PythonTest
-@@ -99,7 +103,9 @@ else # DISABLE_PYTHON
-
- .PHONY : $(call gb_PythonTest_get_target,$(1))
- $(call gb_PythonTest_get_target,%) :
-+ifeq ($(gb_SUPPRESS_TESTS),)
- $(call gb_Output_announce,$* (skipped - no PythonTest),$(true),PYT,2)
-+endif
- @true
-
- define gb_PythonTest_PythonTest
-diff --git a/solenv/gbuild/UITest.mk b/solenv/gbuild/UITest.mk
-index 1edb3f7..21560c8 100644
---- a/solenv/gbuild/UITest.mk
-+++ b/solenv/gbuild/UITest.mk
-@@ -37,6 +37,9 @@ ifneq ($(DISABLE_PYTHON),TRUE)
-
- .PHONY : $(call gb_UITest_get_target,%)
- $(call gb_UITest_get_target,%) :| $(gb_UITest_DEPS)
-+ifneq ($(gb_SUPPRESS_TESTS),)
-+ @true
-+else
- $(call gb_Output_announce,$*,$(true),UIT,2)
- $(call gb_Helper_abbreviate_dirs,\
- rm -rf $(dir $(call gb_UITest_get_target,$*)) && \
-@@ -69,6 +72,7 @@ $(call gb_UITest_get_target,%) :| $(gb_UITest_DEPS)
- RET=$$?; \
- $(call gb_CppunitTest_postprocess,$(gb_UITest_EXECUTABLE_GDB),$@.core,$$RET) >> $@.log 2>&1;) \
- cat $@.log; $(gb_UITest_UNITTESTFAILED) UI $*))))
-+endif
-
- # always use udkapi and URE services
- define gb_UITest_UITest
-@@ -111,7 +115,9 @@ else # DISABLE_PYTHON
-
- .PHONY : $(call gb_UITest_get_target,$(1))
- $(call gb_UITest_get_target,%) :
-+ifeq ($(gb_SUPPRESS_TESTS),)
- $(call gb_Output_announce,$* (skipped - no UITest),$(true),PYT,2)
-+endif
- @true
-
- define gb_UITest_UITest
-diff --git a/solenv/gbuild/gbuild.help.txt b/solenv/gbuild/gbuild.help.txt
-index 05005be..0b11b36 100644
---- a/solenv/gbuild/gbuild.help.txt
-+++ b/solenv/gbuild/gbuild.help.txt
-@@ -145,3 +145,5 @@ INTERACTIVE VARIABLES:
- set the build environment.
- gb_DBGARGS Append these arguments to GDBs "set args" command for
- debugrun. Double quotes will be automatically escaped.
-+ gb_SUPPRESS_TESTS Do not run tests (but still build them, when requested
-+ by the given targets).
---
-cgit v0.10.2
-
-From 35cd5805c3052a1190cf98c0d7dd320f83fd3c5e Mon Sep 17 00:00:00 2001
-From: Stephan Bergmann <sbergman at redhat.com>
-Date: Tue, 6 Jun 2017 11:35:13 +0200
-Subject: One more test to suppress
-
-Change-Id: I8ba67cc1d34ce25fe174887ab6cbca85e7ce8658
-
-diff --git a/testtools/CustomTarget_uno_test.mk b/testtools/CustomTarget_uno_test.mk
-index 4b960e4..4850e5c 100644
---- a/testtools/CustomTarget_uno_test.mk
-+++ b/testtools/CustomTarget_uno_test.mk
-@@ -19,6 +19,9 @@ $(call gb_CustomTarget_get_target,testtools/uno_test) : \
- $(call gb_Rdb_get_target,uno_services) \
- $(call gb_Rdb_get_target,ure/services) \
- $(call gb_UnoApi_get_target,udkapi)
-+ifneq ($(gb_SUPPRESS_TESTS),)
-+ @true
-+else
- $(call gb_Helper_abbreviate_dirs,\
- $(call gb_Executable_get_command,uno) \
- -s com.sun.star.test.bridge.BridgeTest \
-@@ -26,5 +29,6 @@ $(call gb_CustomTarget_get_target,testtools/uno_test) : \
- -env:LO_BUILD_LIB_DIR=$(call gb_Helper_make_url,$(gb_Library_WORKDIR_FOR_BUILD)) \
- -env:URE_MORE_SERVICES=$(call gb_Helper_make_url,$(call gb_Rdb_get_target,uno_services)) \
- -env:URE_MORE_TYPES=$(call gb_Helper_make_url,$(WORKDIR)/UnoApiTarget/bridgetest.rdb))
-+endif
-
- # vim:set shiftwidth=4 tabstop=4 noexpandtab:
---
-cgit v0.10.2
-From 3de594d3347ead24f3211714f0e0010c1434cdf2 Mon Sep 17 00:00:00 2001
-From: Stephan Bergmann <sbergman at redhat.com>
-Date: Fri, 9 Jun 2017 17:24:55 +0200
-Subject: More tests to suppress (all .PHONY test targets should be covered
- now)
-
-Change-Id: Ib948547e5c177ac62506fc42a564368a8d31fa4e
-
-diff --git a/idlc/CustomTarget_parser_test.mk b/idlc/CustomTarget_parser_test.mk
-index 84b01d9..0c9d15e 100644
---- a/idlc/CustomTarget_parser_test.mk
-+++ b/idlc/CustomTarget_parser_test.mk
-@@ -25,6 +25,9 @@ $(call gb_CustomTarget_get_target,idlc/parser_test) : \
- $(SRCDIR)/idlc/test/parser/struct.tests \
- $(SRCDIR)/idlc/test/parser/typedef.tests \
- | $(call gb_CustomTarget_get_workdir,idlc/parser_test)/.dir
-+ifneq ($(gb_SUPPRESS_TESTS),)
-+ @true
-+else
- $(call gb_Helper_abbreviate_dirs,( \
- $(PERL) $(SRCDIR)/solenv/bin/exectest.pl \
- $(SRCDIR)/idlc/test/parser/attribute.tests \
-@@ -77,5 +80,6 @@ $(call gb_CustomTarget_get_target,idlc/parser_test) : \
- $(call gb_Executable_get_command,idlc) \
- -O $(call gb_CustomTarget_get_workdir,idlc/parser_test) {}) \
- > $@.log 2>&1 || (cat $@.log && false))
-+endif
-
- # vim: set noet sw=4 ts=4:
-diff --git a/odk/CustomTarget_build-examples.mk b/odk/CustomTarget_build-examples.mk
-index 89e4273..81ac3a1 100644
---- a/odk/CustomTarget_build-examples.mk
-+++ b/odk/CustomTarget_build-examples.mk
-@@ -89,6 +89,9 @@ endif
-
- $(call gb_CustomTarget_get_target,odk/build-examples): \
- $(call gb_CustomTarget_get_workdir,odk/build-examples)/setsdkenv
-+ifneq ($(gb_SUPPRESS_TESTS),)
-+ @true
-+else
- $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CHK,1)
- (saved_library_path=$${$(gb_Helper_LIBRARY_PATH_VAR)} && . $< \
- $(if $(filter MACOSX,$(OS)),, \
-@@ -102,6 +105,7 @@ $(call gb_CustomTarget_get_target,odk/build-examples): \
- || (RET=$$? \
- && cat $(call gb_CustomTarget_get_workdir,odk/build-examples)/log \
- && exit $$RET)
-+endif
-
- $(call gb_CustomTarget_get_workdir,odk/build-examples)/setsdkenv: \
- $(SRCDIR)/odk/config/setsdkenv_unix.sh.in \
-diff --git a/registry/CustomTarget_regcompare_test.mk b/registry/CustomTarget_regcompare_test.mk
-index efdc070..e781630 100644
---- a/registry/CustomTarget_regcompare_test.mk
-+++ b/registry/CustomTarget_regcompare_test.mk
-@@ -31,6 +31,9 @@ $(call gb_CustomTarget_get_target,registry/regcompare_test): \
- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/ue.rdb \
- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.rdb \
- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usb.rdb
-+ifneq ($(gb_SUPPRESS_TESTS),)
-+ @true
-+else
- $(call gb_Helper_abbreviate_dirs,( \
- $(call gb_Executable_get_command,unoidl-check) --ignore-unpublished \
- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.rdb \
-@@ -191,6 +194,7 @@ $(call gb_CustomTarget_get_target,registry/regcompare_test): \
- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.rdb \
- -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/other2.rdb) \
- > $@.log 2>&1 || (cat $@.log && false))
-+endif
-
- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/%.rdb: \
- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/%.urd \
---
-cgit v0.10.2
-
diff --git a/patches/gerrit_38597.diff b/patches/gerrit_38597.diff
deleted file mode 100644
index 1f5c729..0000000
--- a/patches/gerrit_38597.diff
+++ /dev/null
@@ -1,62 +0,0 @@
-From: Szymon Kłos <szymon.klos at collabora.com>
-Date: Fri, 9 Jun 2017 09:10:28 +0000 (+0200)
-Subject: Watermark: reuse existing rotation property
-X-Git-Url: https://gerrit.libreoffice.org/gitweb?p=core.git;a=commitdiff_plain;h=92335d5b39d186da44f032da5ad74c8a8b962092
-
-Watermark: reuse existing rotation property
-
-Change-Id: I0cade407883a60d8d802b487668882e95f42ddce
----
-
-diff --git a/sw/source/core/edit/edfcol.cxx b/sw/source/core/edit/edfcol.cxx
-index 8d6965c..6f73f82 100644
---- a/sw/source/core/edit/edfcol.cxx
-+++ b/sw/source/core/edit/edfcol.cxx
-@@ -302,7 +302,7 @@ SfxWatermarkItem SwEditShell::GetWatermark()
- sal_uInt32 nColor;
- sal_Int16 nTransparency;
- OUString aFont;
-- drawing::HomogenMatrix3 aMatrix;
-+ sal_Int64 nAngle;
-
- aItem.SetText(xTextRange->getString());
-
-@@ -310,14 +310,8 @@ SfxWatermarkItem SwEditShell::GetWatermark()
- aItem.SetFont(aFont);
- if (xPropertySet->getPropertyValue(UNO_NAME_FILLCOLOR) >>= nColor)
- aItem.SetColor(nColor);
-- if (xPropertySet->getPropertyValue("Transformation") >>= aMatrix)
-- {
-- double y = aMatrix.Line2.Column1;
-- double x = aMatrix.Line1.Column1;
-- double nRad = atan2(y, x) * -1;
-- double nDeg = nRad * 180.0 / F_PI;
-- aItem.SetAngle(nDeg);
-- }
-+ if (xPropertySet->getPropertyValue("RotateAngle") >>= nAngle)
-+ aItem.SetAngle(nAngle / 100);
- if (xPropertySet->getPropertyValue(UNO_NAME_FILL_TRANSPARENCE) >>= nTransparency)
- aItem.SetTransparency(nTransparency);
-
-@@ -366,18 +360,15 @@ void SwEditShell::SetWatermark(const SfxWatermarkItem& rWatermark)
- drawing::HomogenMatrix3 aMatrix;
- sal_uInt32 nColor = 0xc0c0c0;
- sal_Int16 nTransparency = 50;
-- sal_Int16 nAngle = 45;
-+ sal_Int64 nAngle = 45;
- OUString aFont = "";
-
- uno::Reference<beans::XPropertySet> xPropertySet(xWatermark, uno::UNO_QUERY);
- xPropertySet->getPropertyValue(UNO_NAME_CHAR_FONT_NAME) >>= aFont;
- xPropertySet->getPropertyValue(UNO_NAME_FILLCOLOR) >>= nColor;
- xPropertySet->getPropertyValue(UNO_NAME_FILL_TRANSPARENCE) >>= nTransparency;
-- xPropertySet->getPropertyValue("Transformation") >>= aMatrix;
-- double y = aMatrix.Line2.Column1;
-- double x = aMatrix.Line1.Column1;
-- double nRad = atan2(y, x) * -1;
-- nAngle = nRad * 180.0 / F_PI;
-+ xPropertySet->getPropertyValue("RotateAngle") >>= nAngle;
-+ nAngle /= 100;
-
- // If the header already contains a watermark, see if it its text is up to date.
- uno::Reference<text::XTextRange> xTextRange(xWatermark, uno::UNO_QUERY);
diff --git a/patches/odk-settings-JAVA_PROC_TYPE.diff b/patches/odk-settings-JAVA_PROC_TYPE.diff
deleted file mode 100644
index 9a2eb00..0000000
--- a/patches/odk-settings-JAVA_PROC_TYPE.diff
+++ /dev/null
@@ -1,52 +0,0 @@
-From 4256ac0daa42107cfaf1ce54dbd1db6ce82975b0 Mon Sep 17 00:00:00 2001
-From: Rene Engelhard <rene at debian.org>
-Date: Fri, 9 Jun 2017 21:08:31 +0200
-Subject: [PATCH] odk settings.mk: add various missing JAVA_PROC_TYPE overrides
- for Linux arches
-
-... which were missing since ~ ever but now break the odk_build-examples test
-with /usr/bin/ld: cannot find -ljawt
-
-Change-Id: Ie504ce0c8e21c7d58f1b7e591505940a2f80a2ea
----
- odk/settings/settings.mk | 24 ++++++++++++++++++++++++
- 1 file changed, 24 insertions(+)
-
-diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk
-index b455a6b5d399..2813959f5dec 100644
---- a/odk/settings/settings.mk
-+++ b/odk/settings/settings.mk
-@@ -275,6 +275,30 @@ ifeq "$(PROCTYPE)" "powerpc64"
- JAVA_PROC_TYPE=ppc64
- endif
-
-+ifeq "$(PROCTYPE)" "powerpc64_le"
-+JAVA_PROC_TYPE=ppc64le
-+endif
-+
-+ifeq "$(PROCTYPE)" "arm_eabi"
-+JAVA_PROC_TYPE=arm
-+endif
-+
-+ifeq "$(PROCTYPE)" "arm_oabi"
-+JAVA_PROC_TYPE=arm
-+endif
-+
-+ifeq "$(PROCTYPE)" "mips_eb"
-+JAVA_PROC_TYPE=mips
-+endif
-+
-+ifeq "$(PROCTYPE)" "mips_el"
-+JAVA_PROC_TYPE=mipsel
-+endif
-+
-+ifeq "$(PROCTYPE)" "mips64_el"
-+JAVA_PROC_TYPE=mips64el
-+endif
-+
- ifeq "$(PROCTYPE)" "sparc64"
- UNOPKG_PLATFORM=Linux_SPARC64
- JAVA_PROC_TYPE=sparcv9
---
-2.11.0
-
--
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