TDE
/
thirdparty
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/thirdparty
0
0
Fork 0
Code Issues Releases Wiki Activity

Update LibreOffice packaging patches:

Browse Source 
+ 4.2.8 - Ubuntu 14.04 - Trusty
+ 4.3.3 - Debian 7.x - Wheezy-backports
+ 4.3.3 - Debian 8.x - Jessie
+ 5.2.5 - Debian 8.x - Jessie-backports (updated from 5.0.2)

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit dc3f56b93b)
r14.0.x
Slávek Banko 8 years ago
parent 9296d0916b
commit e87e698d96
4 changed files with 83 additions and 84 deletions
Show Stats Download Patch File Download Diff File

12
libreoffice/4.2.8/trusty/debian.diff
Unescape View File

@ -2,15 +2,15 @@ diff -ruN a/debian/changelog b/debian/changelog
--- a/debian/changelog 2015-11-02 21:08:01.000000000 +0000
+++ b/debian/changelog 2015-11-14 15:19:36.524000000 +0000
@@ -1,3 +1,9 @@
+libreoffice (1:4.2.8-0ubuntu4+tde1) trusty; urgency=medium
+libreoffice (1:4.2.8-0ubuntu5+tde1) trusty; urgency=medium
+
+ * Enable TDE module
+
+ -- Slávek Banko <slavek.banko@axis.cz> Wed, 24 Feb 2016 19:29:09 +0100
+ -- Slávek Banko <slavek.banko@axis.cz> Mon, 27 Feb 2017 22:27:47 +0100
+
libreoffice (1:4.2.8-0ubuntu4) trusty-security; urgency=medium
libreoffice (1:4.2.8-0ubuntu5) trusty-security; urgency=medium
* various lwp fixes
* SECURITY UPDATE: arbitrary file read via link update
diff -ruN a/debian/control b/debian/control
--- a/debian/control 2015-11-02 21:26:04.000000000 +0000
+++ b/debian/control 2015-11-14 15:19:36.524000000 +0000
@ -156,10 +156,10 @@ diff -ruN a/debian/control.trinity.in b/debian/control.trinity.in
diff -ruN a/debian/patches/series b/debian/patches/series
--- a/debian/patches/series 2015-09-18 12:59:35.000000000 +0000
+++ b/debian/patches/series 2015-11-14 15:19:36.524000000 +0000
@@ -45,3 +45,4 @@
lwpfix3.diff
@@ -46,3 +46,4 @@
lwpfix4.diff
lwpfix5.diff
olefix.diff
+tde-update-r14.diff
diff -ruN a/debian/patches/tde-update-r14.diff b/debian/patches/tde-update-r14.diff
--- a/debian/patches/tde-update-r14.diff 1970-01-01 00:00:00.000000000 +0000

8
libreoffice/4.3.3/jessie/debian.diff
Unescape View File

@ -2,15 +2,15 @@ diff -ruN a/debian/changelog b/debian/changelog
--- a/debian/changelog 2015-08-28 15:18:09.000000000 +0000
+++ b/debian/changelog 2016-06-30 02:03:40.000000000 +0000
@@ -1,3 +1,9 @@
+libreoffice (1:4.3.3-2+tde1+deb8u5) jessie; urgency=medium
+libreoffice (1:4.3.3-2+tde1+deb8u6) jessie; urgency=medium
+
+ * Enable TDE module
+
+ -- Slávek Banko <slavek.banko@axis.cz> Thu, 30 Jun 2016 02:03:40 +0200
+ -- Slávek Banko <slavek.banko@axis.cz> Sun, 26 Feb 2017 03:12:30 +0100
+
libreoffice (1:4.3.3-2+deb8u5) jessie-security; urgency=medium
libreoffice (1:4.3.3-2+deb8u6) jessie-security; urgency=high
* debian/patches/CVE-2016-4324.diff: fix "LibreOffice RTF Stylesheet Code
* debian/patches/olefix.diff: fix CVE-2017-3157
diff -ruN a/debian/control b/debian/control
--- a/debian/control 2015-08-28 17:51:39.000000000 +0000
+++ b/debian/control 2015-11-14 17:25:07.096000000 +0000

