summaryrefslogtreecommitdiffstats
path: root/libreoffice/5.2.5/jessie-backports/debian.diff
blob: 3d15ced9bee82ada5342d9ccd22c3b0ef276cc0a (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
diff -ruN a/debian/changelog b/debian/changelog
--- 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.2.5-1+tde0~bpo8+1) jessie-backports; urgency=medium
+
+  * Enable TDE module
+  * Enable crystal icons
+
+ -- Slávek Banko <slavek.banko@axis.cz>  Sun, 26 Feb 2017 14:14:14 +0100
+
 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	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),
+               tdelibs14-trinity-dev,
+               tdepim-trinity-dev,
                ucpp,
                unixodbc-dev (>= 2.2.11),
                unzip,
@@ -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
   * unixodbc: ODBC database support
   * cups-bsd: Allows LibreOffice to detect your CUPS printer queues
     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),
+        libreoffice-trinity (<< ${binary:Version}),
         libreoffice-writer (<< ${binary:Version}),
         mozilla-libreoffice (<< 1:3.5.0~beta~),
         mozilla-plugin-vlc (<< 1.0),
@@ -613,6 +617,19 @@
  .
  This package contains the database component for LibreOffice.
 
+Package: libreoffice-style-crystal
+Architecture: all
+Enhances: libreoffice-core
+Depends: ${misc:Depends}
+Suggests: crystalcursors, kde-icons-crystal
+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.
+ .
+ This package contains the "crystal" symbol style, default style for TDE.
+
 Package: libreoffice-style-oxygen
 Architecture: all
 Enhances: libreoffice-core
@@ -4601,6 +4618,28 @@
  .
   * konqueror / kmail
 
+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
+Depends: libreoffice-core (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
+Recommends: ${trinity-iconset-dep}
+Suggests: kmail-trinity, konqueror-trinity, libreoffice-tdeab-trinity
+Section: tde
+Enhances: libreoffice
+Replaces: libreoffice-core (= 1:3.5.0~beta2-1),
+          openoffice.org-trinity (<< 1:3.3.0~)
+Description: office productivity suite -- TDE integration
+ LibreOffice is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ This package contains the TDE plugin for drawing OOo's widgets with
+ TDE/Qt and a TDEish File Picker when running under TDE.
+ You can extend the functionality of this by installing these packages:
+ .
+  * konqueror / kmail
+  * libreoffice-tdeab-trinity: TDE Addressbook support
+
 Package: libreoffice-sdbc-postgresql
 Section: misc
 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.
 
+Package: libreoffice-tdeab-trinity
+Architecture: alpha amd64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc ppc64el arm64
+Depends: libreoffice-common (>= 1:3.4.0~),
+         libreoffice-core (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
+Recommends: kaddressbook-trinity
+Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
+Description: office productivity suite -- TDE adressbook support
+ LibreOffice is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ This package allows LibreOffice to access the TDE Addressbook.
+ You need to install kaddressbook-trinity separately.
+
 Package: libreoffice-subsequentcheckbase
 Section: libs
 Priority: extra
diff -ruN a/debian/control.in b/debian/control.in
--- 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}),
+        libreoffice-trinity (<< ${binary:Version}),
         libreoffice-officebean (<< ${binary:Version}),
         libreoffice-presentation-minimizer (<< 1:4.2~),
         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	2017-02-26 14:14:24.368000000 +0000
