From c5ad9e230e93ada3c5284acdc1db175467a31518 Mon Sep 17 00:00:00 2001 From: Igor Pashev Date: Thu, 27 Oct 2022 09:46:07 +0200 Subject: open-axiom (1.5.0+2022.09.17.git.be9640c+ds-0pin1) --- debian/changelog | 4 ++-- debian/control | 11 +++++------ debian/open-axiom.docs | 2 +- debian/patches/gui-c++20.patch | 14 ++++++++++++++ debian/patches/non-static-open-axiom-binary.patch | 21 +++++++++++++++------ debian/patches/series | 1 + debian/rules | 20 +++++++------------- 7 files changed, 45 insertions(+), 28 deletions(-) create mode 100644 debian/patches/gui-c++20.patch diff --git a/debian/changelog b/debian/changelog index a820832..4604fe8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -open-axiom (1.5.0+2022.09.17.git.be9640c+ds-0pin1) UNRELEASED; urgency=low +open-axiom (1.5.0+2022.09.17.git.be9640c+ds-0pin1) unstable; urgency=low * New upstream version. - -- Igor Pashev Wed, 26 Oct 2022 15:10:58 +0200 + -- Igor Pashev Thu, 27 Oct 2022 11:19:00 +0200 open-axiom (1.5.0~svn3056+ds-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 220e5c3..7fa56f7 100644 --- a/debian/control +++ b/debian/control @@ -3,14 +3,13 @@ Section: math Priority: optional Maintainer: Igor Pashev Build-Depends: - debhelper-compat ( = 13 ), - sbcl ( >= 1:1.0.30 ), + debhelper-compat (= 13), + dh-buildinfo, + g++ (>= 12), + help2man, libxpm-dev, libxt-dev, - g++ (>= 4.7), - help2man, - dh-buildinfo, - autotools-dev, + sbcl (>= 1:1.0.30), Standards-Version: 3.9.4 Vcs-Git: https://git.pashev.ru/debian/open-axiom-debian Vcs-Browser: https://git.pashev.ru/debian/open-axiom-debian diff --git a/debian/open-axiom.docs b/debian/open-axiom.docs index b09761b..cbdcdac 100644 --- a/debian/open-axiom.docs +++ b/debian/open-axiom.docs @@ -1,4 +1,4 @@ -README +README* MAINTAINERS STYLES TODO diff --git a/debian/patches/gui-c++20.patch b/debian/patches/gui-c++20.patch new file mode 100644 index 0000000..397d0e0 --- /dev/null +++ b/debian/patches/gui-c++20.patch @@ -0,0 +1,14 @@ +Description: Use c++20 to build GUI +Fixes "src/include/open-axiom/vm:177:21: error: ‘std::same_as’ has not been declared" + +Index: open-axiom-debian/src/gui/gui.pro.in +=================================================================== +--- open-axiom-debian.orig/src/gui/gui.pro.in ++++ open-axiom-debian/src/gui/gui.pro.in +@@ -60,5 +60,5 @@ LIBS += $$OA_LIB + + ## C++ compiler + QMAKE_CXX = @CXX@ +-QMAKE_CXXFLAGS += -std=c++11 @oa_extra_cxxflags@ ++QMAKE_CXXFLAGS += -std=c++20 @oa_extra_cxxflags@ + QMAKE_LINK = @CXX@ diff --git a/debian/patches/non-static-open-axiom-binary.patch b/debian/patches/non-static-open-axiom-binary.patch index b9ecc7c..8caaae7 100644 --- a/debian/patches/non-static-open-axiom-binary.patch +++ b/debian/patches/non-static-open-axiom-binary.patch @@ -1,16 +1,25 @@ Description: make /usr/bin/open-axiom a dynamically linked executable Origin: vendor Forwarded: no -Index: b/src/driver/Makefile.in +Index: open-axiom-debian/src/driver/Makefile.in =================================================================== ---- a/src/driver/Makefile.in 2013-05-09 20:02:37.000000000 +0400 -+++ b/src/driver/Makefile.in 2013-05-09 20:02:43.000000000 +0400 -@@ -70,7 +70,7 @@ +--- open-axiom-debian.orig/src/driver/Makefile.in ++++ open-axiom-debian/src/driver/Makefile.in +@@ -62,7 +62,7 @@ stamp: $(bin_PROGRAMS) + .SUFFIXES: .cc .h .lo .$(OBJEXT) + .PRECIOUS: %.lo %.obj + +-%.lo: %.cc ++%.lo: %.cc + $(COMPILE) ${CXXFLAGS} -o $@ \ + -DOPENAXIOM_ROOT_DIRECTORY="\"$(open_axiom_installdir)\"" \ + $(oa_includes) $< +@@ -70,7 +70,7 @@ stamp: $(bin_PROGRAMS) main.lo: open-axiom.h open-axiom$(EXEEXT): $(open_axiom_objects) -- $(CXXLINK) -all-static -o $@ $(open_axiom_objects) $(open_axiom_LDADD) -+ $(CXXLINK) -o $@ $(open_axiom_objects) $(open_axiom_LDADD) +- $(LINK) -all-static -o $@ $(open_axiom_objects) $(open_axiom_LDADD) ++ $(LINK) -o $@ $(open_axiom_objects) $(open_axiom_LDADD) mostlyclean-local: @rm -f $(open_axiom_objects) diff --git a/debian/patches/series b/debian/patches/series index 893277e..9f66152 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ no-missing-messages.patch non-static-open-axiom-binary.patch +gui-c++20.patch diff --git a/debian/rules b/debian/rules index e5597c2..59150f4 100755 --- a/debian/rules +++ b/debian/rules @@ -21,12 +21,16 @@ DEBIAN_PATH := $(abspath $(dir $(firstword $(MAKEFILE_LIST)))) SRC_VERSION := $(shell dpkg-parsechangelog -l$(DEBIAN_PATH)/changelog | awk '/^Version:/ {sub(/-[^-]*/, "", $$2); print $$2}') GIT_REVISION := $(shell echo $(SRC_VERSION) | sed -r 's,.+git\.(\w+).*,\1,') TARBALL := $(PACKAGE)_$(SRC_VERSION).orig.tar.xz +DELETE = \ + contrib/windows-installer \ + .PHONY: get-orig-source get-orig-source: rm -rf get-orig-source $(TARBALL) && mkdir get-orig-source git clone $(GIT_REPO) get-orig-source/$(PACKAGE)-$(SRC_VERSION) git -C get-orig-source/$(PACKAGE)-$(SRC_VERSION) checkout $(GIT_REVISION) find get-orig-source/$(PACKAGE)-$(SRC_VERSION) -name '.*' -print0 | xargs -0 --no-run-if-empty rm -rfv + cd get-orig-source/$(PACKAGE)-$(SRC_VERSION) && rm -rfv $(DELETE) tar cJf $(TARBALL) -C get-orig-source $(PACKAGE)-$(SRC_VERSION) rm -rf get-orig-source @echo " "$(TARBALL)" created; move it to the right destination to build the package" @@ -38,17 +42,12 @@ debian/open-axiom.1: build-stamp -n 'open source platform for symbolic, algebraic, and numerical computations' \ $(BUILD)/src/driver/open-axiom > $@ -# --disable-gcl is for included GCL: configure-stamp: dh_testdir - dh_autotools-dev_updateconfig - # aclocal.m4 is older than configure; rebuilding aclocal.m4 requires aclocal-1.13 - touch aclocal.m4 config/*.m4 -r configure.ac $(LISP) --version