From 7485a4e54aacbb1372c463a905916b3efbe54c65 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Tue, 5 Mar 2024 20:57:45 +0900 Subject: DEB gwenview: switch to cmake build system Signed-off-by: Michele Calgaro (cherry picked from commit 3b76f2c9d03cbd588a50855b59e35a400b722a2c) --- .../applications/graphics/gwenview/debian/control | 4 +- .../gwenview/debian/gwenview-trinity.doc-base | 9 ---- .../graphics/gwenview/debian/gwenview.lintian | 3 -- .../applications/graphics/gwenview/debian/rules | 54 ++++++---------------- .../applications/graphics/gwenview/debian/control | 4 +- .../gwenview/debian/gwenview-trinity.doc-base | 9 ---- .../graphics/gwenview/debian/gwenview.lintian | 3 -- .../applications/graphics/gwenview/debian/rules | 54 ++++++---------------- 8 files changed, 34 insertions(+), 106 deletions(-) delete mode 100644 debian/_base/applications/graphics/gwenview/debian/gwenview-trinity.doc-base delete mode 100644 debian/_base/applications/graphics/gwenview/debian/gwenview.lintian delete mode 100644 ubuntu/_base/applications/graphics/gwenview/debian/gwenview-trinity.doc-base delete mode 100644 ubuntu/_base/applications/graphics/gwenview/debian/gwenview.lintian diff --git a/debian/_base/applications/graphics/gwenview/debian/control b/debian/_base/applications/graphics/gwenview/debian/control index ee49128d7..4454c3137 100644 --- a/debian/_base/applications/graphics/gwenview/debian/control +++ b/debian/_base/applications/graphics/gwenview/debian/control @@ -2,9 +2,9 @@ Source: gwenview-trinity Section: tde Priority: optional Maintainer: TDE Debian Team -Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 10~), quilt, tdelibs14-trinity-dev (>= 4:3.4.3), libkipi0-trinity-dev (>= 0.1.2-2), libexiv2-dev, libmng-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, + libkipi0-trinity-dev, libexiv2-dev, libmng-dev, libxcursor-dev Standards-Version: 3.8.4 -Homepage: http://gwenview.sourceforge.net Package: gwenview-trinity Architecture: any diff --git a/debian/_base/applications/graphics/gwenview/debian/gwenview-trinity.doc-base b/debian/_base/applications/graphics/gwenview/debian/gwenview-trinity.doc-base deleted file mode 100644 index 931c8d219..000000000 --- a/debian/_base/applications/graphics/gwenview/debian/gwenview-trinity.doc-base +++ /dev/null @@ -1,9 +0,0 @@ -Document: gwenview-trinity -Title: Gwenview Handbook -Author: Aurélien Gâteau, Christopher Martin, The TDE Team -Abstract: Gwenview is an image viewer for TDE. -Section: Viewers - -Format: HTML -Index: /opt/trinity/share/doc/tde/HTML/en/gwenview/index.html -Files: /opt/trinity/share/doc/tde/HTML/en/gwenview/*.html diff --git a/debian/_base/applications/graphics/gwenview/debian/gwenview.lintian b/debian/_base/applications/graphics/gwenview/debian/gwenview.lintian deleted file mode 100644 index 0e247a6ab..000000000 --- a/debian/_base/applications/graphics/gwenview/debian/gwenview.lintian +++ /dev/null @@ -1,3 +0,0 @@ -gwenview-trinity binary: non-dev-pkg-with-shlib-symlink opt/trinity/lib/libgwenviewcore.so.1.0.0 opt/trinity/lib/libgwenviewcore.so -gwenview-trinity binary: shlib-missing-in-control-file libtdeinit_gwenview.so for opt/trinity/lib/libtdeinit_gwenview.so -gwenview-trinity binary: package-name-doesnt-match-sonames libgwenviewcore1 libtdeinit-gwenview diff --git a/debian/_base/applications/graphics/gwenview/debian/rules b/debian/_base/applications/graphics/gwenview/debian/rules index 54625998a..f8596e545 100755 --- a/debian/_base/applications/graphics/gwenview/debian/rules +++ b/debian/_base/applications/graphics/gwenview/debian/rules @@ -1,43 +1,19 @@ -#! /usr/bin/make -f - -DEB_PATCHDIRS := debian/patches/common debian/patches +#!/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 := --enable-kipi --enable-final --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib -DEB_INSTALL_DOCS_ALL := -DEB_INSTALL_CHANGELOGS_ALL := NEWS - -DEB_DH_MAKESHLIBS_ARGS_ALL := -V -DEB_SHLIBDEPS_INCLUDE = debian/gwenview-trinity/opt/trinity/lib - -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 - -install/gwenview-trinity:: - install -p -D -m644 debian/gwenview.lintian debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg) - - cd $(CURDIR)/debian/$(cdbs_curpkg)/opt/trinity/share/doc/tde/HTML/en/gwenview; \ - /opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/gwenview/index.docbook +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" + +DEB_MAKE_CHECK_TARGET = check diff --git a/ubuntu/_base/applications/graphics/gwenview/debian/control b/ubuntu/_base/applications/graphics/gwenview/debian/control index c4338c694..632b8aa24 100644 --- a/ubuntu/_base/applications/graphics/gwenview/debian/control +++ b/ubuntu/_base/applications/graphics/gwenview/debian/control @@ -2,9 +2,9 @@ Source: gwenview-trinity Section: tde Priority: optional Maintainer: TDE Debian Team -Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 10~), quilt, tdelibs14-trinity-dev (>= 4:3.4.3), libkipi0-trinity-dev (>= 0.1.2-2), libexiv2-dev, libmng-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, + libkipi0-trinity-dev, libexiv2-dev, libmng-dev, libxcursor-dev Standards-Version: 3.8.4 -Homepage: http://gwenview.sourceforge.net Package: gwenview-trinity Architecture: any diff --git a/ubuntu/_base/applications/graphics/gwenview/debian/gwenview-trinity.doc-base b/ubuntu/_base/applications/graphics/gwenview/debian/gwenview-trinity.doc-base deleted file mode 100644 index 931c8d219..000000000 --- a/ubuntu/_base/applications/graphics/gwenview/debian/gwenview-trinity.doc-base +++ /dev/null @@ -1,9 +0,0 @@ -Document: gwenview-trinity -Title: Gwenview Handbook -Author: Aurélien Gâteau, Christopher Martin, The TDE Team -Abstract: Gwenview is an image viewer for TDE. -Section: Viewers - -Format: HTML -Index: /opt/trinity/share/doc/tde/HTML/en/gwenview/index.html -Files: /opt/trinity/share/doc/tde/HTML/en/gwenview/*.html diff --git a/ubuntu/_base/applications/graphics/gwenview/debian/gwenview.lintian b/ubuntu/_base/applications/graphics/gwenview/debian/gwenview.lintian deleted file mode 100644 index 0e247a6ab..000000000 --- a/ubuntu/_base/applications/graphics/gwenview/debian/gwenview.lintian +++ /dev/null @@ -1,3 +0,0 @@ -gwenview-trinity binary: non-dev-pkg-with-shlib-symlink opt/trinity/lib/libgwenviewcore.so.1.0.0 opt/trinity/lib/libgwenviewcore.so -gwenview-trinity binary: shlib-missing-in-control-file libtdeinit_gwenview.so for opt/trinity/lib/libtdeinit_gwenview.so -gwenview-trinity binary: package-name-doesnt-match-sonames libgwenviewcore1 libtdeinit-gwenview diff --git a/ubuntu/_base/applications/graphics/gwenview/debian/rules b/ubuntu/_base/applications/graphics/gwenview/debian/rules index 54625998a..f8596e545 100755 --- a/ubuntu/_base/applications/graphics/gwenview/debian/rules +++ b/ubuntu/_base/applications/graphics/gwenview/debian/rules @@ -1,43 +1,19 @@ -#! /usr/bin/make -f - -DEB_PATCHDIRS := debian/patches/common debian/patches +#!/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 := --enable-kipi --enable-final --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib -DEB_INSTALL_DOCS_ALL := -DEB_INSTALL_CHANGELOGS_ALL := NEWS - -DEB_DH_MAKESHLIBS_ARGS_ALL := -V -DEB_SHLIBDEPS_INCLUDE = debian/gwenview-trinity/opt/trinity/lib - -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 - -install/gwenview-trinity:: - install -p -D -m644 debian/gwenview.lintian debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg) - - cd $(CURDIR)/debian/$(cdbs_curpkg)/opt/trinity/share/doc/tde/HTML/en/gwenview; \ - /opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/gwenview/index.docbook +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" + +DEB_MAKE_CHECK_TARGET = check -- cgit v1.2.1