[libreoffice] 14/152: fix lo-sources-ver
Rene Engelhard
rene at moszumanska.debian.org
Thu Jul 27 19:16:51 UTC 2017
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to tag libreoffice_3.5.0_rc3-0ubuntu2
in repository libreoffice.
commit 1fea26aef5e3b147c06c12eb71e2d810c4cbbc26
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Fri Nov 20 13:55:47 2015 +0100
fix lo-sources-ver
---
control.in | 17 +-
patches/disable-sw-tests.diff | 40 ----
patches/fdo-35663.diff | 18 --
patches/fdo-61896.diff | 17 --
patches/fix-connectivity-in-postprocess.diff | 202 -------------------
patches/fix-for-poppler-0.24.diff | 38 ----
patches/kubuntu_breeze-icons.diff | 219 ---------------------
...-disable-XMLImport-subsequentcheck-on-sauc.diff | 28 ---
...-activate-menues-even-earlier-to-reduce-la.diff | 91 ---------
patches/lp-1418551.diff | 50 -----
patches/mailmerge-base.diff | 162 ---------------
patches/quicklistfix.diff | 89 ---------
patches/vbamacro.diff | 24 ---
rules | 2 +-
source/include-binaries | 1 -
15 files changed, 2 insertions(+), 996 deletions(-)
diff --git a/control.in b/control.in
index b918071..57ce2bb 100644
--- a/control.in
+++ b/control.in
@@ -148,7 +148,7 @@ Depends: libreoffice-l10n-as,
libreoffice-l10n-ta,
libreoffice-l10n-te,
${misc:Depends}
-Recommends: ttf-indic-fonts
+Recommends: fonts-indic
Description: office productivity suite -- Indic language packages
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -553,21 +553,6 @@ Description: office productivity suite -- GTK+ integration
under GNOME. It also contains a QuickStarter for the "notification area"
and a (basic) GTK+ document viewer widget.
-Package: libreoffice-gtk3
-Architecture: %OOO_ARCHS%
-Depends: libreoffice-core (= ${binary:Version}),
- ${misc:Depends},
- ${shlibs:Depends}
-Recommends: libreoffice-style-breeze | libreoffice-style-tango
-Section: gnome
-Enhances: libreoffice
-Description: office productivity suite -- GTK+ 3.0 integration
- LibreOffice is a full-featured office productivity suite that provides
- a near drop-in replacement for Microsoft(R) Office.
- .
- This package contains the Gtk plugin for drawing LibreOffices widgets
- with Gtk+ 3.0 and Gtk/GNOMEish print dialog when running under GNOME.
-
Package: libreoffice-gnome
Architecture: %OOO_ARCHS%
Depends: libreoffice-core (= ${binary:Version}),
diff --git a/patches/disable-sw-tests.diff b/patches/disable-sw-tests.diff
deleted file mode 100644
index de7e6f7..0000000
--- a/patches/disable-sw-tests.diff
+++ /dev/null
@@ -1,40 +0,0 @@
-From ca847d43de4c706f906f6473b05f4cf53c39feb7 Mon Sep 17 00:00:00 2001
-From: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
-Date: Sun, 9 Jun 2013 13:15:29 +0200
-Subject: [PATCH] disable sw tests for beta
-
----
- sw/Module_sw.mk | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
-index 202c67c..90d9416 100644
---- a/sw/Module_sw.mk
-+++ b/sw/Module_sw.mk
-@@ -53,7 +53,6 @@ $(eval $(call gb_Module_add_slowcheck_targets,sw,\
- CppunitTest_sw_ww8export \
- CppunitTest_sw_ww8import \
- CppunitTest_sw_rtfexport \
-- CppunitTest_sw_rtfimport \
- CppunitTest_sw_odfexport \
- CppunitTest_sw_odfimport \
- ))
-@@ -66,15 +65,12 @@ endif
-
- ifneq ($(OOO_JUNIT_JAR),)
- $(eval $(call gb_Module_add_subsequentcheck_targets,sw,\
-- JunitTest_sw_complex \
-- JunitTest_sw_unoapi \
- ))
- endif
-
- ifneq ($(DISABLE_PYTHON),TRUE)
- ifneq ($(OS),WNT)
- $(eval $(call gb_Module_add_subsequentcheck_targets,sw,\
-- PythonTest_sw_python \
- ))
- endif
- endif
---
-1.8.3
-
diff --git a/patches/fdo-35663.diff b/patches/fdo-35663.diff
deleted file mode 100644
index a933878..0000000
--- a/patches/fdo-35663.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Disable failing test for now, Heisenbug, only on amd64 it seems
-Bug: https://bugs.freedesktop.org/show_bug.cgi?id=35663
-Forwarded: not-needed
-Author: Rico Tzschichholz <ricotz at ubuntu.com>
-Last-Update: 2013-03-06
-
-diff --git a/sfx2/JunitTest_sfx2_complex.mk b/sfx2/JunitTest_sfx2_complex.mk
-index cb77929..25a1405 100644
---- a/sfx2/JunitTest_sfx2_complex.mk
-+++ b/sfx2/JunitTest_sfx2_complex.mk
-@@ -57,7 +57,6 @@ $(eval $(call gb_JunitTest_add_classes,sfx2_complex,\
- complex.sfx2.DocumentProperties \
- complex.sfx2.DocumentMetadataAccess \
- complex.sfx2.DocumentEvents \
-- complex.sfx2.UndoManager \
- ))
- # fd#35663 fails currently:
- # complex.sfx2.UndoManager \
diff --git a/patches/fdo-61896.diff b/patches/fdo-61896.diff
deleted file mode 100644
index a8129f5..0000000
--- a/patches/fdo-61896.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Disable failing test for now, Heisenbug, only on amd64 it seems
-Bug: https://bugs.freedesktop.org/show_bug.cgi?id=61896
-Forwarded: not-needed
-Author: Rico Tzschichholz <ricotz at ubuntu.com>
-Last-Update: 2013-03-06
-
---- libreoffice-4.0.1~rc1/chart2/qa/unoapi/sch.sce 2013-02-19 18:39:40.000000000 +0100
-+++ libreoffice-4.0.1~rc1/chart2/qa/unoapi/sch.sce 2013-03-03 16:54:46.192149252 +0100
-@@ -35,7 +35,7 @@
- -o sch.ChXChartView
- -o sch.ChXDataPoint
- #i83868 -o sch.ChXDataRow
---o sch.ChXDiagram
-+#fdo61896 -o sch.ChXDiagram
- -o sch.ChartArea
- -o sch.ChartGrid
- -o sch.ChartLegend
diff --git a/patches/fix-connectivity-in-postprocess.diff b/patches/fix-connectivity-in-postprocess.diff
deleted file mode 100644
index 8af9452..0000000
--- a/patches/fix-connectivity-in-postprocess.diff
+++ /dev/null
@@ -1,202 +0,0 @@
-From e9a670fbe23ed8b5d79b4eaf2db4444a7f986b72 Mon Sep 17 00:00:00 2001
-From: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
-Date: Wed, 21 Aug 2013 01:30:52 +0200
-Subject: [PATCH] bib dpb pcr and all of connectivity are all only build for
- DBCONNECTIVITY
-Forwarded: https://gerrit.libreoffice.org/#/c/5570/
-
-Change-Id: I843a5ccc0408e267cc2f333044f5b7ba39d1bdea
----
- postprocess/CustomTarget_registry.mk | 2 +-
- postprocess/Rdb_services.mk | 92 +++++++++++++++++++-----------------
- 2 files changed, 50 insertions(+), 44 deletions(-)
-
-diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk
-index 27825f3..dd496f3 100644
---- a/postprocess/CustomTarget_registry.mk
-+++ b/postprocess/CustomTarget_registry.mk
-@@ -287,7 +287,7 @@ ifeq ($(WITH_MOZAB4WIN),YES)
- postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/Office/DataAccess/Drivers-mozab.xcu
- postprocess_DRIVERS += mozab
- endif
--else ifeq (DESKTOP,$(filter DESKTOP,$(BUILD_TYPE)))
-+else ifeq (DBCONNECTIVITY,$(filter DESKTOP,$(BUILD_TYPE)))
- postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/Office/DataAccess/Drivers-mork.xcu
- postprocess_DRIVERS += mork
- endif
-diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
-index 936aac2..c7c34f6 100644
---- a/postprocess/Rdb_services.mk
-+++ b/postprocess/Rdb_services.mk
-@@ -124,14 +124,12 @@ $(eval $(call gb_Rdb_add_components,services,\
- $(if $(filter-out X86_64,$(CPUNAME)), \
- avmedia/source/quicktime/avmediaQuickTime \
- ) \
-- connectivity/source/drivers/macab/macab1 \
- lingucomponent/source/spellcheck/macosxspell/MacOSXSpell \
- fpicker/source/aqua/fps_aqua \
- shell/source/backends/macbe/macbe1 \
- vcl/vcl.macosx \
- ) \
- $(if $(filter WNT,$(OS)), \
-- connectivity/source/drivers/ado/ado \
- dtrans/source/generic/dtrans \
- dtrans/util/dnd \
- dtrans/util/ftransl \
-@@ -190,9 +188,6 @@ $(eval $(call gb_Rdb_add_components,services,\
- canvas/source/directx/directx9canvas \
- canvas/source/directx/gdipluscanvas \
- ) \
-- $(if $(ENABLE_EVOAB2), \
-- connectivity/source/drivers/evoab2/evoab \
-- ) \
- $(if $(ENABLE_GCONF), \
- shell/source/backends/gconfbe/gconfbe1 \
- ) \
-@@ -209,9 +204,6 @@ $(eval $(call gb_Rdb_add_components,services,\
- $(if $(ENABLE_GSTREAMER_0_10), \
- avmedia/source/gstreamer/avmediagstreamer_0_10 \
- ) \
-- $(if $(ENABLE_KAB), \
-- connectivity/source/drivers/kab/kab1 \
-- ) \
- $(if $(ENABLE_KDE), \
- shell/source/backends/kdebe/kdebe1 \
- ) \
-@@ -228,17 +220,12 @@ $(eval $(call gb_Rdb_add_components,services,\
- $(if $(ENABLE_TDE), \
- shell/source/backends/kdebe/tdebe1 \
- ) \
-- $(if $(ENABLE_TDEAB), \
-- connectivity/source/drivers/kab/tdeab1 \
-- ) \
- $(if $(SOLAR_JAVA), \
- xmerge/source/bridge/XMergeBridge \
- scripting/java/ScriptFramework \
- scripting/java/ScriptProviderForJava \
- smoketest/org/libreoffice/smoketest/smoketest \
- wizards/com/sun/star/wizards/form/form \
-- connectivity/source/drivers/hsqldb/hsqldb \
-- connectivity/source/drivers/jdbc/jdbc \
- wizards/com/sun/star/wizards/query/query \
- wizards/com/sun/star/wizards/report/report \
- wizards/com/sun/star/wizards/table/table \
-@@ -248,7 +235,35 @@ $(eval $(call gb_Rdb_add_components,services,\
- ifeq (DBCONNECTIVITY,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
-
- $(eval $(call gb_Rdb_add_components,services,\
-+ extensions/source/bibliography/bib \
-+ extensions/source/dbpilots/dbp \
-+ extensions/source/propctrlr/pcr \
-+ connectivity/source/cpool/dbpool2 \
-+ connectivity/source/dbtools/dbtools \
-+ $(if $(filter WNT,$(OS)), \
-+ connectivity/source/drivers/ado/ado \
-+ ) \
- connectivity/source/drivers/calc/calc \
-+ connectivity/source/drivers/dbase/dbase \
-+ $(if $(ENABLE_EVOAB2), \
-+ connectivity/source/drivers/evoab2/evoab \
-+ ) \
-+ connectivity/source/drivers/flat/flat \
-+ $(if $(ENABLE_KAB), \
-+ connectivity/source/drivers/kab/kab1 \
-+ ) \
-+ connectivity/source/drivers/mysql/mysql \
-+ $(if $(filter MACOSX,$(OS)), \
-+ connectivity/source/drivers/macab/macab1 \
-+ ) \
-+ $(if $(ENABLE_TDEAB), \
-+ connectivity/source/drivers/kab/tdeab1 \
-+ ) \
-+ $(if $(SOLAR_JAVA), \
-+ connectivity/source/drivers/hsqldb/hsqldb \
-+ connectivity/source/drivers/jdbc/jdbc \
-+ ) \
-+ connectivity/source/manager/sdbc2 \
- dbaccess/source/ext/macromigration/dbmm \
- dbaccess/source/filter/xml/dbaxml \
- dbaccess/util/dba \
-@@ -258,18 +273,33 @@ $(eval $(call gb_Rdb_add_components,services,\
- reportdesign/util/rpt \
- reportdesign/util/rptui \
- reportdesign/util/rptxml \
-- connectivity/source/drivers/dbase/dbase \
-- connectivity/source/cpool/dbpool2 \
-- connectivity/source/dbtools/dbtools \
-- connectivity/source/drivers/flat/flat \
-- connectivity/source/drivers/mysql/mysql \
-- connectivity/source/manager/sdbc2 \
- shell/source/backends/localebe/localebe1 \
- $(if $(filter-out ANDROID IOS,$(OS)),\
- connectivity/source/drivers/odbc/odbc \
- ) \
- ))
-
-+ifeq ($(OS),WNT)
-+
-+ifeq ($(WITH_MOZAB4WIN),YES)
-+$(eval $(call gb_Rdb_add_components,services,\
-+ connectivity/source/drivers/mozab/mozab \
-+))
-+else
-+$(eval $(call gb_Rdb_add_components,services,\
-+ connectivity/source/drivers/mozab/bootstrap/mozbootstrap \
-+))
-+endif
-+
-+else
-+
-+$(eval $(call gb_Rdb_add_components,services,\
-+ connectivity/source/drivers/mork/mork \
-+ connectivity/source/drivers/mozab/bootstrap/mozbootstrap \
-+))
-+
-+endif # WNT
-+
- endif # DBCONNECTIVITY
-
- ifeq (DESKTOP,$(filter DESKTOP,$(BUILD_TYPE)))
-@@ -281,11 +311,8 @@ $(eval $(call gb_Rdb_add_components,services,\
- desktop/source/offacc/offacc \
- $(if $(ENABLE_HEADLESS),,desktop/source/splash/spl) \
- extensions/source/abpilot/abp \
-- extensions/source/bibliography/bib \
- extensions/source/config/ldap/ldapbe2 \
-- extensions/source/dbpilots/dbp \
- extensions/source/logging/log \
-- extensions/source/propctrlr/pcr \
- extensions/source/resource/res \
- extensions/source/scanner/scn \
- extensions/source/update/feed/updatefeed \
-@@ -305,27 +332,6 @@ $(eval $(call gb_Rdb_add_components,services,\
- ) \
- ))
-
--ifeq ($(OS),WNT)
--
--ifeq ($(WITH_MOZAB4WIN),YES)
--$(eval $(call gb_Rdb_add_components,services,\
-- connectivity/source/drivers/mozab/mozab \
--))
--else
--$(eval $(call gb_Rdb_add_components,services,\
-- connectivity/source/drivers/mozab/bootstrap/mozbootstrap \
--))
--endif
--
--else
--
--$(eval $(call gb_Rdb_add_components,services,\
-- connectivity/source/drivers/mork/mork \
-- connectivity/source/drivers/mozab/bootstrap/mozbootstrap \
--))
--
--endif # WNT
--
- endif # DESKTOP
-
- ifeq ($(ENABLE_NPAPI_FROM_BROWSER),YES)
---
-1.8.3.2
-
diff --git a/patches/fix-for-poppler-0.24.diff b/patches/fix-for-poppler-0.24.diff
deleted file mode 100644
index 9f63073..0000000
--- a/patches/fix-for-poppler-0.24.diff
+++ /dev/null
@@ -1,38 +0,0 @@
-From 26f3411018c412f9173f1278fe9749b884e3d3b1 Mon Sep 17 00:00:00 2001
-From: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
-Date: Wed, 31 Jul 2013 14:55:24 +0200
-Subject: [PATCH] fix for poppler >0.23
-
-Change-Id: I89a3edce2d84855299d91a5a7142e40002258dcf
----
- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 6 +++++-
- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 6 +++++-
- 2 files changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-index 4ee6a59..a840f03 100644
---- libreoffice-4.1.1~rc1.orig/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 2013-08-20 16:42:11.632360951 +0200
-+++ libreoffice-4.1.1~rc1/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 2013-08-20 16:43:36.784356425 +0200
-@@ -492,7 +492,7 @@
- }
-
- void PDFOutDev::startPage(int /*pageNum*/, GfxState* state
--#if POPPLER_CHECK_VERSION(0, 23, 0)
-+#if POPPLER_CHECK_VERSION(0, 23, 0) || POPPLER_CHECK_VERSION(0, 24, 0)
- , XRef* /*xref*/
- #endif
- )
-diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
-index 2daa5b8..2a6d806 100644
---- libreoffice-4.1.1~rc1.orig/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx 2013-08-20 16:42:11.632360951 +0200
-+++ libreoffice-4.1.1~rc1/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx 2013-08-20 16:47:38.720343567 +0200
-@@ -179,7 +179,7 @@
-
- // Start a page.
- virtual void startPage(int pageNum, GfxState *state
--#if POPPLER_CHECK_VERSION(0, 23, 0)
-+#if POPPLER_CHECK_VERSION(0, 23, 0) || POPPLER_CHECK_VERSION(0, 24, 0)
- , XRef *xref
- #endif
- ) SAL_OVERRIDE;
-
diff --git a/patches/kubuntu_breeze-icons.diff b/patches/kubuntu_breeze-icons.diff
deleted file mode 100644
index adf22de..0000000
--- a/patches/kubuntu_breeze-icons.diff
+++ /dev/null
@@ -1,219 +0,0 @@
-commit 9ddb055641271aa33fe9f470c739eab9d146a4c6
-Author: Jonathan Riddell <jr at jriddell.org>
-Date: Sat Nov 22 20:36:09 2014 +0100
-
- Add Breeze icon theme for use with KDE Plasma 5
-
- Change-Id: I936d31300126e2ce000ea3a7cd70c8a2dec19502
- Reviewed-on: https://gerrit.libreoffice.org/13043
- Reviewed-by: Jan Holesovsky <kendy at collabora.com>
- Tested-by: Jan Holesovsky <kendy at collabora.com>
-
-Index: libreoffice-4.4.1/configure.ac
-===================================================================
---- libreoffice-4.4.1.orig/configure.ac
-+++ libreoffice-4.4.1/configure.ac
-@@ -1480,7 +1480,7 @@ AC_ARG_WITH(galleries,
- AC_ARG_WITH(theme,
- AS_HELP_STRING([--with-theme="theme1 theme2..."],
- [Choose which themes to include. By default those themes with an '*' are included.
-- Possible choices: *crystal, *galaxy, *hicontrast, human, industrial, *oxygen, *sifr, *tango, *tango_testing.]),
-+ Possible choices: *breeze, *crystal, *galaxy, *hicontrast, human, industrial, *oxygen, *sifr, *tango, *tango_testing.]),
- ,)
-
- AC_ARG_WITH(helppack-integration,
-@@ -11419,7 +11419,7 @@ dnl ====================================
- AC_MSG_CHECKING([which themes to include])
- # if none given use default subset of available themes
- if test "x$with_theme" = "x" -o "x$with_theme" = "xyes"; then
-- with_theme="crystal galaxy hicontrast oxygen tango sifr"
-+ with_theme="breeze crystal galaxy hicontrast oxygen tango sifr"
- test -z "$ENABLE_RELEASE_BUILD" && with_theme="$with_theme tango_testing"
- fi
-
-@@ -11427,7 +11427,7 @@ WITH_THEMES=""
- if test "x$with_theme" != "xno"; then
- for theme in $with_theme; do
- case $theme in
-- crystal|galaxy|hicontrast|human|industrial|oxygen|sifr|tango|tango_testing) real_theme="$theme" ;;
-+ breeze|crystal|galaxy|hicontrast|human|industrial|oxygen|sifr|tango|tango_testing) real_theme="$theme" ;;
- default) real_theme=galaxy ;;
- *) AC_MSG_ERROR([Unknown value for --with-theme: $theme]) ;;
- esac
-@@ -12701,7 +12701,7 @@ if test "$enable_mpl_subset" = "yes"; th
- fi
- for theme in $WITH_THEMES; do
- case $theme in
-- crystal|default|hicontrast|human|oxygen|sifr)
-+ breeze|crystal|default|hicontrast|human|oxygen|sifr)
- AC_MSG_ERROR([need to disable icon themes from '$WITH_THEMES': $theme present, use --with-theme=tango]) ;;
- *) : ;;
- esac
-Index: libreoffice-4.4.1/cui/uiconfig/ui/optviewpage.ui
-===================================================================
---- libreoffice-4.4.1.orig/cui/uiconfig/ui/optviewpage.ui
-+++ libreoffice-4.4.1/cui/uiconfig/ui/optviewpage.ui
-@@ -441,6 +441,7 @@
- <item translatable="yes">Classic</item>
- <item translatable="yes">Human</item>
- <item translatable="yes">Sifr</item>
-+ <item translatable="yes">Breeze</item>
- <item translatable="yes">Tango Testing</item>
- </items>
- </object>
-Index: libreoffice-4.4.1/icon-themes/breeze/COPYING
-===================================================================
---- /dev/null
-+++ libreoffice-4.4.1/icon-themes/breeze/COPYING
-@@ -0,0 +1,20 @@
-+Breeze icon theme from KDE to fit in with the Plasma 5 desktop.
-+
-+Breeze Icon Theme has been developed by The KDE Visual Design Group.
-+https://forum.kde.org/viewforum.php?f=285
-+
-+Copyright 2014 Uri Herrera <kaisergreymon99 at gmail.com> and other contributors
-+
-+This program is free software; you can redistribute it and/or
-+modify it under the terms of the GNU General Public License as
-+published by the Free Software Foundation; either version 2 of
-+the License, or (at your option) any later version.
-+
-+This program is distributed in the hope that it will be useful,
-+but WITHOUT ANY WARRANTY; without even the implied warranty of
-+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+GNU General Public License for more details.
-+
-+You should have received a copy of the GNU General Public License
-+along with this program. If not, see <http://www.gnu.org/licenses/>.
-+
-Index: libreoffice-4.4.1/icon-themes/breeze/mapping
-===================================================================
---- /dev/null
-+++ libreoffice-4.4.1/icon-themes/breeze/mapping
-@@ -0,0 +1,4 @@
-+actions/toolbar/document-save.svg cmd/lc_save.png 26
-+actions/toolbar/document-save.svg cmd/sc_save.png 16
-+actions/toolbar/document-save-as.svg cmd/lc_saveas.png 26
-+actions/toolbar/document-save-as.svg cmd/sc_saveas.png 16
-Index: libreoffice-4.4.1/icon-themes/breeze/update-icons.py
-===================================================================
---- /dev/null
-+++ libreoffice-4.4.1/icon-themes/breeze/update-icons.py
-@@ -0,0 +1,24 @@
-+#!/usr/bin/python3
-+# Copyright 2014 Jonathan Riddell <jr at jriddell.org>
-+# May be copied under the MPLv2
-+# Map breeze freedesktop named icons to libreoffice icon names
-+
-+import os
-+import subprocess
-+
-+if os.path.isdir("plasma-next-icons"):
-+ os.chdir("plasma-next-icons")
-+ subprocess.check_call(["git", "pull", "-r"])
-+ os.chdir("..")
-+else:
-+ subprocess.check_call(["git", "clone", "https://github.com/NitruxSA/plasma-next-icons.git"])
-+
-+mapping = {}
-+
-+mappingFile = open('mapping', 'r')
-+for line in mappingFile:
-+ freeDesktopFile = "plasma-next-icons/" + line.rsplit(" ")[0]
-+ libreOfficeFile = line.rsplit(" ")[1].rstrip()
-+ size = line.rsplit(" ")[2].rstrip()
-+ print(freeDesktopFile + " → " + libreOfficeFile + " @ " + size+"x"+size)
-+ subprocess.check_call(["ksvgtopng", size, size, freeDesktopFile, libreOfficeFile])
-Index: libreoffice-4.4.1/officecfg/registry/schema/org/openoffice/Office/Common.xcs
-===================================================================
---- libreoffice-4.4.1.orig/officecfg/registry/schema/org/openoffice/Office/Common.xcs
-+++ libreoffice-4.4.1/officecfg/registry/schema/org/openoffice/Office/Common.xcs
-@@ -5666,6 +5666,16 @@
- <desc>Sifr - an adaptation of the Gnome symbolic theme</desc>
- </info>
- </enumeration>
-+ <enumeration oor:value="breeze">
-+ <info>
-+ <desc>Breeze - the icon theme from KDE Plasma</desc>
-+ </info>
-+ </enumeration>
-+ <enumeration oor:value="oxygen">
-+ <info>
-+ <desc>Oxygen - the icon theme from KDE 4</desc>
-+ </info>
-+ </enumeration>
- </constraints>
- <value>auto</value>
- </prop>
-Index: libreoffice-4.4.1/vcl/inc/unx/desktops.hxx
-===================================================================
---- libreoffice-4.4.1.orig/vcl/inc/unx/desktops.hxx
-+++ libreoffice-4.4.1/vcl/inc/unx/desktops.hxx
-@@ -29,7 +29,8 @@ enum DesktopType {
- DESKTOP_MATE,
- DESKTOP_TDE,
- DESKTOP_KDE,
-- DESKTOP_KDE4
-+ DESKTOP_KDE4,
-+ DESKTOP_KDE5
- }; // keep in sync with desktop_strings[] in salplug.cxx
-
- #endif // INCLUDED_VCL_INC_UNX_DESKTOPS_HXX
-Index: libreoffice-4.4.1/vcl/source/app/IconThemeSelector.cxx
-===================================================================
---- libreoffice-4.4.1.orig/vcl/source/app/IconThemeSelector.cxx
-+++ libreoffice-4.4.1/vcl/source/app/IconThemeSelector.cxx
-@@ -63,6 +63,9 @@ IconThemeSelector::GetIconThemeForDeskto
- else if ( desktopEnvironment.equalsIgnoreAsciiCase("kde4") ) {
- r = "oxygen";
- }
-+ else if ( desktopEnvironment.equalsIgnoreAsciiCase("kde5") ) {
-+ r = "breeze";
-+ }
- else if ( desktopEnvironment.equalsIgnoreAsciiCase("MacOSX") ) {
- r = "sifr";
- }
-Index: libreoffice-4.4.1/vcl/unx/generic/desktopdetect/desktopdetector.cxx
-===================================================================
---- libreoffice-4.4.1.orig/vcl/unx/generic/desktopdetect/desktopdetector.cxx
-+++ libreoffice-4.4.1/vcl/unx/generic/desktopdetect/desktopdetector.cxx
-@@ -303,7 +303,7 @@ DESKTOP_DETECTOR_PUBLIC DesktopType get_
- if ( aOver.equalsIgnoreAsciiCase( "tde" ) )
- return DESKTOP_TDE;
- if ( aOver.equalsIgnoreAsciiCase( "kde5" ) )
-- return DESKTOP_KDE4;
-+ return DESKTOP_KDE5;
- if ( aOver.equalsIgnoreAsciiCase( "kde4" ) )
- return DESKTOP_KDE4;
- if ( aOver.equalsIgnoreAsciiCase( "gnome" ) )
-@@ -391,7 +391,7 @@ DESKTOP_DETECTOR_PUBLIC DesktopType get_
- // 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;
-+ ret = DESKTOP_KDE5;
- else if ( is_kde4_desktop( pDisplay ) )
- ret = DESKTOP_KDE4;
- else if ( is_gnome_desktop( pDisplay ) )
-Index: libreoffice-4.4.1/vcl/unx/generic/plugadapt/salplug.cxx
-===================================================================
---- libreoffice-4.4.1.orig/vcl/unx/generic/plugadapt/salplug.cxx
-+++ libreoffice-4.4.1/vcl/unx/generic/plugadapt/salplug.cxx
-@@ -194,7 +194,7 @@ static SalInstance* autodetect_plugin()
- pList = pKDEFallbackList;
- nListEntry = 1;
- }
-- else if( desktop == DESKTOP_KDE4 )
-+ else if( desktop == DESKTOP_KDE4 || desktop == DESKTOP_KDE5 )
- pList = pKDEFallbackList;
-
- SalInstance* pInst = NULL;
-@@ -288,7 +288,7 @@ const OUString& SalGetDesktopEnvironment
- static const char * const desktop_strings[] = {
- "none", "unknown", "GNOME", "UNITY",
- "XFCE", "MATE", "TDE",
-- "KDE", "KDE4" };
-+ "KDE", "KDE4", "KDE5" };
- static OUString aRet;
- if( aRet.isEmpty())
- {
diff --git a/patches/lp-1182170-disable-XMLImport-subsequentcheck-on-sauc.diff b/patches/lp-1182170-disable-XMLImport-subsequentcheck-on-sauc.diff
deleted file mode 100644
index d71bc63..0000000
--- a/patches/lp-1182170-disable-XMLImport-subsequentcheck-on-sauc.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-From 1e91c038752d0eae719b0a7dd2293a1fe8dbe571 Mon Sep 17 00:00:00 2001
-From: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
-Date: Mon, 27 May 2013 13:07:32 +0200
-Subject: [PATCH] lp#1182170: disable XMLImport subsequentcheck on saucy
-
-LibreOffice 4.1 should be able to handle the test again.
-
-Change-Id: I4e216568600f70261056d3a4ed5a7f694d23bd81
----
- sw/qa/unoapi/sw.sce | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/sw/qa/unoapi/sw.sce b/sw/qa/unoapi/sw.sce
-index 4ea9fab..5873580 100644
---- a/sw/qa/unoapi/sw.sce
-+++ b/sw/qa/unoapi/sw.sce
-@@ -102,7 +102,7 @@
- -o sw.XMLContentExporter
- #i23394 -o sw.XMLContentImporter
- #i111194-o sw.XMLExporter
---o sw.XMLImporter
-+#lp#1182170 -o sw.XMLImporter
- #i23394 -o sw.XMLMetaExporter
- -o sw.XMLMetaImporter
- -o sw.XMLSettingsExporter
---
-1.8.1.2
-
diff --git a/patches/lp-1204592-activate-menues-even-earlier-to-reduce-la.diff b/patches/lp-1204592-activate-menues-even-earlier-to-reduce-la.diff
deleted file mode 100644
index 81837c7..0000000
--- a/patches/lp-1204592-activate-menues-even-earlier-to-reduce-la.diff
+++ /dev/null
@@ -1,91 +0,0 @@
-From 13badfb5ccd296faf480b19b2b33f7633f4085c5 Mon Sep 17 00:00:00 2001
-From: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
-Date: Thu, 5 Sep 2013 10:50:06 +0200
-Subject: [PATCH] lp#1204592: activate menues even earlier to reduce latency
-Forwarded: https://gerrit.libreoffice.org/gitweb?p=core.git;a=commitdiff;h=13badfb5ccd296faf480b19b2b33f7633f4085c5;hp=43b84bbba2519686eb6b0463f422bf695d2d74b9
-
-Change-Id: I54dc06c1bcd708fb666813ec2d0ca79acba361a0
----
- vcl/inc/unx/gtk/gtkframe.hxx | 4 ++++
- vcl/unx/gtk/window/gloactiongroup.cxx | 8 ++++++++
- vcl/unx/gtk/window/gtksalframe.cxx | 14 ++++++++++++++
- 3 files changed, 26 insertions(+)
-
-diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
-index cce16ab..c2bb187 100644
---- a/vcl/inc/unx/gtk/gtkframe.hxx
-+++ b/vcl/inc/unx/gtk/gtkframe.hxx
-@@ -219,6 +219,10 @@ class GtkSalFrame : public SalFrame
- SalMenu* m_pSalMenu;
-
- #if defined(ENABLE_DBUS) && defined(ENABLE_GIO)
-+ public:
-+ void EnsureDbusMenuSynced();
-+ private:
-+ SalMenu* m_pLastSyncedDbusMenu;
- friend void ensure_dbus_setup(GdkWindow* gdkWindow, GtkSalFrame* pSalFrame);
- friend void on_registrar_available (GDBusConnection*, const gchar*, const gchar*, gpointer);
- friend void on_registrar_unavailable (GDBusConnection*, const gchar*, gpointer);
-diff --git a/vcl/unx/gtk/window/gloactiongroup.cxx b/vcl/unx/gtk/window/gloactiongroup.cxx
-index 78fecf0..19187a6 100644
---- a/vcl/unx/gtk/window/gloactiongroup.cxx
-+++ b/vcl/unx/gtk/window/gloactiongroup.cxx
-@@ -144,8 +144,15 @@ g_lo_action_group_query_action (GActionGroup *group,
- if (action == NULL)
- return FALSE;
-
-+
- if (enabled)
-+ {
-+ GtkSalFrame* pFrame = lo_group->priv->frame;
-+ if (pFrame) {
-+ pFrame->EnsureDbusMenuSynced();
-+ }
- *enabled = action->enabled;
-+ }
-
- if (parameter_type)
- *parameter_type = action->parameter_type;
-@@ -193,6 +200,7 @@ g_lo_action_group_change_state (GActionGroup *group,
- const gchar *action_name,
- GVariant *value)
- {
-+ SAL_INFO("vcl.unity", "g_lo_action_group_change_state on " << group );
- g_return_if_fail (value != NULL);
-
- g_variant_ref_sink (value);
-diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx
-index 8eda04a..ac64628 100644
---- a/vcl/unx/gtk/window/gtksalframe.cxx
-+++ b/vcl/unx/gtk/window/gtksalframe.cxx
-@@ -482,6 +482,9 @@ GtkSalFrame::GtkSalFrame( SystemParentData* pSysData )
- GetGenericData()->ErrorTrapPush();
- m_bDefaultPos = true;
- m_bDefaultSize = true;
-+#if defined(ENABLE_DBUS) && defined(ENABLE_GIO)
-+ m_pLastSyncedDbusMenu = NULL;
-+#endif
- Init( pSysData );
- }
-
-@@ -521,6 +524,17 @@ static void ObjectDestroyedNotify( gpointer data )
- }
- }
-
-+#if defined(ENABLE_DBUS) && defined(ENABLE_GIO)
-+void GtkSalFrame::EnsureDbusMenuSynced()
-+{
-+ GtkSalMenu* pSalMenu = static_cast<GtkSalMenu*>(GetMenu());
-+ if(m_pLastSyncedDbusMenu != pSalMenu) {
-+ m_pLastSyncedDbusMenu = pSalMenu;
-+ static_cast<GtkSalMenu*>(pSalMenu)->Activate();
-+ }
-+}
-+#endif
-+
- static void hud_activated( gboolean hud_active, gpointer user_data )
- {
- if ( hud_active )
---
-1.8.3.2
-
diff --git a/patches/lp-1418551.diff b/patches/lp-1418551.diff
deleted file mode 100644
index 7a94eed..0000000
--- a/patches/lp-1418551.diff
+++ /dev/null
@@ -1,50 +0,0 @@
-From be88e305eeac88e51f83efc004d4b60b87f1e757 Mon Sep 17 00:00:00 2001
-From: Michael Stahl <mstahl at redhat.com>
-Date: Tue, 12 May 2015 13:47:38 +0200
-Subject: tdf#90969: basic: add horrible hack to avoid crash due to ...
-
-... the stupid global variable GaDocBasicItems.
-
-Change-Id: Ib849e0e2b661e54005d00091f6d6fc474dc5549b
-
-diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
-index 559cb3c..a8f1bc6 100644
---- a/basic/source/classes/sb.cxx
-+++ b/basic/source/classes/sb.cxx
-@@ -24,6 +24,7 @@
- #include <tools/rcid.h>
- #include <tools/stream.hxx>
- #include <tools/errinf.hxx>
-+#include <tools/solarmutex.hxx>
- #include <basic/sbx.hxx>
- #include <tools/rc.hxx>
- #include <vcl/svapp.hxx>
-@@ -109,10 +110,22 @@ DocBasicItem::DocBasicItem( StarBASIC& rDocBasic ) :
-
- DocBasicItem::~DocBasicItem()
- {
-- SolarMutexGuard g;
-+ // tdf#90969 HACK: don't use SolarMutexGuard - there is a horrible global
-+ // map GaDocBasicItems holding instances, and these get deleted from exit
-+ // handlers, when the SolarMutex is already dead
-+ tools::SolarMutex::Acquire();
-
-- stopListening();
-- mxClassModules.Clear(); // release with SolarMutex locked
-+ try
-+ {
-+ stopListening();
-+ mxClassModules.Clear(); // release with SolarMutex locked
-+ }
-+ catch (...)
-+ {
-+ assert(false);
-+ }
-+
-+ tools::SolarMutex::Release();
- }
-
- void DocBasicItem::clearDependingVarsOnDelete( StarBASIC& rDeletedBasic )
---
-cgit v0.10.2
-
diff --git a/patches/mailmerge-base.diff b/patches/mailmerge-base.diff
deleted file mode 100644
index aea0ad0..0000000
--- a/patches/mailmerge-base.diff
+++ /dev/null
@@ -1,162 +0,0 @@
-From: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
-Date: Tue, 19 May 2015 13:58:13 +0200
-Subject: [PATCH] check for and handle missing base in mail merge (related:
- fdo#33266)
-
-Change-Id: I3e362a873c28026cbecf005c07def1295aa920e0
-
-Conflicts:
- sw/source/uibase/app/apphdl.cxx
-
----
- include/svtools/restartdialog.hxx | 5 +++-
- svtools/source/dialogs/restartdialog.cxx | 3 +++
- svtools/uiconfig/ui/restartdialog.ui | 15 +++++++++++
- sw/source/uibase/app/apphdl.cxx | 45 +++++++++++++++++++++++++++++++-
- 4 files changed, 66 insertions(+), 2 deletions(-)
-
-diff --git a/include/svtools/restartdialog.hxx b/include/svtools/restartdialog.hxx
---- a/include/svtools/restartdialog.hxx
-+++ b/include/svtools/restartdialog.hxx
-@@ -29,9 +29,12 @@ enum RestartReason {
- RESTART_REASON_PDF_AS_STANDARD_JOB_FORMAT,
- // For the modified default print job format to take effect,
- // %PRODUCTNAME must be restarted.
-- RESTART_REASON_BIBLIOGRAPHY_INSTALL
-+ RESTART_REASON_BIBLIOGRAPHY_INSTALL,
- // "For the bibliography to work properly,
- // %PRODUCTNAME must be restarted."
-+ RESTART_REASON_MAILMERGE_INSTALL
-+ // "For the mail merge to work properly,
-+ // %PRODUCTNAME must be restarted."
- };
-
- // Must be called with the solar mutex locked:
-diff --git a/svtools/source/dialogs/restartdialog.cxx b/svtools/source/dialogs/restartdialog.cxx
---- a/svtools/source/dialogs/restartdialog.cxx
-+++ b/svtools/source/dialogs/restartdialog.cxx
-@@ -40,6 +40,9 @@ public:
- case svtools::RESTART_REASON_BIBLIOGRAPHY_INSTALL:
- get(reason_, "reason_bibliography_install");
- break;
-+ case svtools::RESTART_REASON_MAILMERGE_INSTALL:
-+ get(reason_, "reason_mailmerge_install");
-+ break;
- default:
- assert(false); // this cannot happen
- }
-diff --git a/svtools/uiconfig/ui/restartdialog.ui b/svtools/uiconfig/ui/restartdialog.ui
---- a/svtools/uiconfig/ui/restartdialog.ui
-+++ b/svtools/uiconfig/ui/restartdialog.ui
-@@ -101,6 +101,21 @@
- </packing>
- </child>
- <child>
-+ <object class="GtkLabel" id="reason_mailmerge_install">
-+ <property name="can_focus">False</property>
-+ <property name="no_show_all">True</property>
-+ <property name="xalign">0</property>
-+ <property name="label" translatable="yes">For the mail merge to work properly, %PRODUCTNAME must be restarted.</property>
-+ <property name="wrap">True</property>
-+ <property name="max_width_chars">50</property>
-+ </object>
-+ <packing>
-+ <property name="expand">False</property>
-+ <property name="fill">True</property>
-+ <property name="position">2</property>
-+ </packing>
-+ </child>
-+ <child>
- <object class="GtkLabel" id="label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
-diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx
---- a/sw/source/uibase/app/apphdl.cxx
-+++ b/sw/source/uibase/app/apphdl.cxx
-@@ -21,17 +21,19 @@
-
- #include <hintids.hxx>
-
-+#include <comphelper/processfactory.hxx>
- #include <osl/diagnose.h>
- #include <tools/link.hxx>
- #include <svl/urihelper.hxx>
- #include <unotools/pathoptions.hxx>
--#include <svtools/accessibilityoptions.hxx>
- #include <sfx2/dispatch.hxx>
- #include <sfx2/event.hxx>
- #include <sfx2/objitem.hxx>
- #include <svx/dataaccessdescriptor.hxx>
- #include <svl/srchitem.hxx>
-+#include <svtools/accessibilityoptions.hxx>
- #include <svtools/colorcfg.hxx>
-+#include <svtools/restartdialog.hxx>
- #include <svl/eitem.hxx>
- #include <svl/whiter.hxx>
- #include <svl/isethint.hxx>
-@@ -92,7 +94,9 @@
- #include <com/sun/star/beans/XPropertyContainer.hpp>
- #include <com/sun/star/container/XChild.hpp>
- #include <com/sun/star/sdbc/XConnection.hpp>
-+#include <com/sun/star/sdb/TextConnectionSettings.hpp>
- #include <com/sun/star/sdbc/XDataSource.hpp>
-+#include <org/freedesktop/PackageKit/SyncDbusSessionHelper.hpp>
- #include <swabstdlg.hxx>
-
- #include <vcl/status.hxx>
-@@ -115,6 +119,24 @@ using namespace ::com::sun::star;
-
- #include <shells.hrc>
-
-+namespace
-+{
-+ static bool lcl_hasAllComponentsAvailable()
-+ {
-+ try
-+ {
-+ return css::sdb::TextConnectionSettings::create(comphelper::getProcessComponentContext()).is();
-+ }
-+ catch (css::uno::Exception & e)
-+ {
-+ SAL_INFO(
-+ "sw.core",
-+ "assuming Base to be missing; caught " << e.Message);
-+ return false;
-+ }
-+ }
-+}
-+
- SFX_IMPL_INTERFACE(SwModule, SfxModule, SW_RES(RID_SW_NAME) )
-
- void SwModule::InitInterface_Impl()
-@@ -277,6 +299,27 @@ SwMailMergeWizardExecutor::~SwMailMergeWizardExecutor()
-
- void SwMailMergeWizardExecutor::ExecuteMailMergeWizard( const SfxItemSet * pArgs )
- {
-+ if(!lcl_hasAllComponentsAvailable())
-+ {
-+ try
-+ {
-+ using namespace org::freedesktop::PackageKit;
-+ using namespace svtools;
-+ css::uno::Reference< XSyncDbusSessionHelper > xSyncDbusSessionHelper(SyncDbusSessionHelper::create(comphelper::getProcessComponentContext()));
-+ css::uno::Sequence< OUString > vPackages(1); vPackages[0] = "libreoffice-base";
-+ OUString sInteraction;
-+ xSyncDbusSessionHelper->InstallPackageNames(0, vPackages, sInteraction);
-+ SolarMutexGuard aGuard;
-+ executeRestartDialog(comphelper::getProcessComponentContext(), NULL, RESTART_REASON_MAILMERGE_INSTALL);
-+ }
-+ catch (const css::uno::Exception & e)
-+ {
-+ SAL_INFO(
-+ "sw.core",
-+ "trying to install LibreOffice Base, caught " << e.Message);
-+ }
-+ return;
-+ }
- if ( m_pView )
- {
- OSL_FAIL("SwMailMergeWizardExecutor::ExecuteMailMergeWizard: Already executing the wizard!" );
---
-1.9.1
-
diff --git a/patches/quicklistfix.diff b/patches/quicklistfix.diff
deleted file mode 100644
index 720330b..0000000
--- a/patches/quicklistfix.diff
+++ /dev/null
@@ -1,89 +0,0 @@
-From: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
-Date: Fri, 23 Oct 2015 10:26:11 +0200
-Subject: [PATCH] lp#1170035: Fix l10n for quicklist
-
----
- solenv/bin/desktop-translate.pl | 2 +-
- sysui/desktop/menus/base.desktop | 2 +-
- sysui/desktop/menus/calc.desktop | 2 +-
- sysui/desktop/menus/draw.desktop | 2 +-
- sysui/desktop/menus/impress.desktop | 2 +-
- sysui/desktop/menus/math.desktop | 2 +-
- sysui/desktop/menus/writer.desktop | 2 +-
- 7 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/solenv/bin/desktop-translate.pl b/solenv/bin/desktop-translate.pl
---- a/solenv/bin/desktop-translate.pl
-+++ b/solenv/bin/desktop-translate.pl
-@@ -66,7 +66,7 @@ if (!defined $template_dir) {
-
- # hack for unity section
- my $outkey = $key;
--if ( $outkey eq "UnityQuicklist" ) {
-+if ( $outkey eq "UnityQuickList" ) {
- $outkey = "Name";
- }
-
-diff --git a/sysui/desktop/menus/base.desktop b/sysui/desktop/menus/base.desktop
---- a/sysui/desktop/menus/base.desktop
-+++ b/sysui/desktop/menus/base.desktop
-@@ -35,5 +35,5 @@ X-KDE-Protocols=file,http,ftp,webdav
-
- Actions=NewDocument;
- [Desktop Action NewDocument]
--Name=New Database
-+UnityQuickList=New Database
- Exec=${UNIXBASISROOTNAME} --base
-diff --git a/sysui/desktop/menus/calc.desktop b/sysui/desktop/menus/calc.desktop
---- a/sysui/desktop/menus/calc.desktop
-+++ b/sysui/desktop/menus/calc.desktop
-@@ -35,5 +35,5 @@ X-KDE-Protocols=file,http,ftp,webdav
-
- Actions=NewDocument;
- [Desktop Action NewDocument]
--Name=New Spreadsheet
-+UnityQuickList=New Spreadsheet
- Exec=${UNIXBASISROOTNAME} --calc
-diff --git a/sysui/desktop/menus/draw.desktop b/sysui/desktop/menus/draw.desktop
---- a/sysui/desktop/menus/draw.desktop
-+++ b/sysui/desktop/menus/draw.desktop
-@@ -35,5 +35,5 @@ X-KDE-Protocols=file,http,ftp,webdav
-
- Actions=NewDocument;
- [Desktop Action NewDocument]
--Name=New Drawing
-+UnityQuickList=New Drawing
- Exec=${UNIXBASISROOTNAME} --draw
-diff --git a/sysui/desktop/menus/impress.desktop b/sysui/desktop/menus/impress.desktop
---- a/sysui/desktop/menus/impress.desktop
-+++ b/sysui/desktop/menus/impress.desktop
-@@ -35,5 +35,5 @@ X-KDE-Protocols=file,http,ftp,webdav
-
- Actions=NewDocument;
- [Desktop Action NewDocument]
--Name=New Presentation
-+UnityQuickList=New Presentation
- Exec=${UNIXBASISROOTNAME} --impress
-diff --git a/sysui/desktop/menus/math.desktop b/sysui/desktop/menus/math.desktop
---- a/sysui/desktop/menus/math.desktop
-+++ b/sysui/desktop/menus/math.desktop
-@@ -36,5 +36,5 @@ X-KDE-Protocols=file,http,ftp,webdav
-
- Actions=NewDocument;
- [Desktop Action NewDocument]
--Name=New Formula
-+UnityQuickList=New Formula
- Exec=${UNIXBASISROOTNAME} --math
-diff --git a/sysui/desktop/menus/writer.desktop b/sysui/desktop/menus/writer.desktop
---- a/sysui/desktop/menus/writer.desktop
-+++ b/sysui/desktop/menus/writer.desktop
-@@ -35,5 +35,5 @@ X-KDE-Protocols=file,http,ftp,webdav
-
- Actions=NewDocument;
- [Desktop Action NewDocument]
--Name=New Document
-+UnityQuickList=New Document
- Exec=${UNIXBASISROOTNAME} --writer
---
-2.1.4
-
diff --git a/patches/vbamacro.diff b/patches/vbamacro.diff
deleted file mode 100644
index 3ecd898..0000000
--- a/patches/vbamacro.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Stephan Bergmann <sbergman at redhat.com>
-Date: Tue, 20 May 2014 14:55:40 +0200
-Subject: [PATCH] Use varying aElement name
-
-Change-Id: Idc135ef5031a01961cc18d897a734b598bc833f4
----
- sfx2/source/doc/docmacromode.cxx | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/sfx2/source/doc/docmacromode.cxx b/sfx2/source/doc/docmacromode.cxx
---- a/sfx2/source/doc/docmacromode.cxx
-+++ b/sfx2/source/doc/docmacromode.cxx
-@@ -342,7 +342,7 @@ namespace sfx2
- if( aElement == aStdLibName || aElement == aVBAProject )
- {
- Reference < XNameAccess > xLib;
-- Any aAny = xContainer->getByName( aStdLibName );
-+ Any aAny = xContainer->getByName( aElement );
- aAny >>= xLib;
- if ( xLib.is() && xLib->hasElements() )
- return sal_True;
---
-1.9.1
-
diff --git a/rules b/rules
index a108a86..6aaffd5 100755
--- a/rules
+++ b/rules
@@ -70,7 +70,7 @@ ifeq "$(USE_GIT_TARBALLS)" "y"
GIT_BASEURL:=git://anongit.freedesktop.org/libreoffice
# bootstraping this from the source tree is breaking get-orig-source
#lo_sources_ver=$(shell grep AC_INIT $(SOURCE_TREE)/configure.ac | grep documentfoundation | cut -d, -f2 | sed -e 's,\[,,' -e 's,\],,')
-lo_sources_ver=libreoffice-5.1.0.0.alpha1-buildfix1
+lo_sources_ver=5.1.0.0.alpha1-buildfix1
# NOT in proper libreoffice-3-6 branch
# use ./g checkout -b tag-libreoffice-3.6.2.1 libreoffice-3.6.2.1
GIT_TAG=libreoffice-$(lo_sources_ver)
diff --git a/source/include-binaries b/source/include-binaries
index dddf16b..e49da42 100644
--- a/source/include-binaries
+++ b/source/include-binaries
@@ -1,4 +1,3 @@
debian/templates/debian-presentation.otp
debian/templates/debian-presentation-background.xcf
sc/qa/unit/data/ods/passwordOld.ods
-debian/breeze.tar.xz
--
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