README.md

@@ -44,6 +44,11 @@ Now the actual build. We build as an unpriviledged user: `su build; cd /scripts/
 
 Et voila, the binary for release is `${chhroot_dir}/install/bin/pEp-mini-json-adapter`.
 
+User local install build
+------------------------
+
+To build a binary that reads `system.db` from the users home directory, substitute `./pEp-engine.sh` with `./pEp-engine-local.sh` above. For a rebuild, `rm -rf /build/pEpEngine/ /build/libpEpAdapter/ /build/pEpJSONServerAdapter/`, `./pEp-engine-local.sh; ./pEp-adapter.sh; ./pEp-jsonadapter.sh`.
+
 Installer
 ---------
 

pEp-engine-local.sh

+. settings.sh
+
+cd /build/
+git clone https://gitea.pep.foundation/pEp.foundation/pEpEngine.git
+cd pEpEngine
+git checkout $PEPENGINE_VERSION
+patch -p1 < /scripts/patches/pEpEngine-local-per-machine.patch
+cat <<EOF > local.conf
+PER_MACHINE_DIRECTORY=".local/share/pEp"
+PREFIX=/install/
+SQLITE3_FROM_OS=""
+YML2_PATH=/install/yml2
+YML2_PROC=/install/yml2/yml2proc
+ETPAN_LIB=-L/install/lib
+ETPAN_INC=-I/install/include
+ASN1C=/install/asn1c/bin/asn1c
+ASN1C_INC=-I/install/asn1c/share/asn1c
+OPENPGP=SEQUOIA
+SEQUOIA_LIB=-L/install/lib
+SEQUOIA_INC=-I/install/include
+CFLAGS+=-DNDEBUG=1 -Os
+CXXFLAGS+=-DNDEBUG=1 -Os
+LDFLAGS+=-nostartfiles -Os
+EOF
+
+make
+make install
+cp asn.1/*.a /install/lib/ # missing in the makefile.
+make -C db

patches/pEpEngine-local-per-machine.patch

+--- a/src/platform_unix.c
++++ b/src/platform_unix.c
+@@ -502,7 +502,22 @@ DYNAMIC_API const char *per_user_directory(void) {
+ 
+ DYNAMIC_API const char *per_machine_directory(void)
+ {
+-    return PER_MACHINE_DIRECTORY;
++    static char pth[MAX_PATH];
++    char *home_env;
++    if ((home_env = getenv("HOME")))
++    {
++        size_t len = snprintf(pth, MAX_PATH, "%s/%s", home_env, PER_MACHINE_DIRECTORY);
++        if (len >= MAX_PATH)
++        {
++            assert(0);
++            return NULL;
++        }
++        return pth;
++    }
++    else
++    {
++        return PER_MACHINE_DIRECTORY;
++    }
+ }
+ 
+ const char *unix_system_db(void)
+

patches/wxWidgets-x11-cairo.patch

+--- a/src/common/cairo.cpp
++++ b/src/common/cairo.cpp
+@@ -404,7 +404,7 @@ bool wxCairoInit()
+ // the following code will not make sense on OpenVMS : dynamically loading
+ // of the cairo library is not possible, since on OpenVMS the library is
+ // created as a static library.
+-#if !( defined(__WXGTK__) || defined(__VMS) )
++#if 0 //!( defined(__WXGTK__) || defined(__VMS) )
+ extern "C"
+ {

patches/wxWidgets-x11-fonts.patch

+--- a/src/unix/fontutil.cpp
++++ b/src/unix/fontutil.cpp
+@@ -788,7 +788,7 @@ void wxNativeFontInfo::SetFractionalPointSize(double pointsize)
+     if ( pointsize < 0 )
+         s = '*';
+     else
+-        s.Printf("%d", wxRound(10*pointsize));
++        s.Printf("%d", wxRound(pointsize));
+ 
+     SetXFontComponent(wxXLFD_POINTSIZE, s);
+ }
+@@ -897,7 +897,7 @@ void wxNativeFontInfo::SetFamily(wxFontFamily family)
+         case wxFONTFAMILY_DECORATIVE: xfamily = "lucida"; break;
+         case wxFONTFAMILY_ROMAN:      xfamily = "times";  break;
+         case wxFONTFAMILY_MODERN:     xfamily = "courier"; break;
+-        case wxFONTFAMILY_DEFAULT:
++        case wxFONTFAMILY_DEFAULT:    xfamily = "*"; break;
+         case wxFONTFAMILY_SWISS:      xfamily = "helvetica"; break;
+         case wxFONTFAMILY_TELETYPE:   xfamily = "lucidatypewriter"; break;
+         case wxFONTFAMILY_SCRIPT:     xfamily = "utopia"; break;
+@@ -1366,7 +1366,7 @@ static wxNativeFont wxLoadQueryFont(double pointSize,
+                     info.GetXFontComponent(wxXLFD_SLANT),
+                     info.GetXFontComponent(wxXLFD_POINTSIZE),
+                     xregistry,
+-                    xencoding);
++                    "*");
+ 
+     if( xFontName )
+         *xFontName = fontSpec;

release-notes

+2021-03-11
+----------
+
+Versions in `settings.sh` should match pEp4TB release 1.1.103.
+
+Output:
+```
+7c2f00d95bb27dc45f4ba2c96825c8d3997c61c7  bin/pEp-mini-json-adapter
+ff16199275a36ff30b16865d163118d167b271fb  bin/pEp-mini-json-adapter-local
+295a9b99837f3cff06c94a14b9e344c99460290b  bin/tb_setup
+```

settings.sh

@@ -19,16 +19,16 @@ ETPAN_VERSION=210ba2b3b310b8b7a6ee4a4e35e50f7fa379643f
 
 # More important stuff.
 SEQUOIA_VERSION=365d00a08bec6a5a48d48a7c7893
-PEPENGINE_VERSION=Release_2.1.13
-PEPADAPTER_VERSION=Release_2.1.3
-WEBSERVER_VERSION=master
-JSONADAPTER_VERSION=Release_2.1.0-RC17
+PEPENGINE_VERSION=Release_2.1.17
+PEPADAPTER_VERSION=Release_2.1.11
+WEBSERVER_VERSION=Release_2.1.0-RC7
+JSONADAPTER_VERSION=Release_2.1.0-RC18
 
 # Installer/GUI only things.
 CAIRO_VERSION=1.16.0
 PANGO_VERSION=1.48.1
-WXWIDGETS_VERSION=master
+WXWIDGETS_VERSION=v3.1.4
 PYTHON2_VERSION=2.7.18
 
 # The installer itself.
-LINUXINSTALLER_VERSION=master
+LINUXINSTALLER_VERSION=Release_2.0.9.RC.2