From eaeef2ae9544f7bfb6aaa94511d5761cca6dd871 Mon Sep 17 00:00:00 2001
From: Chang Yang <yangchang@deepin.org>
Date: Thu, 26 Dec 2024 10:11:32 +0800
Subject: [PATCH] feat: fix gcc version detection, remove t64

---
 debian/changelog | 7 +++++++
 debian/control   | 7 ++-----
 debian/rules     | 5 ++---
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4b3dc330..94172d35 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+boost1.83 (1.83.0-4deepin1) unstable; urgency=medium
+
+  * fix gcc version detection
+  * remove t64
+
+ -- Chang Yang <yangchang@deepin.org>  Thu, 26 Dec 2024 10:11:17 +0800
+
 boost1.83 (1.83.0-4) unstable; urgency=medium
 
   [ Samuel Thibault ]
diff --git a/debian/control b/debian/control
index 8642e4f0..fc2719f9 100644
--- a/debian/control
+++ b/debian/control
@@ -219,10 +219,7 @@ Description: atomic data types, operations, and memory ordering constraints
  locking.
 Conflicts: libboost-atomic1.53-dev, libboost-atomic1.54-dev, libboost-atomic1.55-dev, libboost-atomic1.57-dev, libboost-atomic1.58-dev, libboost-atomic1.60-dev, libboost-atomic1.61-dev, libboost-atomic1.62-dev, libboost-atomic1.63-dev, libboost-atomic1.65-dev, libboost-atomic1.67-dev, libboost-atomic1.70-dev, libboost-atomic1.71-dev, libboost-atomic1.74-dev, libboost-atomic1.80-dev, libboost-atomic1.81-dev
 
-Package: libboost-chrono1.83.0t64
-Provides: ${t64:Provides}
-Replaces: libboost-chrono1.83.0
-Breaks: libboost-chrono1.83.0 (<< ${source:Version})
+Package: libboost-chrono1.83.0
 Homepage: http://www.boost.org/libs/chrono/
 Architecture: any
 Multi-Arch: same
@@ -272,7 +269,7 @@ Multi-Arch: same
 Section: libdevel
 Depends: ${misc:Depends},
  libboost1.83-dev (= ${binary:Version}),
- libboost-chrono1.83.0t64 (= ${binary:Version})
+ libboost-chrono1.83.0 (= ${binary:Version})
 Conflicts: libboost-chrono1.48-dev, libboost-chrono1.49-dev, libboost-chrono1.50-dev, libboost-chrono1.52-dev, libboost-chrono1.53-dev, libboost-chrono1.54-dev, libboost-chrono1.55-dev, libboost-chrono1.57-dev, libboost-chrono1.58-dev, libboost-chrono1.60-dev, libboost-chrono1.61-dev, libboost-chrono1.62-dev, libboost-chrono1.63-dev, libboost-chrono1.65-dev, libboost-chrono1.67-dev, libboost-chrono1.70-dev, libboost-chrono1.71-dev, libboost-chrono1.74-dev, libboost-chrono1.80-dev, libboost-chrono1.81-dev
 Description: C++ representation of time duration, time point, and clocks
  This package forms part of the Boost C++ Libraries collection.
diff --git a/debian/rules b/debian/rules
index 871942ea..edcefa99 100755
--- a/debian/rules
+++ b/debian/rules
@@ -69,10 +69,9 @@ boost_suffixes = $(if $(boost_suffixes_$(1)), $(boost_suffixes_$(1)),"")
 mk_base_name = usr/lib/$(DEB_HOST_MULTIARCH)/libboost_$(subst -,_,$(1))$(2)
 mk_cmake_name = usr/lib/$(DEB_HOST_MULTIARCH)/cmake/boost_$(subst -,_,$(1))-$(SOVERSION)/
 
-t64_suffix_chrono = t64
 # Input: component
 # Return: package name for shared library or development
-mk_pkg_lib = libboost-$(1)$(SOVERSION)$(t64_suffix_$(1))
+mk_pkg_lib = libboost-$(1)$(SOVERSION)
 mk_pkg_dev = libboost-$(1)$(PKGVERSION)-dev
 # Helpers to generate debhelper input filenames.
 # Input: component
@@ -320,7 +319,7 @@ ifeq ($(BUILD_NUMPY), yes)
 endif
 
 override_dh_gencontrol:
-	dh_gencontrol -- -V'gxx:major=$(shell dpkg-query -f '$${version}' -W g++ | sed 's/.*://;s/\..*//')'
+	dh_gencontrol -- -V'gxx:major=$(shell g++ -dumpversion)'
 
 $(b2):
 	cd tools/build && bison -y -d -o src/engine/jamgram.cpp src/engine/jamgram.y