Control: tags +patch +pending thanks Dear maintainer,
I've prepared an NMU for passwordsafe (versioned as 1.21.0+dfsg-1.1) and uploaded it to DELAYED/3. Please feel free to tell me if I should cancel it. Regards, -Steve
diffstat for passwordsafe-1.21.0+dfsg passwordsafe-1.21.0+dfsg changelog | 8 + patches/0004-Build-using-C-17-googletest-no-longer-supports-lower.patch | 61 ++++++++++ patches/series | 1 3 files changed, 70 insertions(+) diff -Nru passwordsafe-1.21.0+dfsg/debian/changelog passwordsafe-1.21.0+dfsg/debian/changelog --- passwordsafe-1.21.0+dfsg/debian/changelog 2025-04-04 17:20:30.000000000 -0500 +++ passwordsafe-1.21.0+dfsg/debian/changelog 2025-08-23 20:18:54.000000000 -0500 @@ -1,3 +1,11 @@ +passwordsafe (1.21.0+dfsg-1.1) unstable; urgency=medium + + [ Steve Robbins ] + * Non-maintainer upload. + * [af3942a] Build using C++17, since googletest dropped support for older C++. + + -- Steve M. Robbins <[email protected]> Sat, 23 Aug 2025 20:18:54 -0500 + passwordsafe (1.21.0+dfsg-1) unstable; urgency=medium * Update watch file to ignore tags for flatpak updates diff -Nru passwordsafe-1.21.0+dfsg/debian/patches/0004-Build-using-C-17-googletest-no-longer-supports-lower.patch passwordsafe-1.21.0+dfsg/debian/patches/0004-Build-using-C-17-googletest-no-longer-supports-lower.patch --- passwordsafe-1.21.0+dfsg/debian/patches/0004-Build-using-C-17-googletest-no-longer-supports-lower.patch 1969-12-31 18:00:00.000000000 -0600 +++ passwordsafe-1.21.0+dfsg/debian/patches/0004-Build-using-C-17-googletest-no-longer-supports-lower.patch 2025-08-23 20:18:54.000000000 -0500 @@ -0,0 +1,61 @@ +From: Steve Robbins <[email protected]> +Date: Sun, 17 Aug 2025 20:41:54 -0500 +Subject: Build using C++-17; googletest no longer supports lower standards. + +--- + CMakeLists.txt | 2 +- + Makefile.linux | 1 - + src/test/Makefile | 2 +- + src/ui/cli/Makefile | 1 - + 4 files changed, 2 insertions(+), 4 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3776a9b..65fd662 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -8,7 +8,7 @@ set(CMAKE_CXX_EXTENSIONS OFF) + # 3.0.5 is fine, though... + # Need to revisit this and remove when no longer an issue + if (NOT WIN32 OR WX_WINDOWS) +- set(CMAKE_CXX_STANDARD 14) ++ set(CMAKE_CXX_STANDARD 17) + else (NOT WIN32 OR WX_WINDOWS) + set(CMAKE_CXX_STANDARD 17) + endif (NOT WIN32 OR WX_WINDOWS) +diff --git a/Makefile.linux b/Makefile.linux +index 616919e..97fabeb 100644 +--- a/Makefile.linux ++++ b/Makefile.linux +@@ -43,7 +43,6 @@ SF_UPLOAD_CMD := /usr/bin/rsync -avP -e ssh + SF_UPLOAD_DST := $(SF_UPLOAD_ROOT)/Linux-BETA/$(RELEASENUM) + RELTAG = wx$(subst .,_,$(RELEASENAME)) + +-export CPPFLAGS += -std=c++11 + + all: + @echo "Toplevel make is no longer supported for building Linux versions of PasswordSafe. Please use cmake as described in README.LINUX.DEVELOPERS.md" +diff --git a/src/test/Makefile b/src/test/Makefile +index df5c73c..0fefb17 100644 +--- a/src/test/Makefile ++++ b/src/test/Makefile +@@ -39,7 +39,7 @@ TESTOBJ = $(addprefix $(OBJPATH)/,$(subst .cpp,.o,$(TESTSRC))) + TEST = $(BINPATH)/coretest + OBJS = $(TESTOBJ) $(GTEST_OBJ) + +-CXXFLAGS += -DUNICODE -Wall -I$(INCPATH) -I$(INCPATH)/core -std=c++11 ++CXXFLAGS += -DUNICODE -Wall -I$(INCPATH) -I$(INCPATH)/core + LDFLAGS += -L$(LIBPATH) -lcore -los -luuid -lxerces-c -pthread -lX11 -lXtst -lmagic + + ifeq ($(CONFIG),debug) +diff --git a/src/ui/cli/Makefile b/src/ui/cli/Makefile +index 29990a4..8e6bd6d 100644 +--- a/src/ui/cli/Makefile ++++ b/src/ui/cli/Makefile +@@ -25,7 +25,6 @@ LIBCORE = $(LIBPATH)/libcore.a + LIBOS = $(LIBPATH)/libos.a + LIBS = $(LIBCORE) $(LIBOS) + +-export CPPFLAGS += -std=c++11 + ifeq ($(findstring Darwin, $(shell uname -s)), Darwin) + XERCESCPPFLAGS= + PLATFORM=mac diff -Nru passwordsafe-1.21.0+dfsg/debian/patches/series passwordsafe-1.21.0+dfsg/debian/patches/series --- passwordsafe-1.21.0+dfsg/debian/patches/series 2025-04-04 17:20:30.000000000 -0500 +++ passwordsafe-1.21.0+dfsg/debian/patches/series 2025-08-23 20:18:54.000000000 -0500 @@ -1,3 +1,4 @@ perl_shebangs disable_version_checks cmake_build_changes +0004-Build-using-C-17-googletest-no-longer-supports-lower.patch
signature.asc
Description: This is a digitally signed message part.
