From 0b0b0df7f7ee71b3a2d6591144a9b5b674f6a410 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Mon, 10 Nov 2025 15:33:52 +0900 Subject: DEB krusader: switch to cmake building system Signed-off-by: Michele Calgaro --- .../applications/system/krusader/debian/control | 2 +- .../applications/system/krusader/debian/rules | 38 ++++++---------------- .../applications/system/krusader/debian/control | 2 +- .../applications/system/krusader/debian/rules | 38 ++++++---------------- 4 files changed, 22 insertions(+), 58 deletions(-) diff --git a/debian/_base/applications/system/krusader/debian/control b/debian/_base/applications/system/krusader/debian/control index 78a72ad8d..998fae531 100644 --- a/debian/_base/applications/system/krusader/debian/control +++ b/debian/_base/applications/system/krusader/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team Uploaders: Fathi Boudra , Mark Purcell -Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, libkonq4-trinity-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdebase-trinity-dev, libkonq4-trinity-dev, libacl1-dev Standards-Version: 3.8.4 Homepage: http://krusader.sourceforge.net diff --git a/debian/_base/applications/system/krusader/debian/rules b/debian/_base/applications/system/krusader/debian/rules index 4747ea4c6..f105545bb 100755 --- a/debian/_base/applications/system/krusader/debian/rules +++ b/debian/_base/applications/system/krusader/debian/rules @@ -1,33 +1,15 @@ #!/usr/bin/make -f -# Currently is not possible to build piklab with --enable-final -DEB_BUILD_OPTIONS += noopt - include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/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 - -DEB_DESTDIR = $(CURDIR)/debian/krusader-trinity/ - -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde - -install/krusader-trinity:: - # install xpm files used by menu - install -D -p -m0644 pics/cr16-app-krusader_root.xpm \ - $(DEB_DESTDIR)/opt/trinity/share/pixmaps/krusader_root-16.xpm - install -D -p -m0644 pics/cr16-app-krusader_user.xpm \ - $(DEB_DESTDIR)/opt/trinity/share/pixmaps/krusader_user-16.xpm - install -D -p -m0644 pics/cr32-app-krusader_root.xpm \ - $(DEB_DESTDIR)/opt/trinity/share/pixmaps/krusader_root.xpm - install -D -p -m0644 pics/cr32-app-krusader_user.xpm \ - $(DEB_DESTDIR)/opt/trinity/share/pixmaps/krusader_user.xpm - # install properly tdeio_isorc - install -D -p -m0644 src/iso/tdeio_isorc \ - $(DEB_DESTDIR)/opt/trinity/share/config/tdeio_isorc - -binary-post-install/krusader-trinity:: - rm -rf debian/krusader-trinity/etc/trinity/ +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ + -DCMAKE_INSTALL_PREFIX="/opt/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/system/krusader/debian/control b/ubuntu/_base/applications/system/krusader/debian/control index 0d5c6dd3e..03efd3f09 100644 --- a/ubuntu/_base/applications/system/krusader/debian/control +++ b/ubuntu/_base/applications/system/krusader/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team Uploaders: Fathi Boudra , Mark Purcell -Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, libkonq4-trinity-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdebase-trinity-dev, libkonq4-trinity-dev, libacl1-dev Standards-Version: 3.8.4 Homepage: http://krusader.sourceforge.net diff --git a/ubuntu/_base/applications/system/krusader/debian/rules b/ubuntu/_base/applications/system/krusader/debian/rules index 4747ea4c6..f105545bb 100755 --- a/ubuntu/_base/applications/system/krusader/debian/rules +++ b/ubuntu/_base/applications/system/krusader/debian/rules @@ -1,33 +1,15 @@ #!/usr/bin/make -f -# Currently is not possible to build piklab with --enable-final -DEB_BUILD_OPTIONS += noopt - include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/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 - -DEB_DESTDIR = $(CURDIR)/debian/krusader-trinity/ - -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde - -install/krusader-trinity:: - # install xpm files used by menu - install -D -p -m0644 pics/cr16-app-krusader_root.xpm \ - $(DEB_DESTDIR)/opt/trinity/share/pixmaps/krusader_root-16.xpm - install -D -p -m0644 pics/cr16-app-krusader_user.xpm \ - $(DEB_DESTDIR)/opt/trinity/share/pixmaps/krusader_user-16.xpm - install -D -p -m0644 pics/cr32-app-krusader_root.xpm \ - $(DEB_DESTDIR)/opt/trinity/share/pixmaps/krusader_root.xpm - install -D -p -m0644 pics/cr32-app-krusader_user.xpm \ - $(DEB_DESTDIR)/opt/trinity/share/pixmaps/krusader_user.xpm - # install properly tdeio_isorc - install -D -p -m0644 src/iso/tdeio_isorc \ - $(DEB_DESTDIR)/opt/trinity/share/config/tdeio_isorc - -binary-post-install/krusader-trinity:: - rm -rf debian/krusader-trinity/etc/trinity/ +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ + -DCMAKE_INSTALL_PREFIX="/opt/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" -- cgit v1.2.3