From dab61987cbd2251a209d9ef6e6a23ca4efd25603 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Wed, 24 Sep 2025 13:36:22 +0900 Subject: wv2: use tde-cdbs and tde-cmake for building Signed-off-by: Michele Calgaro --- debian/wv2/wv2-0.4.2.dfsg.2/debian/cdbs/tde.mk | 311 --------------------- .../wv2/wv2-0.4.2.dfsg.2/debian/cdbs/versions.pl | 19 -- debian/wv2/wv2-0.4.2.dfsg.2/debian/changelog | 6 + debian/wv2/wv2-0.4.2.dfsg.2/debian/compat | 2 +- debian/wv2/wv2-0.4.2.dfsg.2/debian/control | 2 +- debian/wv2/wv2-0.4.2.dfsg.2/debian/rules | 2 +- 6 files changed, 9 insertions(+), 333 deletions(-) delete mode 100644 debian/wv2/wv2-0.4.2.dfsg.2/debian/cdbs/tde.mk delete mode 100644 debian/wv2/wv2-0.4.2.dfsg.2/debian/cdbs/versions.pl diff --git a/debian/wv2/wv2-0.4.2.dfsg.2/debian/cdbs/tde.mk b/debian/wv2/wv2-0.4.2.dfsg.2/debian/cdbs/tde.mk deleted file mode 100644 index fa1a6676..00000000 --- a/debian/wv2/wv2-0.4.2.dfsg.2/debian/cdbs/tde.mk +++ /dev/null @@ -1,311 +0,0 @@ -# -*- mode: makefile; coding: utf-8 -*- -# Copyright © 2003 Christopher L Cheney -# Copyright © 2019-2025 TDE Team -# Description: A class for TDE packages; sets TDE environment variables, etc -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2, or (at -# your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -# 02111-1307 USA. - -ifndef _cdbs_bootstrap -_cdbs_scripts_path ?= /usr/lib/cdbs -_cdbs_rules_path ?= /usr/share/cdbs/1/rules -_cdbs_class_path ?= /usr/share/cdbs/1/class -endif - -ifndef _cdbs_class_tde -_cdbs_class_tde := 1 - -# automatically select build system -ifneq "$(wildcard CMakeLists.txt)" "" - _tde_build_cmake := 1 -else ifneq "$(wildcard Makefile.am)" "" - _tde_build_automake := 1 -endif - -# for dh_icons -CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4) - -# Note: This _must_ be included before autotools.mk, or it won't work. -common-configure-arch common-configure-indep:: debian/stamp-cvs-make -debian/stamp-cvs-make: -ifdef _tde_build_automake - cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in -ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" - cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh -endif -ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" - cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh -endif -ifneq "$(wildcard /usr/share/libtool/build-aux/config.guess)" "" - cp -Rp /usr/share/libtool/build-aux/config.guess admin/config.guess -endif -ifneq "$(wildcard /usr/share/libtool/build-aux/config.sub)" "" - cp -Rp /usr/share/libtool/build-aux/config.sub admin/config.sub -endif - $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; -endif - touch debian/stamp-cvs-make - -include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix) - -ifdef _cdbs_tarball_dir -DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE) -else -DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) -endif - -ifdef _tde_build_cmake - -include $(_cdbs_class_path)/cmake.mk$(_cdbs_makefile_suffix) - ifndef _cdbs_class_cmake - include $(_cdbs_class_path)/makefile.mk$(_cdbs_makefile_suffix) - DEB_MAKE_EXTRA_ARGS = $(DEB_MAKE_PARALLEL) - DEB_MAKE_INSTALL_TARGET ?= install DESTDIR=$(DEB_DESTDIR) - CMAKE ?= cmake - DEB_CMAKE_INSTALL_PREFIX ?= /usr - DEB_CMAKE_CFLAGS ?= $(CFLAGS) $(CPPFLAGS) - DEB_CMAKE_CXXFLAGS ?= $(CXXFLAGS) $(CPPFLAGS) - DEB_CMAKE_LDFLAGS ?= $(LDFLAGS) - DEB_CMAKE_NORMAL_ARGS ?= \ - -DCMAKE_INSTALL_PREFIX="$(DEB_CMAKE_INSTALL_PREFIX)" \ - -DCMAKE_C_COMPILER:FILEPATH="$(CC)" \ - -DCMAKE_CXX_COMPILER:FILEPATH="$(CXX)" \ - -DCMAKE_C_FLAGS="$(DEB_CMAKE_CFLAGS)" \ - -DCMAKE_CXX_FLAGS="$(DEB_CMAKE_CXXFLAGS)" \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_VERBOSE_MAKEFILE=ON \ - -DCMAKE_EXE_LINKER_FLAGS="$(DEB_CMAKE_LDFLAGS)" \ - -DCMAKE_MODULE_LINKER_FLAGS="$(DEB_CMAKE_LDFLAGS)" \ - -DCMAKE_SHARED_LINKER_FLAGS="$(DEB_CMAKE_LDFLAGS)" - _cdbs_cmake_system_name_linux = Linux - _cdbs_cmake_system_name_kfreebsd = FreeBSD - _cdbs_cmake_system_name_hurd = GNU - DEB_CMAKE_CROSS_ARGS ?= \ - $(patsubst %,-DCMAKE_SYSTEM_NAME=%,\ - $(_cdbs_cmake_system_name_$(DEB_HOST_ARCH_OS))) \ - -DCMAKE_SYSTEM_PROCESSOR=$(DEB_HOST_GNU_CPU) \ - -DCMAKE_INSTALL_LIBDIR=lib/$(DEB_HOST_MULTIARCH) \ - -DPKG_CONFIG_EXECUTABLE=/usr/bin/$(DEB_HOST_GNU_TYPE)-pkg-config - endif - ifneq "$(wildcard /usr/bin/ninja)" "" - MAKE = ninja -v - DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR) - DEB_MAKE_INSTALL_TARGET = install - DEB_CMAKE_NORMAL_ARGS += -GNinja - endif -else ifdef _tde_build_automake - include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) -endif - -ifndef _cdbs_rules_patchsys_quilt -DEB_PATCHDIRS := debian/patches/common debian/patches -endif - -export kde_cgidir = \$${libdir}/cgi-bin -export kde_confdir = \$${sysconfdir}/trinity -export kde_htmldir = \$${datadir}/doc/tde/HTML - -DEB_KDE_ENABLE_FINAL := yes -DEB_INSTALL_DOCS_ALL := - -DEB_DH_MAKESHLIBS_ARGS_ALL := -V -DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib) - -DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" -DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el - -DEB_BUILD_PARALLEL ?= true - -# 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 - -ifdef _tde_build_automake -ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb - ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) - cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) - else - cdbs_kde_enable_final = - endif -endif - -ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS))) - cdbs_kde_enable_final = - cdbs_kde_enable_debug = --enable-debug=yes -else - cdbs_kde_enable_debug = --disable-debug -endif - -ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) - cdbs_kde_enable_debug = --enable-debug=full -endif - -cdbs_configure_flags += \ - --with-qt-dir=/usr/share/qt3 \ - --disable-rpath \ - --with-xinerama \ - $(cdbs_kde_enable_final) \ - $(cdbs_kde_enable_debug) -endif - - -# This is a convenience target for calling manually. -# It's not part of the build process. -buildprep: clean apply-patches -ifdef _tde_build_automake - $(MAKE) -f admin/Makefile.common dist -endif - debian/rules clean - -.tdepkginfo: - echo "# TDE package information" >.tdepkginfo - dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo - dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo - date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo - -post-patches:: .tdepkginfo - -ifdef _tde_build_cmake -ifndef _cdbs_class_cmake -common-configure-arch common-configure-indep:: common-configure-impl -common-configure-impl:: $(DEB_BUILDDIR)/CMakeCache.txt -$(DEB_BUILDDIR)/CMakeCache.txt: - $(strip cd $(DEB_BUILDDIR) && \ - $(CMAKE) $(CURDIR)/$(DEB_SRCDIR) \ - $(DEB_CMAKE_NORMAL_ARGS) \ - $(if $(cdbs_crossbuild),\ - $(DEB_CMAKE_CROSS_ARGS)) \ - $(DEB_CMAKE_EXTRA_FLAGS)) -endif -endif - -common-build-arch:: debian/stamp-man-pages -debian/stamp-man-pages: - if ! test -d debian/man/out; then mkdir -p debian/man/out; fi - for f in $$(find debian/man -name '*.sgml'); do \ - docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \ - done - for f in $$(find debian/man -name '*.man'); do \ - soelim -I debian/man $$f \ - > debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \ - done - touch debian/stamp-man-pages - -common-binary-indep:: - ! grep -Eq "TDE-Version|TDE-Next-Version" debian/control || \ - ( set -e; \ - tmpf=`mktemp debian/versions.XXXXXX`; \ - perl /usr/lib/cdbs/tde-versions.pl >$$tmpf; \ - for p in $(DEB_INDEP_PACKAGES); do \ - cat $$tmpf >>debian/$$p.substvars; \ - done; \ - rm -f $$tmpf ) - -common-binary-arch:: - ! grep -Eq "TDE-Version|TDE-Next-Version" debian/control || \ - ( set -e; \ - tmpf=`mktemp debian/versions.XXXXXX`; \ - perl /usr/lib/cdbs/tde-versions.pl >$$tmpf; \ - for p in $(DEB_ARCH_PACKAGES); do \ - cat $$tmpf >>debian/$$p.substvars; \ - done; \ - rm -f $$tmpf ) - # update multi-arch path in install files - ls -d debian/* | \ - grep -E "(install|links)$$" | \ - while read a; do \ - [ -d $$a ] || [ -f $$a.arch ] || \ - ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \ - sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \ - done - -clean:: - rm -rf debian/man/out - -rmdir debian/man - rm -f debian/stamp-man-pages - rm -rf debian/shlibs-check - # revert multi-arch path in install files - ls -d debian/* | \ - grep -E "(install|links)$$" | \ - while read a; do \ - [ ! -f $$a.arch ] || \ - mv $$a.arch $$a; \ - done - -$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: - if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi - if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi - if test -e debian/$(cdbs_curpkg).lintian; then \ - install -p -D -m644 debian/$(cdbs_curpkg).lintian \ - debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ - fi - if test -e debian/$(cdbs_curpkg).presubj; then \ - install -p -D -m644 debian/$(cdbs_curpkg).presubj \ - debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ - fi - if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \ - test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \ - echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ - echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ - fi - -binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: - set -e; \ - for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \ - pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \ - echo Building $$pkg HTML docs...; \ - mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ - cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ - /opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \ - done - for pkg in $(DOC_HTML_PRUNE) ; do \ - rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ - done - -common-build-indep:: debian/stamp-kde-apidox -debian/stamp-kde-apidox: - $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) - touch $@ - -common-install-indep:: common-install-kde-apidox -common-install-kde-apidox:: - $(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox) - -cleanbuilddir:: - -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR)) - -clean:: -ifdef _tde_build_automake - if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ - cd $(DEB_SRCDIR); \ - find . -name Makefile.in -print | \ - xargs --no-run-if-empty rm -f; \ - rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \ - configure configure.files configure.in stamp-h.in \ - subdirs; \ - fi -endif - rm -f .tdepkginfo - rm -f debian/stamp-kde-apidox - rm -f debian/stamp-cvs-make - -endif diff --git a/debian/wv2/wv2-0.4.2.dfsg.2/debian/cdbs/versions.pl b/debian/wv2/wv2-0.4.2.dfsg.2/debian/cdbs/versions.pl deleted file mode 100644 index 1b110f7a..00000000 --- a/debian/wv2/wv2-0.4.2.dfsg.2/debian/cdbs/versions.pl +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env perl - -use strict; -use warnings; - -my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`; -my ($version3, $version3_next); -my ($version2, $version2_next); - -($version3 = $version) =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/; -($version2 = $version3) =~ s/\.[^.]+$//; - -($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e; -($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e; - -print "TDE-Version3=$version3\n"; -print "TDE-Version2=$version2\n"; -print "TDE-Next-Version3=$version3_next\n"; -print "TDE-Next-Version2=$version2_next\n"; diff --git a/debian/wv2/wv2-0.4.2.dfsg.2/debian/changelog b/debian/wv2/wv2-0.4.2.dfsg.2/debian/changelog index 760bdac8..64eef111 100644 --- a/debian/wv2/wv2-0.4.2.dfsg.2/debian/changelog +++ b/debian/wv2/wv2-0.4.2.dfsg.2/debian/changelog @@ -1,3 +1,9 @@ +wv2 (0.4.2.dfsg.2-2debian14.0.0+6~a) forky; urgency=low + + * Use tde-cdbs and tde-cmake for building + + -- Michele Calgaro Thu, 24 Sep 2025 13:35:00 +0900 + wv2 (0.4.2.dfsg.2-2debian14.0.0+5~a) forky; urgency=low * Use latest tde.mk file diff --git a/debian/wv2/wv2-0.4.2.dfsg.2/debian/compat b/debian/wv2/wv2-0.4.2.dfsg.2/debian/compat index ec635144..f599e28b 100644 --- a/debian/wv2/wv2-0.4.2.dfsg.2/debian/compat +++ b/debian/wv2/wv2-0.4.2.dfsg.2/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/debian/wv2/wv2-0.4.2.dfsg.2/debian/control b/debian/wv2/wv2-0.4.2.dfsg.2/debian/control index 32c182c3..b5ed3a11 100644 --- a/debian/wv2/wv2-0.4.2.dfsg.2/debian/control +++ b/debian/wv2/wv2-0.4.2.dfsg.2/debian/control @@ -2,7 +2,7 @@ Source: wv2 Section: deps-r14/libs Priority: optional Maintainer: Olly Betts -Build-Depends: cdbs, debhelper (>= 9), quilt, cmake, ninja-build, libglib2.0-dev, libgsf-1-dev (>= 1.14.0), libxml2-dev, zlib1g-dev, pkg-config +Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, libglib2.0-dev, libgsf-1-dev (>= 1.14.0), libxml2-dev, zlib1g-dev, pkg-config Standards-Version: 3.9.4 Homepage: http://wvware.sourceforge.net diff --git a/debian/wv2/wv2-0.4.2.dfsg.2/debian/rules b/debian/wv2/wv2-0.4.2.dfsg.2/debian/rules index d3028214..26b08582 100755 --- a/debian/wv2/wv2-0.4.2.dfsg.2/debian/rules +++ b/debian/wv2/wv2-0.4.2.dfsg.2/debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include debian/cdbs/tde.mk +-include /usr/share/cdbs/1/class/tde.mk # Upstream build system seems to just ignore these, and as a result, libgsf # fails to find libxml headers (see #707417). -- cgit v1.2.3