diff options
Diffstat (limited to 'debian/patches')
-rw-r--r-- | debian/patches/gui-c++20.patch | 14 | ||||
-rw-r--r-- | debian/patches/non-static-open-axiom-binary.patch | 21 | ||||
-rw-r--r-- | debian/patches/series | 1 |
3 files changed, 30 insertions, 6 deletions
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 |