6
libreoffice/4.3.3/wheezy-backports/debian.diff
Unescape View File

@ -2,13 +2,13 @@ diff -ruN a/debian/changelog b/debian/changelog
--- a/debian/changelog 2015-04-06 14:18:58.000000000 +0000
+++ b/debian/changelog 2015-05-12 17:08:33.220000000 +0000
@@ -1,3 +1,9 @@
+libreoffice (1:4.3.3-2+tde1+deb8u3~bpo70+1) wheezy-backports; urgency=high
+libreoffice (1:4.3.3-2+tde1+deb8u6~bpo70+1) wheezy-backports; urgency=high
+
+ * Enable TDE module
+
+ -- Slávek Banko <slavek.banko@axis.cz> Fri, 25 Mar 2015 11:12:13 +0100
+ -- Slávek Banko <slavek.banko@axis.cz> Mon, 27 Feb 2017 16:46:56 +0100
+
libreoffice (1:4.3.3-2+deb8u3~bpo70+1) wheezy-backports; urgency=high
libreoffice (1:4.3.3-2+deb8u6~bpo70+1) wheezy-backports; urgency=high
* Rebuild for wheezy-backports.
diff -ruN a/debian/control b/debian/control

141
libreoffice/5.0.2/jessie-backports/debian.diff → libreoffice/5.2.5/jessie-backports/debian.diff
Unescape View File

