From 2aff14590d95dfc1e165bfe5852df7e74f44cf7f Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sun, 22 Feb 2026 20:46:58 +0900 Subject: DEB kvirc: switch to cmake build system Signed-off-by: Michele Calgaro --- .../applications/internet/kvirc/debian/control | 2 +- .../kvirc/debian/kvirc-data-trinity.install | 6 +- .../internet/kvirc/debian/kvirc-trinity.install | 1 - .../_base/applications/internet/kvirc/debian/rules | 105 +++------------------ .../applications/internet/kvirc/debian/control | 2 +- .../kvirc/debian/kvirc-data-trinity.install | 6 +- .../internet/kvirc/debian/kvirc-trinity.install | 1 - .../_base/applications/internet/kvirc/debian/rules | 105 +++------------------ 8 files changed, 36 insertions(+), 192 deletions(-) diff --git a/debian/_base/applications/internet/kvirc/debian/control b/debian/_base/applications/internet/kvirc/debian/control index 3c1c88ed9..9d382c75e 100644 --- a/debian/_base/applications/internet/kvirc/debian/control +++ b/debian/_base/applications/internet/kvirc/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team XSBC-Original-Maintainer: Debian KDE Extras Team Uploaders: Raúl Sánchez Siles -Build-Depends: cdbs (>= 0.4.12), debhelper (>= 10~), quilt, tdelibs14-trinity-dev (>= 4:3.1.3), libperl-dev, libssl-dev, automake, autoconf, libtool-bin | libtool (<< 2.4.2-1.11), libtool, libltdl-dev, libgsm1-dev +Build-Depends: cdbs (>= 0.4.12), tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libperl-dev, libssl-dev, libxss-dev, libltdl-dev, libgsm1-dev Standards-Version: 3.8.4 Homepage: http://kvirc.net/ diff --git a/debian/_base/applications/internet/kvirc/debian/kvirc-data-trinity.install b/debian/_base/applications/internet/kvirc/debian/kvirc-data-trinity.install index 55b7221c5..4aaecad69 100644 --- a/debian/_base/applications/internet/kvirc/debian/kvirc-data-trinity.install +++ b/debian/_base/applications/internet/kvirc/debian/kvirc-data-trinity.install @@ -2,7 +2,6 @@ debian/tmp/opt/trinity/bin/kvi_run_netscape debian/tmp/opt/trinity/bin/kvi_search_help debian/tmp/opt/trinity/lib/kvirc/modules/caps/ debian/tmp/opt/trinity/share/applications/tde/kvirc.desktop -debian/tmp/opt/trinity/share/apps/tdeconf_update/ debian/tmp/opt/trinity/share/apps/kvirc/config/ debian/tmp/opt/trinity/share/apps/kvirc/doc/ debian/tmp/opt/trinity/share/apps/kvirc/defscript/ @@ -10,9 +9,10 @@ debian/tmp/opt/trinity/share/apps/kvirc/help/ debian/tmp/opt/trinity/share/apps/kvirc/license/ debian/tmp/opt/trinity/share/apps/kvirc/msgcolors/ debian/tmp/opt/trinity/share/apps/kvirc/pics/ -#debian/tmp/opt/trinity/share/apps/kvirc/services/ +debian/tmp/opt/trinity/share/apps/kvirc/services/ debian/tmp/opt/trinity/share/apps/kvirc/themes/ +debian/tmp/opt/trinity/share/apps/tdeconf_update/ debian/tmp/opt/trinity/share/icons/hicolor/ debian/tmp/opt/trinity/share/locale/ -debian/tmp/opt/trinity/share/mimelnk/text/*.desktop debian/tmp/opt/trinity/share/man/man1/kvirc.1 +debian/tmp/opt/trinity/share/mimelnk/text/*.desktop diff --git a/debian/_base/applications/internet/kvirc/debian/kvirc-trinity.install b/debian/_base/applications/internet/kvirc/debian/kvirc-trinity.install index 3c4e431a9..bebd86d30 100644 --- a/debian/_base/applications/internet/kvirc/debian/kvirc-trinity.install +++ b/debian/_base/applications/internet/kvirc/debian/kvirc-trinity.install @@ -1,4 +1,3 @@ -debian/overrides/kvirc-trinity usr/share/lintian/overrides debian/tmp/opt/trinity/bin/kvirc debian/tmp/opt/trinity/lib/*.so.* debian/tmp/opt/trinity/lib/kvirc/modules/*.so diff --git a/debian/_base/applications/internet/kvirc/debian/rules b/debian/_base/applications/internet/kvirc/debian/rules index 75068f6d3..d8f798f1c 100755 --- a/debian/_base/applications/internet/kvirc/debian/rules +++ b/debian/_base/applications/internet/kvirc/debian/rules @@ -1,93 +1,16 @@ -#! /usr/bin/make -f -# -# Build script for the KVIrc 3 debian package. -# Using Common Debian Build System (CDBS). -# - - # - # Update Makefiles - # - # This is done outside of debian/rules now, so that Debian autobuilders - # will all be building the same source, with no deviation because they - # might have an outdated autotools-dev version. -common-configure-impl:: -# ./autogen.sh +#!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk --include /usr/share/cdbs/1/class/tde-autotools.mk -#include /usr/share/cdbs/1/rules/patchsys-quilt.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) - - # - # Specify extra configure options: - # -DEB_CONFIGURE_EXTRA_FLAGS := --with-fno-rtti --with-aa-fonts --with-big-channels -DEB_CONFIGURE_EXTRA_FLAGS += --enable-perl --with-pic --enable-wall --mandir=$(DEB_CONFIGURE_MANDIR) -DEB_CONFIGURE_EXTRA_FLAGS += --disable-rpath --prefix=/opt/trinity - - # - # If debug is specified, turn it on - # -ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) - DEB_CONFIGURE_EXTRA_FLAGS += --enable-debug --with-memory-profile --with-memory-checks -else - #DEB_CONFIGURE_EXTRA_FLAGS += --enable-optimisation=3 - ifneq (,$(findstring 86,$(DEB_BUILD_GNU_CPU))) - # DEB_CONFIGURE_EXTRA_FLAGS += --enable-pipes --enable-objprelink - DEB_CONFIGURE_EXTRA_FLAGS +=--with-ix86-asm - endif -endif - - # - # Don't compress these files - # -DEB_COMPRESS_EXCLUDE_ALL += .kvs - -# The default gzip compressor has been changed in dpkg >= 1.17.0. -deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ - sed -e "s|.*version ||" -e "s| .*||" | \ - xargs -r dpkg --compare-versions 1.17.0 lt \ - && echo xz || echo gzip) -ifeq ($(deb_default_compress),gzip) -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) -endif - - # - # Run dh_shlibdeps with the correct options - # -DEB_SHLIBDEPS_INCLUDE_kvirc-trinity := debian/kvirc-trinity$(DEB_CONFIGURE_PREFIX)/lib -DEB_SHLIBDEPS_LIBRARY_kvirc-trinity := kvirc-trinity - - # - # Documentation to include for each package - # -DEB_INSTALL_DOCS_kvirc-trinity := FAQ README TODO -DEB_INSTALL_DOCS_ALL := -XCVS -X.cvsignore - -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 - - ./autogen.sh - touch debian/stamp-bootstrap - -binary-install/kvirc-data-trinity:: - mkdir -p debian/$(cdbs_curpkg)/opt/trinity/share/apps/kvirc/services - mv debian/tmp/opt/trinity/share/services/* debian/$(cdbs_curpkg)/opt/trinity/share/apps/kvirc/services/ +-include /usr/share/cdbs/1/class/tde.mk + +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/internet/kvirc/debian/control b/ubuntu/_base/applications/internet/kvirc/debian/control index 4bba27021..d5e56bc00 100644 --- a/ubuntu/_base/applications/internet/kvirc/debian/control +++ b/ubuntu/_base/applications/internet/kvirc/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team XSBC-Original-Maintainer: Debian KDE Extras Team Uploaders: Raúl Sánchez Siles -Build-Depends: cdbs (>= 0.4.12), debhelper (>= 10~), quilt, tdelibs14-trinity-dev (>= 4:3.1.3), libperl-dev, libssl-dev, automake, autoconf, libtool-bin | libtool (<< 2.4.2-1.11), libtool, libltdl-dev, libgsm1-dev +Build-Depends: cdbs (>= 0.4.12), tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libperl-dev, libssl-dev, libxss-dev, libltdl-dev, libgsm1-dev Standards-Version: 3.8.4 Homepage: http://kvirc.net/ diff --git a/ubuntu/_base/applications/internet/kvirc/debian/kvirc-data-trinity.install b/ubuntu/_base/applications/internet/kvirc/debian/kvirc-data-trinity.install index 55b7221c5..4aaecad69 100644 --- a/ubuntu/_base/applications/internet/kvirc/debian/kvirc-data-trinity.install +++ b/ubuntu/_base/applications/internet/kvirc/debian/kvirc-data-trinity.install @@ -2,7 +2,6 @@ debian/tmp/opt/trinity/bin/kvi_run_netscape debian/tmp/opt/trinity/bin/kvi_search_help debian/tmp/opt/trinity/lib/kvirc/modules/caps/ debian/tmp/opt/trinity/share/applications/tde/kvirc.desktop -debian/tmp/opt/trinity/share/apps/tdeconf_update/ debian/tmp/opt/trinity/share/apps/kvirc/config/ debian/tmp/opt/trinity/share/apps/kvirc/doc/ debian/tmp/opt/trinity/share/apps/kvirc/defscript/ @@ -10,9 +9,10 @@ debian/tmp/opt/trinity/share/apps/kvirc/help/ debian/tmp/opt/trinity/share/apps/kvirc/license/ debian/tmp/opt/trinity/share/apps/kvirc/msgcolors/ debian/tmp/opt/trinity/share/apps/kvirc/pics/ -#debian/tmp/opt/trinity/share/apps/kvirc/services/ +debian/tmp/opt/trinity/share/apps/kvirc/services/ debian/tmp/opt/trinity/share/apps/kvirc/themes/ +debian/tmp/opt/trinity/share/apps/tdeconf_update/ debian/tmp/opt/trinity/share/icons/hicolor/ debian/tmp/opt/trinity/share/locale/ -debian/tmp/opt/trinity/share/mimelnk/text/*.desktop debian/tmp/opt/trinity/share/man/man1/kvirc.1 +debian/tmp/opt/trinity/share/mimelnk/text/*.desktop diff --git a/ubuntu/_base/applications/internet/kvirc/debian/kvirc-trinity.install b/ubuntu/_base/applications/internet/kvirc/debian/kvirc-trinity.install index 3c4e431a9..bebd86d30 100644 --- a/ubuntu/_base/applications/internet/kvirc/debian/kvirc-trinity.install +++ b/ubuntu/_base/applications/internet/kvirc/debian/kvirc-trinity.install @@ -1,4 +1,3 @@ -debian/overrides/kvirc-trinity usr/share/lintian/overrides debian/tmp/opt/trinity/bin/kvirc debian/tmp/opt/trinity/lib/*.so.* debian/tmp/opt/trinity/lib/kvirc/modules/*.so diff --git a/ubuntu/_base/applications/internet/kvirc/debian/rules b/ubuntu/_base/applications/internet/kvirc/debian/rules index 75068f6d3..d8f798f1c 100755 --- a/ubuntu/_base/applications/internet/kvirc/debian/rules +++ b/ubuntu/_base/applications/internet/kvirc/debian/rules @@ -1,93 +1,16 @@ -#! /usr/bin/make -f -# -# Build script for the KVIrc 3 debian package. -# Using Common Debian Build System (CDBS). -# - - # - # Update Makefiles - # - # This is done outside of debian/rules now, so that Debian autobuilders - # will all be building the same source, with no deviation because they - # might have an outdated autotools-dev version. -common-configure-impl:: -# ./autogen.sh +#!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk --include /usr/share/cdbs/1/class/tde-autotools.mk -#include /usr/share/cdbs/1/rules/patchsys-quilt.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) - - # - # Specify extra configure options: - # -DEB_CONFIGURE_EXTRA_FLAGS := --with-fno-rtti --with-aa-fonts --with-big-channels -DEB_CONFIGURE_EXTRA_FLAGS += --enable-perl --with-pic --enable-wall --mandir=$(DEB_CONFIGURE_MANDIR) -DEB_CONFIGURE_EXTRA_FLAGS += --disable-rpath --prefix=/opt/trinity - - # - # If debug is specified, turn it on - # -ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) - DEB_CONFIGURE_EXTRA_FLAGS += --enable-debug --with-memory-profile --with-memory-checks -else - #DEB_CONFIGURE_EXTRA_FLAGS += --enable-optimisation=3 - ifneq (,$(findstring 86,$(DEB_BUILD_GNU_CPU))) - # DEB_CONFIGURE_EXTRA_FLAGS += --enable-pipes --enable-objprelink - DEB_CONFIGURE_EXTRA_FLAGS +=--with-ix86-asm - endif -endif - - # - # Don't compress these files - # -DEB_COMPRESS_EXCLUDE_ALL += .kvs - -# The default gzip compressor has been changed in dpkg >= 1.17.0. -deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ - sed -e "s|.*version ||" -e "s| .*||" | \ - xargs -r dpkg --compare-versions 1.17.0 lt \ - && echo xz || echo gzip) -ifeq ($(deb_default_compress),gzip) -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) -endif - - # - # Run dh_shlibdeps with the correct options - # -DEB_SHLIBDEPS_INCLUDE_kvirc-trinity := debian/kvirc-trinity$(DEB_CONFIGURE_PREFIX)/lib -DEB_SHLIBDEPS_LIBRARY_kvirc-trinity := kvirc-trinity - - # - # Documentation to include for each package - # -DEB_INSTALL_DOCS_kvirc-trinity := FAQ README TODO -DEB_INSTALL_DOCS_ALL := -XCVS -X.cvsignore - -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 - - ./autogen.sh - touch debian/stamp-bootstrap - -binary-install/kvirc-data-trinity:: - mkdir -p debian/$(cdbs_curpkg)/opt/trinity/share/apps/kvirc/services - mv debian/tmp/opt/trinity/share/services/* debian/$(cdbs_curpkg)/opt/trinity/share/apps/kvirc/services/ +-include /usr/share/cdbs/1/class/tde.mk + +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" -- cgit v1.2.3