[Git][libreoffice-team/libreoffice/libreoffice][debian-experimental-6.1] 2 commits: test-backport (gtk3_)kde5 stuff: add feature/gtk3_kde5 branch and --enable-kde5/--enable-gtk3-kde5
Rene Engelhard
rene at debian.org
Sat Jan 20 13:27:51 UTC 2018
Rene Engelhard pushed to branch debian-experimental-6.1 at Debian LibreOffice Maintainers / libreoffice / libreoffice
Commits:
8f30d0ab by Rene Engelhard at 2018-01-20T11:02:54+00:00
test-backport (gtk3_)kde5 stuff: add feature/gtk3_kde5 branch and --enable-kde5/--enable-gtk3-kde5
- - - - -
7b25dc98 by Rene Engelhard at 2018-01-20T13:27:26+00:00
that -kde5 contains libvclplug_gtk3_kde is a implementation detail only
- - - - -
7 changed files:
- changelog
- control
- control.kde5.in
- control.transitionals.in
- + patches/gtk3_kde5.diff
- patches/series
- rules
Changes:
=====================================
changelog
=====================================
--- a/changelog
+++ b/changelog
@@ -1,16 +1,19 @@
-libreoffice (1:6.1.0~alpha1~git20180114-1) UNRELEASED; urgency=medium
+libreoffice (1:6.1.0~alpha1~git20180118-1) UNRELEASED; urgency=medium
* New upstream snapshot
- fixes cross-file links with xlsx files (closes: #658569)
* debian/patches/no-packagekit-per-default.diff: use the new config options
to disable the packagekit install stuff
+ * debian/patches/gtk3_kde5.diff: add feature/gtk3_kde5 branch
* debian/rules:
- install smoketestdoc.sxw and TestExtension.oxt into a new
libreoffice-smoketest package which can be used by autopkgtests
+ - enable gtk3_kde vclplug and "kde5" (kde5be)
* debian/tests/*: add autopkgtest to test install TestExtension.oxt
(user and shared)
+ * debian/control.transitionals.in: add -kde -> kde5 transitional package
-- Rene Engelhard <rene at debian.org> Tue, 07 Nov 2017 20:59:01 +0100
=====================================
control
=====================================
--- a/control
+++ b/control
@@ -48,12 +48,12 @@ Build-Depends: ant (>= 1.7.0) [!hppa !ia64 !mips64 !s390 !sparc],
libavahi-client-dev,
libbase-java [!hppa !ia64 !mips64 !s390 !sparc],
libbluetooth-dev [linux-any],
- libboost-date-time-dev (>= 1.58),
- libboost-dev (>= 1.58),
- libboost-filesystem-dev (>= 1.58),
- libboost-iostreams-dev (>= 1.58),
- libboost-locale-dev (>= 1.58),
- libboost-system-dev (>= 1.58),
+ libboost-date-time-dev (>= 1.64),
+ libboost-dev (>= 1.64),
+ libboost-filesystem-dev (>= 1.64),
+ libboost-iostreams-dev (>= 1.64),
+ libboost-locale-dev (>= 1.64),
+ libboost-system-dev (>= 1.64),
libc0.1 (>= 2.10.2-7) [kfreebsd-any],
libc6 (>= 2.17-6) [mips mipsel],
libcairo2-dev,
@@ -85,6 +85,7 @@ Build-Depends: ant (>= 1.7.0) [!hppa !ia64 !mips64 !s390 !sparc],
libgirepository1.0-dev (>= 1.32),
libgl1-mesa-dev,
libglib2.0-dev (>= 2.38.0),
+ libglib2.0-dev (>= 2.4),
libglm-dev (>= 0.9.6.3),
libgpg-error-dev,
libgpgme-dev,
@@ -101,6 +102,11 @@ Build-Depends: ant (>= 1.7.0) [!hppa !ia64 !mips64 !s390 !sparc],
libice-dev,
libicu-dev (>= 52),
libjpeg-dev,
+ libkf5config-dev,
+ libkf5coreaddons-dev,
+ libkf5i18n-dev,
+ libkf5kio-dev,
+ libkf5windowsystem-dev,
liblangtag-dev (>= 0.4),
liblayout-java (>= 0.2.10) [!hppa !ia64 !mips64 !s390 !sparc],
liblcms2-dev,
@@ -125,6 +131,7 @@ Build-Depends: ant (>= 1.7.0) [!hppa !ia64 !mips64 !s390 !sparc],
libpoppler-dev (>= 0.12.0),
libpoppler-private-dev,
libpq-dev (>= 9.0~),
+ libqt5x11extras5-dev,
libqxp-dev,
librdf0-dev (>= 1.0.16-2),
librepository-java (>= 1.1.6) [!hppa !ia64 !mips64 !s390 !sparc],
@@ -144,6 +151,7 @@ Build-Depends: ant (>= 1.7.0) [!hppa !ia64 !mips64 !s390 !sparc],
libwps-dev (>= 0.4.8) <!nocheck>,
libx11-dev,
libxaw7-dev,
+ libxcb1-dev,
libxext-dev,
libxinerama-dev,
libxkbfile-dev,
@@ -165,6 +173,10 @@ Build-Depends: ant (>= 1.7.0) [!hppa !ia64 !mips64 !s390 !sparc],
pstoedit [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] <!nocheck>,
python3,
python3-dev (>= 3.3),
+ qt5-qmake,
+ qtbase5-dev,
+ qtbase5-dev-tools,
+ qtchooser,
ucpp,
unixodbc-dev (>= 2.2.11),
unzip,
@@ -176,7 +188,6 @@ Build-Depends-Indep: doxygen (>= 1.8.4) <!nodoc>,
g++-mingw-w64-i686,
gettext,
graphviz <!nodoc>,
- libbase-java [!hppa !ia64 !mips64 !s390 !sparc],
libbsh-java,
rdfind,
symlinks
@@ -235,7 +246,7 @@ Suggests: cups-bsd,
hyphen-hyphenation-patterns,
imagemagick | graphicsmagick-imagemagick-compat,
libgl1,
- libreoffice-gnome,
+ libreoffice-gnome | libreoffice-kde5,
libreoffice-grammarcheck,
libreoffice-help (= ${help-l10n-virtual-version}),
libreoffice-l10n (= ${help-l10n-virtual-version}),
@@ -4245,6 +4256,21 @@ Description: common data for LOKDocView
This package contains architecture-independent data (e.g. the selection
handlers).
+Package: libreoffice-kde5
+Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 m68k mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390 s390x sparc sparc64
+Depends: libreoffice-core (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
+Recommends: ${kde-iconset-dep}
+Section: kde
+Enhances: libreoffice
+Description: office productivity suite -- KDE 5 integration
+ LibreOffice is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ This package contains the KDE plugin for LibreOffice and a KDEish File Picker
+ when running under KDE.
+
Package: libreoffice-sdbc-postgresql
Section: misc
Architecture: alpha amd64 arm64 armel armhf i386 m68k mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386
@@ -4351,3 +4377,15 @@ Description: transitional package for PDF Import component for LibreOffice
Documents. This now has been merged back into the "main" packages and this
package thus can be safely removed once installed.
+Package: libreoffice-kde
+Section: oldlibs
+Priority: extra
+Architecture: all
+Depends: libreoffice-kde5, ${misc:Depends}
+Description: transitional package for LibreOffice KDE integration
+ This package used to contain the LibreOffice KDE 4 backend. The package has
+ been renamed to libreoffice-kdeX and this package now depends on the new
+ libreoffice-kde5 packages.
+ .
+ You can safely remove this package.
+
=====================================
control.kde5.in
=====================================
--- a/control.kde5.in
+++ b/control.kde5.in
@@ -1,7 +1,6 @@
Package: libreoffice-kde5
Architecture: %OOO_ARCHS%
Depends: libreoffice-core (= ${binary:Version}),
- libreoffice-qt5 (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
Recommends: ${kde-iconset-dep}
@@ -11,6 +10,6 @@ Description: office productivity suite -- KDE 5 integration
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
.
- This package contains the KDE plugin for drawing LibreOffices widgets with
- KDE/Qt and a KDEish File Picker when running under KDE.
+ This package contains the KDE plugin for LibreOffice and a KDEish File Picker
+ when running under KDE.
=====================================
control.transitionals.in
=====================================
--- a/control.transitionals.in
+++ b/control.transitionals.in
@@ -10,3 +10,15 @@ Description: transitional package for PDF Import component for LibreOffice
Documents. This now has been merged back into the "main" packages and this
package thus can be safely removed once installed.
+Package: libreoffice-kde
+Section: oldlibs
+Priority: extra
+Architecture: all
+Depends: libreoffice-kde5, ${misc:Depends}
+Description: transitional package for LibreOffice KDE integration
+ This package used to contain the LibreOffice KDE 4 backend. The package has
+ been renamed to libreoffice-kdeX and this package now depends on the new
+ libreoffice-kde5 packages.
+ .
+ You can safely remove this package.
+
=====================================
patches/gtk3_kde5.diff
=====================================
The diff for this file was not included because it is too large.
=====================================
patches/series
=====================================
--- a/patches/series
+++ b/patches/series
@@ -29,6 +29,7 @@ no-openssl.diff
disable-some-sc-tests-with-internal-cppunit.diff
cppunit-optional.diff
disable-unused-test-programs.diff
-disable-tests-somehow-needing-more-fonts.diff
+#disable-tests-somehow-needing-more-fonts.diff
tdf108963-test.diff
apparmor-complain.diff
+gtk3_kde5.diff
=====================================
rules
=====================================
--- a/rules
+++ b/rules
@@ -195,14 +195,18 @@ SYSTEM_STUFF += libqxp
BUILD_CAIROCANVAS=y
SYSTEM_STUFF += cairo
CAIRO_FONTS_PATCH=y
-BUILD_KDE=n
+BUILD_KDE=y
BUILD_KDE4=n
# < 4.8 fails with gcc 4.7, see #667911
QT4_MINVER= (>= 4:4.8)
KDELIBS_MINVER= (>= 4:4.3.4)
-#BUILD_KDE5=n
ENABLE_QT5=n
-KDE_MAJOR=5
+BUILD_KDE5=y
+ifeq "$(BUILD_KDE5)" "y"
+ ENABLE_GTK3_KDE5=y
+ ENABLE_KDE5=y
+ KDE_MAJOR=5
+endif
ifeq "$(BUILD_KDE)" "y"
ifeq "$(BUILD_KDE4)" "y"
ifeq "$(BUILD_KDE5)" "y"
@@ -1297,15 +1301,25 @@ else
BUILD_DEPS += , libqt4-dev $(QT4_MINVER)
endif
-#ifeq "$(BUILD_KDE5)" "n"
-# CONFIGURE_FLAGS += --disable-kde5
-#else
-# ENABLE_QT5=y
-# CONFIGURE_FLAGS += --enable-kde5
-# KDE_ICONSET_DEP=libreoffice-style-breeze
-# BUILD_DEPS += , libkf5coreaddons-dev, libkf5kdelibs4support5-bin
-# BUILD_DEPS += , libxcb1-dev
-#endif
+ifeq "$(BUILD_KDE5)" "y"
+ KDE_ICONSET_DEP=libreoffice-style-breeze
+ ifeq "$(ENABLE_GTK3_KDE5)" "y"
+ CONFIGURE_FLAGS += --enable-gtk3-kde5
+ endif
+ ifeq "$(ENABLE_KDE5)" "y"
+ CONFIGURE_FLAGS += --enable-kde5
+ endif
+ BUILD_DEPS += , libkf5coreaddons-dev, libkf5i18n-dev, libkf5config-dev, libkf5windowsystem-dev, libkf5kio-dev
+ BUILD_DEPS += , qtbase5-dev, libqt5x11extras5-dev
+ BUILD_DEPS += , qt5-qmake, qtbase5-dev-tools
+ BUILD_DEPS += , libglib2.0-dev (>= 2.4)
+ BUILD_DEPS += , libxcb1-dev
+ # for correct qmake/moc
+ BUILD_DEPS += , qtchooser
+ export QT_SELECT=5
+ # needs Boost.Process...
+ BOOST_MINVER= (>= 1.64)
+endif
ifeq "$(ENABLE_QT5)" "y"
CONFIGURE_FLAGS += --enable-qt5
@@ -2111,7 +2125,7 @@ endif
# FIXME
cd $(CURDIR)/debian/tmp/pkg && rm -rf \*
-
+
ifeq "$(ENABLE_QT5)" "y"
# we need to do it here. If -kde isn't built
# there's no -kde.install generated, so dh_missing complains later
@@ -2120,8 +2134,19 @@ ifeq "$(ENABLE_QT5)" "y"
debian/tmp/pkg/libreoffice-qt5/$(OODIR)/program
endif
ifeq "$(BUILD_KDE)" "y"
+ ifeq "$(ENABLE_KDE5)" "y"
mv debian/tmp/pkg/libreoffice-kde \
debian/tmp/pkg/libreoffice-kde$(KDE_MAJOR)
+ else
+ ifeq "$(ENABLE_GTK3_KDE5)" "y"
+ # not installed...
+ mkdir -p debian/tmp/pkg/libreoffice-kde$(KDE_MAJOR)/$(OODIR)/program
+ for i in libvclplug_gtk3_kde5lo.so lo_kde5filepicker; do \
+ cp instdir/program/$$i \
+ debian/tmp/pkg/libreoffice-kde$(KDE_MAJOR)/$(OODIR)/program; \
+ done
+ endif
+ endif
endif
# prepare install/dir files for dh
View it on GitLab: https://salsa.debian.org/libreoffice-team/libreoffice/libreoffice/compare/e91ccb151b1f4084497b005dea717230a448d000...7b25dc98e10ac09397b60305954c2f352e34b8df
---
View it on GitLab: https://salsa.debian.org/libreoffice-team/libreoffice/libreoffice/compare/e91ccb151b1f4084497b005dea717230a448d000...7b25dc98e10ac09397b60305954c2f352e34b8df
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/pkg-openoffice-commits/attachments/20180120/0e86564a/attachment-0001.html>
More information about the Pkg-openoffice-commits
mailing list