From 9917b299759debad59e47fd53b8629010936a13c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sun, 29 Aug 2021 18:21:22 +0200 Subject: [PATCH] DEB libkdcraw: Switch to cmake. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko (cherry picked from commit e3647ad567201302598a65d52a98d8b07eb5399a) --- .../_base/libraries/libkdcraw/debian/control | 4 ++-- debian/_base/libraries/libkdcraw/debian/rules | 23 ++++++++++--------- .../_base/libraries/libkdcraw/debian/control | 4 ++-- ubuntu/_base/libraries/libkdcraw/debian/rules | 23 ++++++++++--------- 4 files changed, 28 insertions(+), 26 deletions(-) diff --git a/debian/_base/libraries/libkdcraw/debian/control b/debian/_base/libraries/libkdcraw/debian/control index d5d3617d4..eb80f4c6b 100644 --- a/debian/_base/libraries/libkdcraw/debian/control +++ b/debian/_base/libraries/libkdcraw/debian/control @@ -4,9 +4,9 @@ Priority: optional Maintainer: TDE Debian Team XSBC-Original-Maintainer: Debian KDE Extras Team Uploaders: Mark Purcell , Achim Bohnet , Fathi Boudra -Build-Depends: cdbs, debhelper (>= 9~), quilt, tdelibs14-trinity-dev, +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, liblcms2-dev | liblcms1-dev, libjpeg-dev, pkg-config, - automake, autoconf, libtool, libltdl-dev + libomp-dev [amd64 arm64 armhf i386 mips64el ppc64el] Standards-Version: 3.8.4 Homepage: http://www.kipi-plugins.org/ diff --git a/debian/_base/libraries/libkdcraw/debian/rules b/debian/_base/libraries/libkdcraw/debian/rules index a5de48a38..f69d1ece9 100755 --- a/debian/_base/libraries/libkdcraw/debian/rules +++ b/debian/_base/libraries/libkdcraw/debian/rules @@ -1,19 +1,20 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde -DEB_CONFIGURE_MANDIR := /opt/trinity/share/man -DEB_CONFIGURE_PREFIX := /opt/trinity -DEB_CONFIGURE_INFODIR := /opt/trinity/share/info - -cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) - -DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--no-undefined -Wl,--as-needed" -DEB_DH_INSTALL_ARGS := --sourcedir=debian/tmp - -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DBUILD_ALL="ON" \ + -DWITH_ALL_OPTIONS="ON" # add installed liblcms*-dev to libkdcraw3-trinity-dev depends common-binary-arch:: diff --git a/ubuntu/_base/libraries/libkdcraw/debian/control b/ubuntu/_base/libraries/libkdcraw/debian/control index 96c4ee08e..33c6c3a76 100644 --- a/ubuntu/_base/libraries/libkdcraw/debian/control +++ b/ubuntu/_base/libraries/libkdcraw/debian/control @@ -4,9 +4,9 @@ Priority: optional Maintainer: TDE Debian Team XSBC-Original-Maintainer: Debian KDE Extras Team Uploaders: Mark Purcell , Achim Bohnet , Fathi Boudra -Build-Depends: cdbs, debhelper (>= 9~), quilt, tdelibs14-trinity-dev, +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, liblcms2-dev | liblcms1-dev, libjpeg-dev, pkg-config, - automake, autoconf, libtool, libltdl-dev + libomp-dev [amd64 arm64 armhf i386 mips64el ppc64el] Standards-Version: 3.8.4 Homepage: http://www.kipi-plugins.org/ diff --git a/ubuntu/_base/libraries/libkdcraw/debian/rules b/ubuntu/_base/libraries/libkdcraw/debian/rules index a5de48a38..f69d1ece9 100755 --- a/ubuntu/_base/libraries/libkdcraw/debian/rules +++ b/ubuntu/_base/libraries/libkdcraw/debian/rules @@ -1,19 +1,20 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde -DEB_CONFIGURE_MANDIR := /opt/trinity/share/man -DEB_CONFIGURE_PREFIX := /opt/trinity -DEB_CONFIGURE_INFODIR := /opt/trinity/share/info - -cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) - -DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--no-undefined -Wl,--as-needed" -DEB_DH_INSTALL_ARGS := --sourcedir=debian/tmp - -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DBUILD_ALL="ON" \ + -DWITH_ALL_OPTIONS="ON" # add installed liblcms*-dev to libkdcraw3-trinity-dev depends common-binary-arch::