@@ -0,0 +1,13 @@
+Package: libreoffice-style-crystal
+Architecture: all
+Enhances: libreoffice-core
+Depends: ${misc:Depends}
+Suggests: crystalcursors, kde-icons-crystal
+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.
+ .
+ This package contains the "crystal" symbol style, default style for TDE.
+
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	2017-02-26 14:14:24.368000000 +0000
@@ -0,0 +1,15 @@
+Package: libreoffice-tdeab-trinity
+Architecture: %OOO_BASE_ARCHS%
+Depends: libreoffice-core (= ${binary:Version}),
+ libreoffice-common (>= 1:3.4.0~),
+ ${shlibs:Depends},
+ ${misc:Depends}
+Recommends: kaddressbook-trinity
+Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
+Description: office productivity suite -- TDE adressbook support
+ LibreOffice is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ This package allows LibreOffice to access the TDE Addressbook.
+ You need to install kaddressbook-trinity separately.
+
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	2017-02-26 14:14:24.368000000 +0000
@@ -0,0 +1,23 @@
+Package: libreoffice-trinity
+Architecture: %OOO_ARCHS%
+Depends: libreoffice-core (= ${binary:Version}),
+ ${shlibs:Depends},
+ ${misc:Depends}
+Recommends: ${trinity-iconset-dep}
+Suggests: konqueror-trinity,
+ kmail-trinity,
+ libreoffice-tdeab-trinity
+Section: tde
+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
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ This package contains the TDE plugin for drawing OOo's widgets with
+ TDE/Qt and a TDEish File Picker when running under TDE.
+ You can extend the functionality of this by installing these packages:
+ .
+  * konqueror / kmail
+  * libreoffice-tdeab-trinity: TDE Addressbook support
+
diff -ruN a/debian/rules b/debian/rules
--- 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)
+BUILD_TDE=y
+ifeq "$(BUILD_TDE)" "y"
+  ENABLE_TDEAB=y
+endif
+ifeq "$(BUILD_TDE)" "y"
+  TDELIBS_MINVER= (>= 4:3.5.13)
+endif
 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_TDEAB=n
 	ENABLE_REPORTDESIGN=n
 	DEBHELPER_OPTIONS += -Nlibreoffice-base libreoffice-base-core -Nlibreoffice-base-drivers
 	DEBHELPER_OPTIONS += -Nlibreoffice-evolution -Nlibreoffice-kab
@@ -1315,6 +1323,24 @@
 	DBG_DBG_SUGGESTS+= , kdelibs5-dbg, libqt4-dbg
 endif
 
+ifeq "$(BUILD_TDE)" "n"
+  CONFIGURE_FLAGS+= --disable-tde
+else
+  IMAGES+= crystal
+  CONFIGURE_FLAGS+= --enable-tde
+  CONFIGURE_FLAGS+= --with-theme="$(IMAGES)"
+  TDE_ICONSET_DEP=libreoffice-style-crystal
+  BUILD_DEPS += , tdelibs14-trinity-dev
+
+  DBG_DBG_SUGGESTS+= , tdelibs-trinity-dbg, libtqtinterface-dbg
+
+  ifeq "$(ENABLE_TDEAB)" "y"
+    BUILD_DEPS += , tdepim-trinity-dev
+  else
+    CONFIGURE_FLAGS+= --disable-tdeab
+  endif
+endif
+
 ifeq "$(ENABLE_MYSQLNATIVE)" "y"
 	CONFIGURE_FLAGS += --enable-ext-mariadb-connector
   ifeq "$(MYSQL_FLAVOUR)" "default"
@@ -1834,6 +1860,11 @@
 ifeq "$(BUILD_KDE)" "y"
 	cat debian/control.kde.in >> debian/control
 endif
+ifeq "$(BUILD_TDE)" "y"
+	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
@@ -1843,6 +1874,9 @@
 ifeq "$(ENABLE_EVO2)" "y"
 	cat debian/control.evolution.in >> debian/control
 endif
+ifeq "$(ENABLE_TDEAB)" "y"
+	cat debian/control.tdeab.in >> debian/control
+endif
 ifeq "$(BUILD_TEST_PACKAGE)" "y"
   ifneq "$(OOO_JAVA_ARCHS)" ""
 	cat debian/control.subsequentcheckbase.in >> debian/control
@@ -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-trinity: TDE UI Plugin and TDE File Picker support/' debian/control
+endif
 
 ifeq "$(USE_DBUS)" "y"
   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