@ -1,21 +1,21 @@
diff -ruN a/debian/changelog b/debian/changelog
--- a/debian/changelog 2015-09-24 08:24:40.000000000 +0000
+++ b/debian/changelog 2015-09-29 18:36:22.368000000 +0000
--- a/debian/changelog 2017-01-27 10:52:51.000000000 +0000
+++ b/debian/changelog 2017-02-26 14:14:24.364000000 +0000
@@ -1,3 +1,10 @@
+libreoffice (1:5.0.2-1+tde0~bpo8+1) jessie-backports; urgency=medium
+libreoffice (1:5.2.5-1+tde0~bpo8+1) jessie-backports; urgency=medium
+
+ * Enable TDE module
+ * Enable crystal icons
+
+ -- Slávek Banko <slavek.banko@axis.cz> Sun, 20 Sep 2015 15:47:59 +0200
+ -- Slávek Banko <slavek.banko@axis.cz> Sun, 26 Feb 2017 14:14:14 +0100
+
libreoffice (1:5.0.2-1~bpo8+1) jessie-backports; urgency=medium
libreoffice (1:5.2.5-1~bpo8+1) jessie-backports; urgency=medium
* Rebuild for jessie-backports.
diff -ruN a/debian/control b/debian/control
--- a/debian/control 2015-09-24 08:38:14.000000000 +0000
+++ b/debian/control 2015-09-29 18:36:22.372000000 +0000
@@ -126,6 +126,8 @@
--- a/debian/control 2017-01-27 10:27:50.000000000 +0000
+++ b/debian/control 2017-02-26 14:14:24.364000000 +0000
@@ -131,6 +131,8 @@
pkg-config,
python3,
python3-dev (>= 3.3),
@ -24,15 +24,15 @@ diff -ruN a/debian/control b/debian/control
ucpp,
unixodbc-dev (>= 2.2.11),
unzip,
@@ -240,6 +242,7 @@
* libreoffice-gtk: Gtk UI Plugin, GNOME File Picker support,
QuickStarter for GNOMEs notification are
* libreoffice-gnome: GIO, GConf backend
@@ -257,6 +259,7 @@
* hyphen-*: Hyphenation patterns for LibreOffice
* libreoffice-gtk(2|3): Gtk UI Plugin, GNOME File Picker support
* libreoffice-gnome: GIO backend
+ * libreoffice-trinity: TDE UI Plugin and TDE File Picker support
* libreoffice-kde: KDE UI Plugin and KDE File Picker support
* unixodbc: ODBC database support
* cups-bsd: Allows LibreOffice to detect your CUPS printer queues
@@ -353,6 +356,7 @@
automatically
@@ -374,6 +377,7 @@
libreoffice-style-hicontrast (<< 1:3.3.0-1),
libreoffice-style-oxygen (<< 1:3.3.0-1),
libreoffice-style-tango (<< 1:3.3.0-1),
@ -40,7 +40,7 @@ diff -ruN a/debian/control b/debian/control
libreoffice-writer (<< ${binary:Version}),
mozilla-libreoffice (<< 1:3.5.0~beta~),
mozilla-plugin-vlc (<< 1.0),
@@ -582,6 +586,19 @@
@@ -613,6 +617,19 @@
.
This package contains the database component for LibreOffice.
@ -60,9 +60,9 @@ diff -ruN a/debian/control b/debian/control
Package: libreoffice-style-oxygen
Architecture: all
Enhances: libreoffice-core
@@ -4269,6 +4286,28 @@
@@ -4601,6 +4618,28 @@
.
* konqueror / kmail
* libreoffice-kab: KDE Addressbook support
+Package: libreoffice-trinity
+Architecture: alpha amd64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc ppc64el arm64
@ -88,8 +88,8 @@ diff -ruN a/debian/control b/debian/control
+
Package: libreoffice-sdbc-postgresql
Section: misc
Architecture: alpha amd64 arm64 armel armhf arm64 i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x hppa ia64 s390 sparc kfreebsd-amd64 kfreebsd-i386
@@ -4319,6 +4358,21 @@
Architecture: alpha amd64 arm64 armel armhf arm64 i386 mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x hppa ia64 m68k s390 sparc sparc64 kfreebsd-amd64 kfreebsd-i386
@@ -4653,6 +4692,21 @@
This package allows LibreOffice to access Evolution address books.
You need to install evolution separately.
@ -112,9 +112,9 @@ diff -ruN a/debian/control b/debian/control
Section: libs
Priority: extra
diff -ruN a/debian/control.in b/debian/control.in
--- a/debian/control.in 2015-09-23 13:06:17.000000000 +0000
+++ b/debian/control.in 2015-09-29 18:36:22.372000000 +0000
@@ -194,6 +194,7 @@
--- a/debian/control.in 2016-11-29 07:29:00.000000000 +0000
+++ b/debian/control.in 2017-02-26 14:14:24.364000000 +0000
@@ -213,6 +213,7 @@
libreoffice-impress (<< ${binary:Version}),
libreoffice-kab (<< 1:3.4.1~),
libreoffice-kde (<< ${binary:Version}),
@ -124,15 +124,15 @@ diff -ruN a/debian/control.in b/debian/control.in
libreoffice-sdbc-postgresql (<< 0.8.1~),
diff -ruN a/debian/control.style-crystal.in b/debian/control.style-crystal.in
--- a/debian/control.style-crystal.in 1970-01-01 00:00:00.000000000 +0000
+++ b/debian/control.style-crystal.in 2015-09-29 18:36:22.372000000 +0000
+++ b/debian/control.style-crystal.in 2017-02-26 14:14:24.368000000 +0000
@@ -0,0 +1,13 @@
+Package: libreofficeVER-style-crystal
+Package: libreoffice-style-crystal
+Architecture: all
+Enhances: libreofficeVER-core
+Enhances: libreoffice-core
+Depends: ${misc:Depends}
+Suggests: crystalcursors, kde-icons-crystal
+Provides: libreofficeVER-style
+Replaces: libreofficeVER-common (<< 1:3.3.0~rc4-2)
+Provides: libreoffice-style
+Replaces: libreoffice-common (<< 1:3.3.0~rc4-2)
+Description: office productivity suite -- Crystal symbol style
+ LibreOffice is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
@ -141,12 +141,12 @@ diff -ruN a/debian/control.style-crystal.in b/debian/control.style-crystal.in
+
diff -ruN a/debian/control.tdeab.in b/debian/control.tdeab.in
--- a/debian/control.tdeab.in 1970-01-01 00:00:00.000000000 +0000
+++ b/debian/control.tdeab.in 2015-09-29 18:36:22.372000000 +0000
+++ b/debian/control.tdeab.in 2017-02-26 14:14:24.368000000 +0000
@@ -0,0 +1,15 @@
+Package: libreofficeVER-tdeab-trinity
+Package: libreoffice-tdeab-trinity
+Architecture: %OOO_BASE_ARCHS%
+Depends: libreofficeVER-core (= ${binary:Version}),
+ libreofficeVER-common (>= 1:3.4.0~),
+Depends: libreoffice-core (= ${binary:Version}),
+ libreoffice-common (>= 1:3.4.0~),
+ ${shlibs:Depends},
+ ${misc:Depends}
+Recommends: kaddressbook-trinity
@ -160,19 +160,19 @@ diff -ruN a/debian/control.tdeab.in b/debian/control.tdeab.in
+
diff -ruN a/debian/control.trinity.in b/debian/control.trinity.in
--- a/debian/control.trinity.in 1970-01-01 00:00:00.000000000 +0000
+++ b/debian/control.trinity.in 2015-09-29 18:36:22.372000000 +0000
+++ b/debian/control.trinity.in 2017-02-26 14:14:24.368000000 +0000
@@ -0,0 +1,23 @@
+Package: libreofficeVER-trinity
+Package: libreoffice-trinity
+Architecture: %OOO_ARCHS%
+Depends: libreofficeVER-core (= ${binary:Version}),
+Depends: libreoffice-core (= ${binary:Version}),
+ ${shlibs:Depends},
+ ${misc:Depends}
+Recommends: ${trinity-iconset-dep}
+Suggests: konqueror-trinity,
+ kmail-trinity,
+ libreofficeVER-tdeab-trinity
+ libreoffice-tdeab-trinity
+Section: tde
+Enhances: libreofficeVER
+Enhances: libreoffice
+Replaces: openoffice.org-trinity (<< 1:3.3.0~), libreoffice-core (= 1:3.5.0~beta2-1)
+Description: office productivity suite -- TDE integration
+ LibreOffice is a full-featured office productivity suite that provides
@ -186,9 +186,9 @@ diff -ruN a/debian/control.trinity.in b/debian/control.trinity.in
+ * libreoffice-tdeab-trinity: TDE Addressbook support
+
diff -ruN a/debian/rules b/debian/rules
--- a/debian/rules 2015-09-24 08:24:13.000000000 +0000
+++ b/debian/rules 2015-09-29 18:36:22.372000000 +0000
@@ -199,6 +199,13 @@
--- a/debian/rules 2017-01-26 12:41:26.000000000 +0000
+++ b/debian/rules 2017-02-26 14:14:24.368000000 +0000
@@ -195,6 +195,13 @@
# < 4.8 fails with gcc 4.7, see #667911
QT_MINVER= (>= 4:4.8)
KDELIBS_MINVER= (>= 4:4.3.4)
@ -199,19 +199,19 @@ diff -ruN a/debian/rules b/debian/rules
+ifeq "$(BUILD_TDE)" "y"
+ TDELIBS_MINVER= (>= 4:3.5.13)
+endif
BUILD_DBG_PACKAGE=y
ifneq (nocheck,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
BUILD_TEST_PACKAGE=y
@@ -620,6 +627,7 @@
BUILD_DBG_PACKAGE=n
ifneq (noddebs,$(findstring noddebs,$(DEB_BUILD_OPTIONS)))
BUILD_DBGSYM_PACKAGES=y
@@ -626,6 +633,7 @@
ENABLE_SDBC_POSTGRESQL=n
ENABLE_MYSQLNATIVE=n
ENABLE_EVO2=n
ENABLE_KDEAB=n
+ ENABLE_TDEAB=n
ENABLE_REPORTDESIGN=n
DEBHELPER_OPTIONS += -Nlibreoffice-base libreoffice-base-core -Nlibreoffice-base-drivers
DEBHELPER_OPTIONS += -Nlibreoffice-evolution -Nlibreoffice-kab
@@ -1252,6 +1260,24 @@
endif
@@ -1315,6 +1323,24 @@
DBG_DBG_SUGGESTS+= , kdelibs5-dbg, libqt4-dbg
endif
+ifeq "$(BUILD_TDE)" "n"
@ -220,7 +220,7 @@ diff -ruN a/debian/rules b/debian/rules
+ IMAGES+= crystal
+ CONFIGURE_FLAGS+= --enable-tde
+ CONFIGURE_FLAGS+= --with-theme="$(IMAGES)"
+ TDE_ICONSET_DEP=libreoffice$(VER)-style-crystal
+ TDE_ICONSET_DEP=libreoffice-style-crystal
+ BUILD_DEPS += , tdelibs14-trinity-dev
+
+ DBG_DBG_SUGGESTS+= , tdelibs-trinity-dbg, libtqtinterface-dbg
@ -234,51 +234,50 @@ diff -ruN a/debian/rules b/debian/rules
+
ifeq "$(ENABLE_MYSQLNATIVE)" "y"
CONFIGURE_FLAGS += --enable-ext-mariadb-connector
ifneq "$(USE_MARIADB)" "y"
@@ -1748,6 +1774,13 @@
ifeq "$(MYSQL_FLAVOUR)" "default"
@@ -1834,6 +1860,11 @@
ifeq "$(BUILD_KDE)" "y"
cat debian/control.kde.in >> debian/control
endif
+ifeq "$(BUILD_TDE)" "y"
+ sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
+ >> debian/control < debian/control.trinity.in
+ sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
+ >> debian/control < debian/control.style-crystal.in
+ perl -pi -e 's/ libreoffice$(VER)-gnome,/ libreoffice-gnome | libreoffice$(VER)-trinity,/' debian/control
+ cat debian/control.trinity.in >> debian/control
+ cat debian/control.style-crystal.in >> debian/control
+ perl -pi -e 's/ libreoffice-gnome,/ libreoffice-gnome | libreoffice-trinity,/' debian/control
+endif
ifeq "$(ENABLE_SDBC_POSTGRESQL)" "y"
cat debian/control.postgresql.in >> debian/control
endif
@@ -1760,6 +1793,10 @@
ifeq "$(ENABLE_KDEAB)" "y"
cat debian/control.kab.in >> debian/control
@@ -1843,6 +1874,9 @@
ifeq "$(ENABLE_EVO2)" "y"
cat debian/control.evolution.in >> debian/control
endif
+ifeq "$(ENABLE_TDEAB)" "y"
+ sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
+ >> debian/control < debian/control.tdeab.in
+ cat debian/control.tdeab.in >> debian/control
+endif
ifeq "$(BUILD_TEST_PACKAGE)" "y"
ifneq "$(OOO_JAVA_ARCHS)" ""
cat debian/control.subsequentcheckbase.in >> debian/control
@@ -1835,6 +1872,9 @@
@@ -1911,6 +1945,9 @@
ifeq "$(BUILD_KDE)" "y"
perl -pi -e 's/GConf backend$$/GConf backend\n * libreoffice-kde: KDE UI Plugin and KDE File Picker support/' debian/control
endif
+ifeq "$(BUILD_TDE)" "y"
+ perl -pi -e 's/GConf backend$$/GConf backend\n * libreoffice$(VER)-trinity: TDE UI Plugin and TDE File Picker support/' debian/control
+ perl -pi -e 's/GConf backend$$/GConf backend\n * libreoffice-trinity: TDE UI Plugin and TDE File Picker support/' debian/control
+endif
ifeq "$(USE_DBUS)" "y"
perl -pi -e 's/paperconf$$/paperconf\n * bluez: Bluetooth support for Impress (slideshow remote control/' debian/control
@@ -2557,6 +2597,45 @@
ifeq "$(ENABLE_BLUETOOTH)" "y"
@@ -2665,6 +2702,47 @@
| sed -e "s/@TYPE@/drawing/" \
> $(PKGDIR)-kde/usr/share/templates/soffice.odg.desktop
endif
+
+ifeq "$(BUILD_TDE)" "y"
+ mkdir -p -m755 $(PKGDIR)-trinity/$(OODIR)/program
+ mv $(PKGDIR)-core/$(OODIR)/program/tdefilepicker \
+ $(PKGDIR)-trinity/$(OODIR)/program
+ if test -f $(PKGDIR)-core/$(OODIR)/program/tdefilepicker; then \
+ mv $(PKGDIR)-core/$(OODIR)/program/tdefilepicker \
+ $(PKGDIR)-trinity/$(OODIR)/program; \
+ fi
+
+ # install files for TDEs "create new" ...
+ mkdir -p $(PKGDIR)-trinity/opt/trinity/share/templates/.source
@ -315,8 +314,8 @@ diff -ruN a/debian/rules b/debian/rules
+endif
# split out gtk stuff
rm -rf $(PKGDIR)-gtk
@@ -3123,6 +3202,12 @@
rm -rf $(PKGDIR)-gtk2
@@ -3216,6 +3294,12 @@
# register technical.dic
perl -pi -e 's/standard.dic;/standard.dic;technical.dic;/' $(PKGDIR)-common/$(OODIR)/share/registry/main.xcd
@ -329,7 +328,7 @@ diff -ruN a/debian/rules b/debian/rules
#ifeq "$(PACKAGE_SDK)" "y"
# # install gengal stuff into -dev
# mkdir -p $(PKGDIR)-dev/$(OODIR)/program
@@ -3317,6 +3402,7 @@
@@ -3445,6 +3529,7 @@
-V'Binary-Version=$(BINARY_VERSION)' \
-V'ooo-officebean-dep=$(OOO_OFFICEBEAN_DEP)' \
-V'kde-iconset-dep=$(KDE_ICONSET_DEP)' \
@ -338,8 +337,8 @@ diff -ruN a/debian/rules b/debian/rules
-V'gstreamer-plugins-suggests=$(GSTREAMER_PLUGINS_SUGGESTS)' \
-V'libebook-dep=$(shell debian/scripts/get_libebook_dep.sh)' \
diff -ruN a/debian/scripts/gid2pkgdirs.sh b/debian/scripts/gid2pkgdirs.sh
--- a/debian/scripts/gid2pkgdirs.sh 2015-09-15 09:35:25.000000000 +0000
+++ b/debian/scripts/gid2pkgdirs.sh 2015-09-29 18:36:22.372000000 +0000
--- a/debian/scripts/gid2pkgdirs.sh 2016-06-22 22:08:26.000000000 +0000
+++ b/debian/scripts/gid2pkgdirs.sh 2017-02-26 14:14:24.368000000 +0000
@@ -102,6 +102,7 @@
create_package_directory gid_Module_Script_Provider_For_Python pkg/libreoffice-script-provider-python
create_package_directory gid_Module_Optional_Gnome pkg/libreoffice-gnome
@ -348,7 +347,7 @@ diff -ruN a/debian/scripts/gid2pkgdirs.sh b/debian/scripts/gid2pkgdirs.sh
create_package_directory gid_Module_Root_Files
create_package_directory gid_Module_Optional_OGLTrans pkg/libreoffice-ogltrans
create_package_directory gid_Module_Root_SDK pkg/libreoffice-dev
@@ -147,7 +148,7 @@
@@ -149,7 +150,7 @@
fi &&
( cd pkg/libreoffice-common/$OOINSTBASE/program
find -maxdepth 1 \
Write Preview
Loading…
Cancel
Save