Merge remote-tracking branch 'foundation/master' into IOSAD-232

Makefile.conf

@@ -339,16 +339,16 @@ endif
 # Otherwise, add them to the CFLAGS/CXXFLAGS/LDFLAGS and library/include variables
 ifeq ($(OPENPGP),SEQUOIA)
 ifeq ($(SEQUOIA_CFLAGS),)
-    SEQUOIA_CFLAGS+=$(shell pkg-config --cflags-only-other sequoia-openpgp) -O2
+    SEQUOIA_CFLAGS+=$(shell pkg-config --cflags-only-other sequoia) -O2
 endif
 ifeq ($(SEQUOIA_LDFLAGS),)
-    SEQUOIA_LDFLAGS+=$(shell pkg-config --libs-only-L sequoia-openpgp)
+    SEQUOIA_LDFLAGS+=$(shell pkg-config --libs-only-L sequoia)
 endif
 ifeq ($(SEQUOIA_LIB),)
-    SEQUOIA_LIB=$(shell pkg-config --libs-only-l --libs-only-other sequoia-openpgp)
+    SEQUOIA_LIB=$(shell pkg-config --libs-only-l --libs-only-other sequoia)
 endif
 ifeq ($(SEQUOIA_INC),)
-    SEQUOIA_INC=$(shell pkg-config --cflags-only-I sequoia-openpgp)
+    SEQUOIA_INC=$(shell pkg-config --cflags-only-I sequoia)
 endif
     CFLAGS+= $(SEQUOIA_CFLAGS)
     CXXFLAGS+= $(SEQUOIA_CFLAGS)

src/Makefile

@@ -37,7 +37,7 @@ ifeq ($(BUILD_ON),OS/390)
     LDLIBS+= -lzz
 else ifeq ($(BUILD_ON),Darwin)
     ifeq ($(BUILD_FOR),Darwin)
-        LDLIBS+= -lz -liconv -mmacosx-version-min=10.10
+        LDLIBS+= -lz -liconv
     else
         $(error I do not know how to make for $(BUILD_FOR) on $(BUILD_ON))
     endif

src/pEpEngine.h

@@ -36,9 +36,10 @@ extern "C" {
 #define PEP_ENGINE_VERSION_PATCH 0   // the last already-released or
                                      // being-released patchlevel,
                                      // which must always be defined
-#define PEP_ENGINE_VERSION_RC    6   // the last already-released RC for this
+#define PEP_ENGINE_VERSION_RC    7   // the last already-released RC for this
                                      // patchlevel, or not defined if not an RC
-#define PEP_ENGINE_VERSION_PLUS  +   // Only defined for tagged versions
+#define PEP_ENGINE_VERSION_PLUS  +   // Only defined when the repo is in a
+                                     // non-released non-RC state.
 
 /* The following macros serve to machine-generate a definition of
    PEP_ENGINE_VERSION, following the correct format as a string, from the