From 0e154d21c2179c0f4cad51fa61bbab20f494dbc2 Mon Sep 17 00:00:00 2001 From: Geoff Lankow Date: Tue, 26 Oct 2021 11:43:08 +1300 Subject: [PATCH] Backed out changeset dfd512c51382 (bug 1730711) for breaking the macOS build. --- mail/app/macbuild/Contents/MacOS-files.in | 2 - mail/installer/package-manifest.in | 2 - third_party/niwcompat/extra_include.h | 1 - third_party/rnp/moz.build | 2 - third_party/rnp/src/rnp/moz.build | 63 ----------------------- third_party/rnp/src/rnpkeys/moz.build | 63 ----------------------- third_party/rnpdefs.mozbuild | 1 - 7 files changed, 134 deletions(-) delete mode 100644 third_party/niwcompat/extra_include.h delete mode 100644 third_party/rnp/src/rnp/moz.build delete mode 100644 third_party/rnp/src/rnpkeys/moz.build diff --git a/mail/app/macbuild/Contents/MacOS-files.in b/mail/app/macbuild/Contents/MacOS-files.in index 73aa38ec68..d819b1bff5 100644 --- a/mail/app/macbuild/Contents/MacOS-files.in +++ b/mail/app/macbuild/Contents/MacOS-files.in @@ -11,8 +11,6 @@ #endif /pingsender /pk12util -/rnp -/rnpkeys /ssltunnel /xpcshell /XUL diff --git a/mail/installer/package-manifest.in b/mail/installer/package-manifest.in index f6cb95f961..4dd5a188fb 100644 --- a/mail/installer/package-manifest.in +++ b/mail/installer/package-manifest.in @@ -246,8 +246,6 @@ ; OpenPGP (librnp) #ifdef MOZ_OPENPGP @BINPATH@/@DLL_PREFIX@rnp@DLL_SUFFIX@ -@BINPATH@/rnp@BIN_SUFFIX@ -@BINPATH@/rnpkeys@BIN_SUFFIX@ #endif ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/third_party/niwcompat/extra_include.h b/third_party/niwcompat/extra_include.h deleted file mode 100644 index 34ed66bdfa..0000000000 --- a/third_party/niwcompat/extra_include.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/third_party/rnp/moz.build b/third_party/rnp/moz.build index 7ace5daa3a..8fdfd11936 100644 --- a/third_party/rnp/moz.build +++ b/third_party/rnp/moz.build @@ -138,5 +138,3 @@ SOURCES += [ "src/librepgp/stream-sig.cpp", "src/librepgp/stream-write.cpp", ] - -DIRS += ["src/rnp", "src/rnpkeys"] diff --git a/third_party/rnp/src/rnp/moz.build b/third_party/rnp/src/rnp/moz.build deleted file mode 100644 index 1f7e8768b8..0000000000 --- a/third_party/rnp/src/rnp/moz.build +++ /dev/null @@ -1,63 +0,0 @@ -# vim: set filetype=python: -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -Program("rnp") - -include("../../../rnpdefs.mozbuild") - -USE_LIBS += ["rnp"] - -LOCAL_INCLUDES = [ - "!../lib", - "..", - "../../include", - "../common", - "../lib", -] - -if CONFIG["MZLA_SYSTEM_JSONC"]: - CXXFLAGS += CONFIG["MZLA_JSONC_CFLAGS"] - LDFLAGS += CONFIG["MZLA_JSONC_LIBS"] + ["-Wl,-rpath=$ORIGIN"] - -else: - USE_LIBS += ["json-c"] - LOCAL_INCLUDES += ["!/comm/third_party/json-c", "/comm/third_party/json-c"] - LDFLAGS += ["-Wl,-rpath=$ORIGIN"] - -SOURCES += [ - "../common/file-utils.cpp", - "../common/list.cpp", - "../common/str-utils.cpp", - "../common/time-utils.cpp", - "../lib/logging.cpp", - "../rnpkeys/tui.cpp", - "fficli.cpp", - "rnp.cpp", - "rnpcfg.cpp", -] - -if CONFIG["CC_TYPE"] == "clang-cl": - CXXFLAGS += [ - "/EHs", - "-Wno-deprecated-declarations", - ] - LOCAL_INCLUDES += [ - "/comm/third_party/niwcompat", - ] - - OS_LIBS += [ - "shell32", - "-LIBPATH:{}".format(CONFIG["COMPILER_RT_BUILTIN_PATH"]), - CONFIG["COMPILER_RT_BUILTIN_LIB"], - ] - SOURCES += [ - "/comm/third_party/niwcompat/getopt.c", - ] - SOURCES["rnpcfg.cpp"].flags += [ - "-FI", - "%s/comm/third_party/niwcompat/extra_include.h" % TOPSRCDIR, - ] - DEFINES["MOZILLA_CONFIG_H"] = True - DEFINES["_CRT_SECURE_NO_WARNINGS"] = True diff --git a/third_party/rnp/src/rnpkeys/moz.build b/third_party/rnp/src/rnpkeys/moz.build deleted file mode 100644 index 7910607655..0000000000 --- a/third_party/rnp/src/rnpkeys/moz.build +++ /dev/null @@ -1,63 +0,0 @@ -# vim: set filetype=python: -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -Program("rnpkeys") - -include("../../../rnpdefs.mozbuild") - -USE_LIBS += ["rnp"] - -LOCAL_INCLUDES = [ - "!../lib", - "..", - "../../include", - "../common", - "../lib", -] - -if CONFIG["MZLA_SYSTEM_JSONC"]: - CXXFLAGS += CONFIG["MZLA_JSONC_CFLAGS"] - LDFLAGS += CONFIG["MZLA_JSONC_LIBS"] + ["-Wl,-rpath=$ORIGIN"] -else: - USE_LIBS += ["json-c"] - LOCAL_INCLUDES += ["!/comm/third_party/json-c", "/comm/third_party/json-c"] - LDFLAGS += ["-Wl,-rpath=$ORIGIN"] - -SOURCES += [ - "../common/file-utils.cpp", - "../common/list.cpp", - "../common/str-utils.cpp", - "../common/time-utils.cpp", - "../lib/logging.cpp", - "../rnp/fficli.cpp", - "../rnp/rnpcfg.cpp", - "main.cpp", - "rnpkeys.cpp", - "tui.cpp", -] - -if CONFIG["CC_TYPE"] == "clang-cl": - CXXFLAGS += [ - "/EHs", - "-Wno-deprecated-declarations", - ] - LOCAL_INCLUDES += [ - "/comm/third_party/niwcompat", - ] - - OS_LIBS += [ - "shell32", - "-LIBPATH:{}".format(CONFIG["COMPILER_RT_BUILTIN_PATH"]), - CONFIG["COMPILER_RT_BUILTIN_LIB"], - ] - SOURCES += [ - "/comm/third_party/niwcompat/getopt.c", - ] - SOURCES["../rnp/rnpcfg.cpp"].flags += [ - "-FI", - "%s/comm/third_party/niwcompat/extra_include.h" % TOPSRCDIR, - ] - DEFINES["MOZILLA_CONFIG_H"] = True - DEFINES["_CRT_SECURE_NO_WARNINGS"] = True diff --git a/third_party/rnpdefs.mozbuild b/third_party/rnpdefs.mozbuild index 1358f95f18..47ec01822c 100644 --- a/third_party/rnpdefs.mozbuild +++ b/third_party/rnpdefs.mozbuild @@ -27,7 +27,6 @@ if CONFIG["CC_TYPE"] == "clang-cl": "-Wno-macro-redefined", # 'WIN32_LEAN_AND_MEAN' macro redefined ] USE_STATIC_LIBS = True - DEFINES["RNP_USE_STD_REGEX"] = True if CONFIG["MOZ_STDCXX_COMPAT"]: # Use pre-GCC-5 strings abi