From abf1c9f3ff5d672fd6572282561bad77d94aa308 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Thu, 24 Jun 2021 20:49:59 +0200 Subject: [PATCH] DEB kopete-otr: 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 47df847e18c5ee625ec664a238072969b17802bc) --- .../applications/kopete-otr/debian/control | 2 +- .../applications/kopete-otr/debian/rules | 37 ++++++------------- .../applications/kopete-otr/debian/watch | 3 -- .../applications/kopete-otr/debian/control | 2 +- .../applications/kopete-otr/debian/rules | 37 ++++++------------- .../applications/kopete-otr/debian/watch | 3 -- 6 files changed, 26 insertions(+), 58 deletions(-) delete mode 100644 debian/_base/applications/kopete-otr/debian/watch delete mode 100644 ubuntu/_base/applications/kopete-otr/debian/watch diff --git a/debian/_base/applications/kopete-otr/debian/control b/debian/_base/applications/kopete-otr/debian/control index 222ceabdf..1840098de 100644 --- a/debian/_base/applications/kopete-otr/debian/control +++ b/debian/_base/applications/kopete-otr/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team XSBC-Original-Maintainer: Harald Sitter -Build-Depends: cdbs, debhelper (>= 9~), tdenetwork-trinity-dev, libotr5-dev | libotr2-dev (>= 3.0.0), automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdenetwork-trinity-dev, libotr5-dev | libotr2-dev (>= 3.0.0) Standards-Version: 3.8.4 Package: kopete-otr-trinity diff --git a/debian/_base/applications/kopete-otr/debian/rules b/debian/_base/applications/kopete-otr/debian/rules index 205e98266..a6797f19a 100755 --- a/debian/_base/applications/kopete-otr/debian/rules +++ b/debian/_base/applications/kopete-otr/debian/rules @@ -1,30 +1,17 @@ #!/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_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde - -post-patches:: debian/stamp-bootstrap - -debian/stamp-bootstrap: -ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" "" - cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh -endif -ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" - cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh -endif -ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" - cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh -endif - cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in - - make -f admin/Makefile.common cvs - touch debian/stamp-bootstrap +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" diff --git a/debian/_base/applications/kopete-otr/debian/watch b/debian/_base/applications/kopete-otr/debian/watch deleted file mode 100644 index 50ddb75fa..000000000 --- a/debian/_base/applications/kopete-otr/debian/watch +++ /dev/null @@ -1,3 +0,0 @@ -version=3 - -http://kopete-otr.follefuder.org/ \.\/kopete-otr-(.*)\.tar\.bz2 diff --git a/ubuntu/_base/applications/kopete-otr/debian/control b/ubuntu/_base/applications/kopete-otr/debian/control index eef250100..acc314c08 100644 --- a/ubuntu/_base/applications/kopete-otr/debian/control +++ b/ubuntu/_base/applications/kopete-otr/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team XSBC-Original-Maintainer: Harald Sitter -Build-Depends: cdbs, debhelper (>= 9~), tdenetwork-trinity-dev, libotr5-dev | libotr2-dev (>= 3.0.0), automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdenetwork-trinity-dev, libotr5-dev | libotr2-dev (>= 3.0.0) Standards-Version: 3.8.4 Package: kopete-otr-trinity diff --git a/ubuntu/_base/applications/kopete-otr/debian/rules b/ubuntu/_base/applications/kopete-otr/debian/rules index 205e98266..a6797f19a 100755 --- a/ubuntu/_base/applications/kopete-otr/debian/rules +++ b/ubuntu/_base/applications/kopete-otr/debian/rules @@ -1,30 +1,17 @@ #!/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_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde - -post-patches:: debian/stamp-bootstrap - -debian/stamp-bootstrap: -ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" "" - cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh -endif -ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" - cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh -endif -ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" - cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh -endif - cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in - - make -f admin/Makefile.common cvs - touch debian/stamp-bootstrap +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" diff --git a/ubuntu/_base/applications/kopete-otr/debian/watch b/ubuntu/_base/applications/kopete-otr/debian/watch deleted file mode 100644 index 50ddb75fa..000000000 --- a/ubuntu/_base/applications/kopete-otr/debian/watch +++ /dev/null @@ -1,3 +0,0 @@ -version=3 - -http://kopete-otr.follefuder.org/ \.\/kopete-otr-(.*)\.tar\.bz2