summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2018-09-13 13:38:14 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2018-09-13 13:38:14 +0000
commitc86a050c1474b17bf19813bdc0050a04812347b4 (patch)
treea87f6412f806e4863dd446576834d5a5ad58cfef
parentMerging upstream version 1:6.1.1. (diff)
downloadlibreoffice-c86a050c1474b17bf19813bdc0050a04812347b4.zip
libreoffice-c86a050c1474b17bf19813bdc0050a04812347b4.tar.xz
Merging debian version 1:6.1.1-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/changelog36
-rw-r--r--debian/control13
-rw-r--r--debian/control.in12
-rw-r--r--debian/patches/apparmor-cleanups.diff9
-rw-r--r--debian/patches/apparmor-fixes.diff57
-rw-r--r--debian/patches/apparmor-kde.diff144
-rw-r--r--debian/patches/fix-gtk3_kde5-filepicker-infinite-loop.diff52
-rw-r--r--debian/patches/series4
-rwxr-xr-xdebian/rules4
9 files changed, 292 insertions, 39 deletions
diff --git a/debian/changelog b/debian/changelog
index 1cf0fae..cc909b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,39 @@
+libreoffice (1:6.1.1-1) unstable; urgency=medium
+
+ * New upstream release
+
+ * debian/patches/fix-gtk3_kde5-filepicker-infinite-loop.diff: add from
+ libreoffice-6-1 branch: fixes possible infinite loop in gtk3_kde5
+ filepicker (closes: #906987)
+
+ -- Rene Engelhard <rene@debian.org> Mon, 10 Sep 2018 23:38:40 +0200
+
+libreoffice (1:6.1.1~rc1-2) unstable; urgency=medium
+
+ * debian/patches/apparmor-fixes.diff: add patch from master to
+ allow printing to file
+ * debian/patches/do-not-reset-permissions-on-save.diff: as name says,
+ from libreoffice-6-1 branch (closes: #907476)
+
+ * debian/rules: move libdbahsqllo.so from -base-drivers to -base-core
+ (closes: #907397)
+ * debian/control.in:
+ - add Replaces: for above
+ - bump ure Dependency in -core to (>= 6.1.1~) (closes: #907650)
+
+ -- Rene Engelhard <rene@debian.org> Fri, 31 Aug 2018 12:45:39 +0200
+
+libreoffice (1:6.1.1~rc1-1) unstable; urgency=medium
+
+ * New upstream release candidate
+
+ * debian/patches/apparmor-kde.diff: backport AppArmor KDE fixes from
+ master
+ * debian/control.in:
+ - *really* recommend apparmor (>= 2.13)
+
+ -- Rene Engelhard <rene@debian.org> Fri, 24 Aug 2018 18:57:08 +0200
+
libreoffice (1:6.1.0-1~dschinn1) dschinn-backports; urgency=medium
* Uploading to dschinn-backports, remaining changes:
diff --git a/debian/control b/debian/control
index 32a191d..30c8857 100644
--- a/debian/control
+++ b/debian/control
@@ -363,7 +363,7 @@ Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreeb
Depends: fontconfig,
fonts-opensymbol,
libreoffice-common (>> ${base-version}),
- ure (>= 6.0.0~),
+ ure (>= 6.1.1~),
${misc:Depends},
${shlibs:Depends}
Recommends: libpaper-utils
@@ -400,7 +400,8 @@ Depends: libreoffice-style-colibre,
${misc:Depends},
${numbertext-data-recommends}
Suggests: libreoffice-style
-Recommends: fonts-liberation2 | ttf-mscorefonts-installer,
+Recommends: apparmor (>= 2.13),
+ fonts-liberation2 | ttf-mscorefonts-installer,
xdg-utils,
${pyuno-depends},
${textcat-data-recommends}
@@ -539,15 +540,17 @@ Depends: libreoffice-core (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
Suggests: libreoffice-base
+Replaces: libreoffice-base-drivers (<< 1:6.1.1~rc1-2)
Description: office productivity suite -- shared library
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
.
- This package contains libdba, a common library of the LibreOffice
- suite used by Base, Writer and Calc.
+ This package contains common libraries of LibreOffice Base used by
+ Base, Writer and Calc.
.
If you need full Base functionality (or actual database drivers), please
- install libreoffice-base.
+ install libreoffice-base (and/or libreoffice-base-drivers and/o
+ libreoffice-sdbc-*).
Package: libreoffice-base
Architecture: alpha amd64 arm64 armel armhf i386 m68k mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386
diff --git a/debian/control.in b/debian/control.in
index 1ab372f..bbd32de 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -166,7 +166,7 @@ Architecture: %OOO_ARCHS%
Depends: fontconfig,
fonts-opensymbol,
libreoffice-common (>> ${base-version}),
- ure (>= 6.0.0~),
+ ure (>= 6.1.1~),
${misc:Depends},
${shlibs:Depends}
Recommends: libpaper-utils
@@ -199,7 +199,7 @@ Package: libreoffice-common
Architecture: all
Depends: libreoffice-style-colibre, libreoffice-style-tango, ure, ${numbertext-data-recommends}, ${misc:Depends}
Suggests: libreoffice-style,
-Recommends: ${pyuno-depends}, ${textcat-data-recommends}, xdg-utils, fonts-liberation2 | ttf-mscorefonts-installer
+Recommends: ${pyuno-depends}, ${textcat-data-recommends}, xdg-utils, fonts-liberation2 | ttf-mscorefonts-installer, apparmor (>= 2.13)
Conflicts: openoffice-unbundled,
broffice,
libreoffice-filter-mobiledev,
@@ -334,15 +334,17 @@ Depends: libreoffice-core (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
Suggests: libreoffice-base
+Replaces: libreoffice-base-drivers (<< 1:6.1.1~rc1-2)
Description: office productivity suite -- shared library
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
.
- This package contains libdba, a common library of the LibreOffice
- suite used by Base, Writer and Calc.
+ This package contains common libraries of LibreOffice Base used by
+ Base, Writer and Calc.
.
If you need full Base functionality (or actual database drivers), please
- install libreoffice-base.
+ install libreoffice-base (and/or libreoffice-base-drivers and/o
+ libreoffice-sdbc-*).
Package: libreoffice-base
Architecture: %OOO_BASE_ARCHS%
diff --git a/debian/patches/apparmor-cleanups.diff b/debian/patches/apparmor-cleanups.diff
index 6a179eb..bfef4c7 100644
--- a/debian/patches/apparmor-cleanups.diff
+++ b/debian/patches/apparmor-cleanups.diff
@@ -24,14 +24,11 @@ index 2fc7fd6b5735..33ad6f933ef6 100644
#include <abstractions/ibus>
#include <abstractions/nameservice>
#include <abstractions/gnome>
-@@ -173,7 +174,6 @@ profile libreoffice-soffice INSTDIR-program/soffice.bin {
-
+@@ -179,7 +179,6 @@ profile libreoffice-soffice INSTDIR-program/soffice.bin {
#Likely moving to abstractions in the future
owner @{HOME}/.icons/*/cursors/* r,
+ /etc/fstab r, # Solid::DeviceNotifier::instance() TODO: deny?
- /sys/devices/pci[0-9]*/**/{device,subsystem_device,subsystem_vendor,uevent,vendor} r, # for libdrm
/usr/share/*-fonts/conf.avail/*.conf r,
/usr/share/fonts-config/conf.avail/*.conf r,
-
---
-2.18.0
-
+ /{,var/}run/udev/data/+usb:* r, # Solid::Device::listFromQuery()
diff --git a/debian/patches/apparmor-fixes.diff b/debian/patches/apparmor-fixes.diff
index d20a968..c6aee51 100644
--- a/debian/patches/apparmor-fixes.diff
+++ b/debian/patches/apparmor-fixes.diff
@@ -1,35 +1,50 @@
-From 6cb24cea619a9041e1c3fad46f62e97cf561e522 Mon Sep 17 00:00:00 2001
+From 136077b40cdabab83aec6833bf3895d4305d30a3 Mon Sep 17 00:00:00 2001
From: Vincas Dargis <vindrg@gmail.com>
-Date: Tue, 7 Aug 2018 12:23:48 +0300
-Subject: deb#905442 apparmor: fix saving files in enforced mode
+Date: Tue, 14 Aug 2018 21:34:59 +0300
+Subject: apparmor: fix printing to file
-Add rule to allow creating temporary files like `lu6924jgpjkq.tmp`,
-because without it files cannot be saved.
+AppArmor denies writing to .ps files and dealing with temporaries needed
+for "Print to file" functionality. Add .ps to the allowed extensions
+list, also giving access to rm executable together with writing
+printing-related temporary file.
-Change-Id: I640897df5d325e2d01da16840034abbd095fb276
-Reviewed-on: https://gerrit.libreoffice.org/58672
+Change-Id: I415e1401878bff6459f42162d4e8b517261b9cec
+Reviewed-on: https://gerrit.libreoffice.org/59114
Tested-by: Jenkins
-Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
-(cherry picked from commit 8ca83479ab1f921a14a366432a513a904af0dd20)
-Reviewed-on: https://gerrit.libreoffice.org/58677
Reviewed-by: Rene Engelhard <rene@debian.org>
-Tested-by: Rene Engelhard <rene@debian.org>
---
- sysui/desktop/apparmor/program.soffice.bin | 1 +
- 1 file changed, 1 insertion(+)
+ sysui/desktop/apparmor/program.soffice.bin | 4 ++++
+ 1 file changed, 4 insertions(+)
diff --git a/sysui/desktop/apparmor/program.soffice.bin b/sysui/desktop/apparmor/program.soffice.bin
-index 2fc7fd6..a680260 100644
+index 4525229..90d663a 100644
--- a/sysui/desktop/apparmor/program.soffice.bin
+++ b/sysui/desktop/apparmor/program.soffice.bin
-@@ -97,6 +97,7 @@ profile libreoffice-soffice INSTDIR-program/soffice.bin {
- owner @{libo_user_dirs}/**/ rw, #allow creating directories that we own
- owner @{libo_user_dirs}/**~lock.* rw, #lock file support
- owner @{libo_user_dirs}/**.@{libreoffice_ext} rwk, #Open files rw with the right exts
-+ owner @{libo_user_dirs}/{,**/}lu??????????{,?}.tmp rwk, #Temporary file used when saving
+@@ -37,6 +37,8 @@
+ @{libreoffice_ext} += {,x,X}[hH][tT][mM]{,l,L}
+ #.epub
+ @{libreoffice_ext} += [eE][pP][uU][bB]
++#.ps (printing to file)
++@{libreoffice_ext} += [pP][sS]
- # Settings
- /etc/libreoffice/ r,
+ #Images
+ @{libreoffice_ext} += [jJ][pP][gG]
+@@ -117,6 +119,7 @@ profile libreoffice-soffice INSTDIR-program/soffice.bin {
+ owner @{HOME}/.cache/fontconfig/** rw,
+ owner @{HOME}/.config/gtk-???/bookmarks r, #Make bookmarks work
+ owner @{HOME}/.recently-used rwk,
++ owner /tmp/psp[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]* rw, #/tmp/psp1534203998 (printing to file)
+
+ owner /{,var/}run/user/*/dconf/user rw,
+ owner @{HOME}/.config/dconf/user r,
+@@ -131,6 +134,7 @@ profile libreoffice-soffice INSTDIR-program/soffice.bin {
+ /{usr/,}bin/sh rmix,
+ /{usr/,}bin/bash rmix,
+ /{usr/,}bin/dash rmix,
++ /{usr/,}bin/rm rmix, #deleting /tmp/psp1534203998 (printing to file)
+ /usr/bin/bluetooth-sendto rmPUx,
+ /usr/bin/lpr rmPUx,
+ /usr/bin/paperconf rmix,
--
cgit v1.1
diff --git a/debian/patches/apparmor-kde.diff b/debian/patches/apparmor-kde.diff
new file mode 100644
index 0000000..3657ed2
--- /dev/null
+++ b/debian/patches/apparmor-kde.diff
@@ -0,0 +1,144 @@
+From c86e4ad53391d17d1eb54845b5999889f7e65061 Mon Sep 17 00:00:00 2001
+From: Vincas Dargis <vindrg@gmail.com>
+Date: Tue, 7 Aug 2018 20:34:21 +0300
+Subject: apparmor: update program.soffice.bin for KDE
+
+Add rules to fix file dialog and other issues with 6.2 alpha1 on Debian
+Buster with KDE desktop.
+
+Change-Id: Ib1b20c5809ac9bdea1bf2623eff4345fa42fd4f3
+Reviewed-on: https://gerrit.libreoffice.org/58702
+Tested-by: Jenkins
+Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
+Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
+---
+ sysui/desktop/apparmor/program.soffice.bin | 50 ++++++++++++++++++++++++++++++
+ 1 file changed, 50 insertions(+)
+
+diff --git a/sysui/desktop/apparmor/program.soffice.bin b/sysui/desktop/apparmor/program.soffice.bin
+index a680260..ebb012a 100644
+--- a/sysui/desktop/apparmor/program.soffice.bin
++++ b/sysui/desktop/apparmor/program.soffice.bin
+@@ -98,6 +98,7 @@ profile libreoffice-soffice INSTDIR-program/soffice.bin {
+ owner @{libo_user_dirs}/**~lock.* rw, #lock file support
+ owner @{libo_user_dirs}/**.@{libreoffice_ext} rwk, #Open files rw with the right exts
+ owner @{libo_user_dirs}/{,**/}lu??????????{,?}.tmp rwk, #Temporary file used when saving
++ owner @{libo_user_dirs}/{,**/}.directory r, #Read directory settings on KDE
+
+ # Settings
+ /etc/libreoffice/ r,
+@@ -107,6 +108,9 @@ profile libreoffice-soffice INSTDIR-program/soffice.bin {
+ /proc/*/status r,
+
+ owner @{HOME}/.config/libreoffice{,dev}/** rwk,
++ owner @{HOME}/.config/soffice.binrc rwl -> @{HOME}/.config/#[0-9]*,
++ owner @{HOME}/.config/soffice.binrc.* rwl -> @{HOME}/.config/#[0-9]*,
++ owner @{HOME}/.config/soffice.binrc.lock rwk,
+ owner @{HOME}/.cache/fontconfig/** rw,
+ owner @{HOME}/.config/gtk-???/bookmarks r, #Make bookmarks work
+ owner @{HOME}/.recently-used rwk,
+@@ -174,9 +178,18 @@ profile libreoffice-soffice INSTDIR-program/soffice.bin {
+
+ #Likely moving to abstractions in the future
+ owner @{HOME}/.icons/*/cursors/* r,
++ /etc/fstab r, # Solid::DeviceNotifier::instance() TODO: deny?
+ /sys/devices/pci[0-9]*/**/{device,subsystem_device,subsystem_vendor,uevent,vendor} r, # for libdrm
+ /usr/share/*-fonts/conf.avail/*.conf r,
+ /usr/share/fonts-config/conf.avail/*.conf r,
++ /{,var/}run/udev/data/+usb:* r, # Solid::Device::listFromQuery()
++ /{,var/}run/udev/data/{c,b}*:* r, # Solid::Device::description(), Solid::Device::listFromQuery()
++ @{PROC}/sys/kernel/random/boot_id r, # KRecentDocument::add() -> QSysInfo::bootUniqueId()
++
++ #To avoid "Unable to create io-slave." for file dialog
++ owner /{,var/}run/user/[0-9]*/#[0-9]* rw,
++ #For KIO IO::Slave::createSlave()
++ owner /{,var/}run/user/[0-9]*/soffice.bin*.slave-socket wl -> /{,var/}run/user/[0-9]*/#[0-9]*,
+
+ owner @{HOME}/.mozilla/firefox/profiles.ini r,
+ owner @{HOME}/.mozilla/firefox/*/secmod.db r,
+@@ -184,6 +197,9 @@ profile libreoffice-soffice INSTDIR-program/soffice.bin {
+ owner @{HOME}/.mozilla/firefox/*/cert8.db r,
+ # firefox >= 58
+ owner @{HOME}/.mozilla/firefox/*/cert9.db r,
++
++ owner @{HOME}/.local/share/user-places.xbel r,
++
+ # there is abstractions/gnupg but that's just for gpg1...
+ profile gpg {
+ #include <abstractions/base>
+@@ -204,4 +220,38 @@ profile libreoffice-soffice INSTDIR-program/soffice.bin {
+ /usr/lib/*/qt5/plugins/** rm,
+ /usr/share/plasma/look-and-feel/**/contents/defaults r,
+
++ # TODO: remove when rules are available in abstractions/kde
++ owner @{HOME}/.cache/ksycoca5_??_* r, # KDE System Configuration Cache
++ owner @{HOME}/.config/baloofilerc r, # indexing options (excludes, etc), used by KFileWidget
++ owner @{HOME}/.config/dolphinrc r, # settings used by KFileWidget
++ owner @{HOME}/.config/kde.org/libphonon.conf r, # for KNotifications::sendEvent()
++ owner @{HOME}/.config/klanguageoverridesrc r, # per-application languages, for KDEPrivate::initializeLanguages() from libKF5XmlGui.so
++ owner @{HOME}/.config/trashrc r, # user by KFileWidget
++ /usr/share/knotifications5/*.notifyrc r, # KNotification::sendEvent
++
++ # TODO: remove when rules are available in abstactions/kde-write-icon-cache or similar
++ owner @{HOME}/.cache/icon-cache.kcache rw, # for KIconLoader
++
++ # TODO: remove when rules are available in abstractions/kdeframeworks5 or simiar
++ /usr/share/kservices5/*.protocol r,
++
++ # TODO: use qt5-settings-write abstraction when it is available
++ owner @{HOME}/.config/QtProject.conf rw,
++ owner @{HOME}/.config/QtProject.conf.?????? l -> @{HOME}/.config/#[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9],
++ owner @{HOME}/.config/QtProject.conf.?????? rw, # for temporary files like QtProject.conf.Aqrgeb
++ owner @{HOME}/.config/QtProject.conf.lock rwk,
++
++ # TODO: use qt5-compose-cache-write abstraction when it is available
++ owner @{HOME}/.cache/qt_compose_cache_{little,big}_endian_* r,
++
++ # TODO: use recent-documents-write abstaction when it is available
++ owner @{HOME}/.local/share/RecentDocuments/** r,
++ owner @{HOME}/.local/share/RecentDocuments/*.desktop rwl -> @{HOME}/.local/share/RecentDocuments/#[0-9]*,
++ owner @{HOME}/.local/share/RecentDocuments/#[0-9]* rw,
++ owner @{HOME}/.local/share/RecentDocuments/*.lock rwk,
++
++ # TODO: use kde-globals-write abstraction when it is available
++ owner @{HOME}/.config/kdeglobals rw,
++ owner @{HOME}/.config/kdeglobals.* rwl -> @{HOME}/.config/#[0-9]*,
++ owner @{HOME}/.config/kdeglobals.lock rwk,
+ }
+--
+cgit v1.1
+
+From 032c3f0d8403c6c7cdc60564641687bfb56cf9b3 Mon Sep 17 00:00:00 2001
+From: Vincas Dargis <vindrg@gmail.com>
+Date: Tue, 14 Aug 2018 22:11:39 +0300
+Subject: apparmor: fix qt-related denies
+
+Commit c86e4ad53391d17d1eb54845b5999889f7e65061 introduced qt-related
+rules, like linking to ~/.config/#[0-9]* files, though does not allow to
+write the files themselves, in result producing DENIED log entries if
+AppArmor profile is enabled. This is fixed by adding read-write rule for
+particular files.
+Change-Id: I6441398c4fcfbfcf59ba5f5b3178682c1e5d1cd5
+Reviewed-on: https://gerrit.libreoffice.org/59007
+Tested-by: Jenkins
+Reviewed-by: Rene Engelhard <rene@debian.org>
+Tested-by: Rene Engelhard <rene@debian.org>
+---
+ sysui/desktop/apparmor/program.soffice.bin | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/sysui/desktop/apparmor/program.soffice.bin b/sysui/desktop/apparmor/program.soffice.bin
+index dd71b94..cf6fd4b 100644
+--- a/sysui/desktop/apparmor/program.soffice.bin
++++ b/sysui/desktop/apparmor/program.soffice.bin
+@@ -236,6 +236,7 @@ profile libreoffice-soffice INSTDIR-program/soffice.bin {
+ /usr/share/kservices5/*.protocol r,
+
+ # TODO: use qt5-settings-write abstraction when it is available
++ owner @{HOME}/.config/#[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9] rw,
+ owner @{HOME}/.config/QtProject.conf rw,
+ owner @{HOME}/.config/QtProject.conf.?????? l -> @{HOME}/.config/#[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9],
+ owner @{HOME}/.config/QtProject.conf.?????? rw, # for temporary files like QtProject.conf.Aqrgeb
+--
+cgit v1.1
+
diff --git a/debian/patches/fix-gtk3_kde5-filepicker-infinite-loop.diff b/debian/patches/fix-gtk3_kde5-filepicker-infinite-loop.diff
new file mode 100644
index 0000000..6749e57
--- /dev/null
+++ b/debian/patches/fix-gtk3_kde5-filepicker-infinite-loop.diff
@@ -0,0 +1,52 @@
+From 0e98d9a75952116655fa90d83478c2be323fff64 Mon Sep 17 00:00:00 2001
+From: Michael Weghorn <m.weghorn@posteo.de>
+Date: Wed, 5 Sep 2018 18:03:06 +0200
+Subject: tdf#119685 Fix infinite loop in gtk3_kde5 filepicker
+
+Since 'string::find()' returns the position of the given
+character in the string and that was passed as the amount of
+characters to delete from the string, 'm_responseBuffer'
+would always be a string starting with a newline character
+afterwards, when this part of the code was reached.
+
+Subsequent calls to 'Gtk3KDE5FilePickerIpc::readResponseLine'
+therefore always returned an empty string and left
+'m_responseBuffer' unchanged, resulting in the lambda function
+inside 'readResponse' in 'gtk3_kde5_filepicker_ipc.hxx' to
+loop infinitely.
+
+While at it, make a little more explicit that 'it' is of type
+'size_t' here.
+
+Change-Id: I3b1c209f8307ab71465d9538a82616dff8656415
+Reviewed-on: https://gerrit.libreoffice.org/60047
+Tested-by: Jenkins
+Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
+(cherry picked from commit 1f5698ba8b62e62999b0efb363916a91bdd54c94)
+Reviewed-on: https://gerrit.libreoffice.org/60067
+Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
+---
+ vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx b/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx
+index 21690c5..8cec9d8 100644
+--- a/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx
++++ b/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx
+@@ -222,11 +222,11 @@ std::string Gtk3KDE5FilePickerIpc::readResponseLine()
+ {
+ if (!m_responseBuffer.empty()) // check whether we have a line in our buffer
+ {
+- auto it = m_responseBuffer.find('\n');
++ std::size_t it = m_responseBuffer.find('\n');
+ if (it != std::string::npos)
+ {
+ auto ret = m_responseBuffer.substr(0, it);
+- m_responseBuffer.erase(0, it);
++ m_responseBuffer.erase(0, it + 1);
+ return ret;
+ }
+ }
+--
+cgit v1.1
+
diff --git a/debian/patches/series b/debian/patches/series
index fe7ac69..1fec9a9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -37,5 +37,7 @@ do-not-hide-test-output.diff
no-ant-check-if-unneeded.diff
test-apparmor-profiles.diff
apparmor-allow-java.security.diff
-apparmor-cleanups.diff
apparmor-fixes.diff
+apparmor-kde.diff
+apparmor-cleanups.diff
+fix-gtk3_kde5-filepicker-infinite-loop.diff
diff --git a/debian/rules b/debian/rules
index 107042f..4ed447d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -74,7 +74,7 @@ lo_sources_ver=$(shell grep AC_INIT $(SOURCE_TREE)/configure.ac | grep documentf
# 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)
-GIT_BRANCH=libreoffice-6-1-0
+GIT_BRANCH=libreoffice-6-1-1
endif
ifeq "$(USE_SOURCE_TARBALLS)" "y"
lo_sources_ver=$(shell cat $(CURDIR)/sources.ver | cut -d= -f2)
@@ -2747,6 +2747,8 @@ ifeq "$(PACKAGE_BASE)" "y"
mkdir -p $(PKGDIR)-base-core/$(OODIR)/program
mv $(PKGDIR)-base/$(OODIR)/program/libdbalo.so \
$(PKGDIR)-base-core/$(OODIR)/program
+ mv $(PKGDIR)-base/$(OODIR)/program/libdbahsqllo.so \
+ $(PKGDIR)-base-core/$(OODIR)/program
endif
ifeq "$(ENABLE_JAVA)" "y"