+	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
+	for i in $(SOURCE_TREE)/extras/source/shellnew/*; do \
+		cp $$i $(PKGDIR)-trinity/opt/trinity/share/templates/.source/`basename $$i`; \
+	done
+	cat debian/templates/soffice-template.desktop.in \
+		| sed -e "s/@APP@/Writer/" \
+		| sed -e "s/@EXT@/odt/" \
+		| sed -e "s/@TYPE@/text/" \
+		> $(PKGDIR)-trinity/opt/trinity/share/templates/soffice.odt.desktop
+	cat debian/templates/soffice-template.desktop.in \
+		| sed -e "s/@APP@/Calc/" \
+		| sed -e "s/@EXT@/ods/" \
+		| sed -e "s/@TYPE@/spreadsheet/" \
+		> $(PKGDIR)-trinity/opt/trinity/share/templates/soffice.ods.desktop
+	cat debian/templates/soffice-template.desktop.in \
+		| sed -e "s/@APP@/Impress/" \
+		| sed -e "s/@EXT@/odp/" \
+		| sed -e "s/@TYPE@/presentation/" \
+		> $(PKGDIR)-trinity/opt/trinity/share/templates/soffice.odp.desktop
+	cat debian/templates/soffice-template.desktop.in \
+		| sed -e "s/@APP@/Draw/" \
+		| sed -e "s/@EXT@/odg/" \
+		| sed -e "s/@TYPE@/drawing/" \
+		> $(PKGDIR)-trinity/opt/trinity/share/templates/soffice.odg.desktop
+endif
+ifeq "$(ENABLE_TDEAB)" "y"
+	rm -rf $(PKGDIR)-tdeab-trinity
+	mkdir -p -m755 $(PKGDIR)-tdeab-trinity/$(OODIR)/program
+	for f in libtdeab*so; do \
+	  mv $(PKGDIR)-core/$(OODIR)/program/$$f $(PKGDIR)-tdeab-trinity/$(OODIR)/program || exit 1 ;\
+	done
+endif
 
 	# split out gtk stuff
 	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
 
+ifeq "$(BUILD_TDE)" "y"
+	# be sure we use the right moc, FIXME: Trinity uses its own moc
+	mkdir -p $(CURDIR)/debian/usr/bin
+	ln -sf /usr/bin/moc-qt$(KDE_VER) $(CURDIR)/debian/usr/bin/moc
+endif
+
 #ifeq "$(PACKAGE_SDK)" "y"
 #	# install gengal stuff into -dev
 #	mkdir -p $(PKGDIR)-dev/$(OODIR)/program
@@ -3445,6 +3529,7 @@
 		-V'Binary-Version=$(BINARY_VERSION)' \
 		-V'ooo-officebean-dep=$(OOO_OFFICEBEAN_DEP)' \
 		-V'kde-iconset-dep=$(KDE_ICONSET_DEP)' \
+		-V'tde-iconset-dep=$(TDE_ICONSET_DEP)' \
 		-V'lpsolve-dep=$(LPSOLVE_DEP)' \
 		-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	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
 create_package_directory gid_Module_Optional_Kde                pkg/libreoffice-kde
+create_package_directory gid_Module_Optional_Tde                pkg/libreoffice-trinity
 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
@@ -149,7 +150,7 @@
 fi &&
 ( cd pkg/libreoffice-common/$OOINSTBASE/program
   find -maxdepth 1 \
-     -regex '\./\(.*\.so.*\|.*\.bin\|pagein\|kdefilepicker\|msfontextract\|.*\.rdb\|javaldx\|oosplash\|uri-encode\|xpdfimport\|ui-previewer\)' \
+     -regex '\./\(.*\.so.*\|.*\.bin\|pagein\|kdefilepicker\|tdefilepicker\|msfontextract\|.*\.rdb\|javaldx\|oosplash\|uri-encode\|xpdfimport\|ui-previewer\)' \
      -exec mv {} $OODESTDIR/pkg/libreoffice-core/$OOINSTBASE/program \;
 );