[SCM] kalgebra packaging branch, master, updated. debian/4%17.08.0-1-6-g5b47282

Fri Dec 8 20:31:52 UTC 2017

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kalgebra.git;a=commitdiff;h=46e2a87

The following commit has been merged in the master branch:
commit 46e2a870bbfa63fcca2b23ff77c91482b50c3364
Author: Pino Toscano <pino at debian.org>
Date:   Fri Dec 8 21:21:45 2017 +0100

    build also without qtwebengine
---
 debian/changelog                       |  8 ++++++++
 debian/control                         |  8 ++++----
 debian/patches/backend.diff            | 17 +++++++++++++++++
 debian/patches/cmake-dependencies.diff | 25 +++++++++++++++++++++++++
 debian/patches/series                  |  2 ++
 debian/rules                           |  8 ++++++++
 6 files changed, 64 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ab4c56e..eb25816 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,14 @@ kalgebra (4:17.08.3-0r1) UNRELEASED; urgency=medium
   * New upstream release.
   * Bump Standards-Version to 4.1.2, no changes required.
   * Simplify watch file, and switch it to https.
+  * Build a reduced version on architectures without QtWebEngine:
+    - limit the qtwebengine5-dev build dependency
+    - limit the kalgebra, and kalgebra-common binaries
+    - without it, pass -DMOBILE_BACKEND=none to cmake, to build only
+      kalgebramobile
+    - fix cmake to not error our on -DMOBILE_BACKEND=none, patch backend.diff
+    - fix cmake to look for the libraries used also by kalgebramobile; patch
+      cmake-dependencies.diff
 
  -- Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 08 Dec 2017 20:17:54 +0100
 
diff --git a/debian/control b/debian/control
index aa678ec..7f37481 100644
--- a/debian/control
+++ b/debian/control
@@ -22,14 +22,14 @@ Build-Depends: cmake (>= 2.8.11),
                pkg-kde-tools (>> 0.15.15),
                qtbase5-dev (>= 5.4),
                qtdeclarative5-dev (>= 5.4),
-               qtwebengine5-dev,
+               qtwebengine5-dev [amd64 arm64 armhf i386 mipsel],
 Standards-Version: 4.1.2
 Homepage: http://edu.kde.org/
 Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/applications/kalgebra.git
 Vcs-Git: https://anonscm.debian.org/git/pkg-kde/applications/kalgebra.git
 
 Package: kalgebra
-Architecture: any
+Architecture: amd64 arm64 armhf i386 mipsel
 Section: math
 Depends: kalgebra-common (= ${binary:Version}),
          ${misc:Depends},
@@ -45,7 +45,7 @@ Description: algebraic graphing calculator
  This package is part of the KDE education module.
 
 Package: kalgebra-common
-Architecture: any
+Architecture: amd64 arm64 armhf i386 mipsel
 Section: math
 Breaks: kalgebra (<< 4:4.7.2), ${kde-l10n:all}
 Replaces: kalgebra (<< 4:4.7.2), ${kde-l10n:all}
@@ -63,7 +63,7 @@ Description: contains files common for kalgebra and kalgebramobile
 Package: kalgebramobile
 Architecture: any
 Section: math
-Depends: kalgebra-common (= ${binary:Version}),
+Depends: kalgebra-common (= ${binary:Version}) [amd64 arm64 armhf i386 mipsel],
          plasma-framework,
          qml-module-org-kde-kirigami2,
          ${misc:Depends},
diff --git a/debian/patches/backend.diff b/debian/patches/backend.diff
new file mode 100644
index 0000000..bd98e01
--- /dev/null
+++ b/debian/patches/backend.diff
@@ -0,0 +1,17 @@
+Author: Pino Toscano <pino at debian.org>
+Description: Do not unconditionally add a directory for MOBILE_BACKEND
+ This makes it possible to specify a non-existing backend to disable an
+ existing one.
+Last-Update: 2017-12-08
+Forwarded: no
+
+--- a/mobile/plugins/widgets/CMakeLists.txt
++++ b/mobile/plugins/widgets/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-add_subdirectory(${MOBILE_BACKEND})
++if(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${MOBILE_BACKEND})
++  add_subdirectory(${MOBILE_BACKEND})
++endif()
+ 
+ install( FILES
+     qmldir
diff --git a/debian/patches/cmake-dependencies.diff b/debian/patches/cmake-dependencies.diff
new file mode 100644
index 0000000..c304010
--- /dev/null
+++ b/debian/patches/cmake-dependencies.diff
@@ -0,0 +1,25 @@
+Author: Pino Toscano <pino at debian.org>
+Description: Always require Qt5PrintSupport and KF5I18n
+ They are needed also for kalgebramobile, so always require them.
+Last-Update: 2017-12-08
+Forwarded: no
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -32,13 +32,14 @@ set_package_properties(Curses PROPERTIES
+ add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
+ add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
+ 
++find_package(Qt5PrintSupport REQUIRED)
++find_package(KF5I18n ${KF5_VERSION} REQUIRED)
++
+ if(${MOBILE_BACKEND} STREQUAL "kde")
+-    find_package(KF5I18n ${KF5_VERSION} REQUIRED)
+     find_package(KF5ConfigWidgets ${KF5_VERSION} REQUIRED)
+     find_package(KF5WidgetsAddons ${KF5_VERSION} REQUIRED)
+     find_package(KF5KIO REQUIRED)
+     find_package(Qt5WebEngineWidgets REQUIRED)
+-    find_package(Qt5PrintSupport REQUIRED)
+     find_package(KF5DocTools)
+ 
+     add_subdirectory(src)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..7f4d1c8
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+cmake-dependencies.diff
+backend.diff
diff --git a/debian/rules b/debian/rules
index eea8a94..3f1df2b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,17 @@
 #!/usr/bin/make -f
 
+include /usr/share/dpkg/architecture.mk
+
 l10npkgs_firstversion_ok := 4:17.04.3-2~
+webengine_archs := amd64 arm64 armhf i386 mipsel
 
 include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
 include /usr/share/pkg-kde-tools/qt-kde-team/2/l10n-packages.mk
 
+ifneq ($(DEB_HOST_ARCH),$(filter $(DEB_HOST_ARCH),$(webengine_archs)))
+override_dh_auto_configure:
+	$(overridden_command) -- -DMOBILE_BACKEND="none"
+endif
+
 override_dh_strip:
 	$(overridden_command) --dbgsym-migration='kalgebra-dbg (<= 4:15.12.1-1~~)'

-- 
kalgebra packaging

