wv2: update to use latest tde.mk file

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

3 files changed, 94 insertions, 24 deletions

diff --git a/debian/wv2/wv2-0.4.2.dfsg.2/debian/cdbs/debian-tde.mk b/debian/wv2/wv2-0.4.2.dfsg.2/debian/cdbs/tde.mk
index f36e3527..fa1a6676 100644
--- a/debian/wv2/wv2-0.4.2.dfsg.2/debian/cdbs/debian-tde.mk
+++ b/debian/wv2/wv2-0.4.2.dfsg.2/debian/cdbs/tde.mk
@@ -1,6 +1,6 @@
 # -*- mode: makefile; coding: utf-8 -*-
 # Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
+# 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
@@ -24,8 +24,15 @@ _cdbs_rules_path ?= /usr/share/cdbs/1/rules
 _cdbs_class_path ?= /usr/share/cdbs/1/class
 endif
 
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
+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)
@@ -33,7 +40,7 @@ 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:
-ifndef _cdbs_class_cmake
+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
@@ -41,6 +48,12 @@ 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
@@ -53,17 +66,46 @@ else
 DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
 endif
 
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-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
+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
@@ -82,7 +124,9 @@ 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 = .dcl .docbook -license .tag .sty .el
+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 | \
@@ -94,6 +138,7 @@ 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)))
@@ -114,20 +159,19 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_debug = --enable-debug=full
 endif
 
-DEB_BUILD_PARALLEL ?= true
-
 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
-ifndef _cdbs_class_cmake
+ifdef _tde_build_automake
 	$(MAKE) -f admin/Makefile.common dist
 endif
 	debian/rules clean
@@ -140,6 +184,20 @@ endif
 
 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
@@ -153,18 +211,20 @@ debian/stamp-man-pages:
 	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 debian/cdbs/versions.pl >$$tmpf; \
+	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 debian/cdbs/versions.pl >$$tmpf; \
+	perl /usr/lib/cdbs/tde-versions.pl >$$tmpf; \
 	for p in $(DEB_ARCH_PACKAGES); do \
 	    cat $$tmpf >>debian/$$p.substvars; \
 	done; \
@@ -202,6 +262,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 		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; \
@@ -229,7 +294,7 @@ cleanbuilddir::
 	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
 
 clean::
-ifndef _cdbs_class_cmake
+ifdef _tde_build_automake
 	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
 		cd $(DEB_SRCDIR); \
 		find . -name Makefile.in -print | \
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 2b46d891..760bdac8 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+5~a) forky; urgency=low
+
+  * Use latest tde.mk file
+
+ -- Michele Calgaro <michele.calgaro@yahoo.it>  Wed, 23 Sep 2025 21:09:00 +0900
+
 wv2 (0.4.2.dfsg.2-2debian11.0.0+4~a) bullseye; urgency=low
 
   * Dropped python support
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 1dbd5e3b..d3028214 100755
--- a/debian/wv2/wv2-0.4.2.dfsg.2/debian/rules
+++ b/debian/wv2/wv2-0.4.2.dfsg.2/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+include debian/cdbs/tde.mk
 
 # Upstream build system seems to just ignore these, and as a result, libgsf
 # fails to find libxml headers (see #707417).