xournalpp: 1.2.2 -> 1.2.3

add patch for musl systems; remove dependency gtksourceview (incompatible version in ports)

xournalpp/.signature

@@ -1,5 +1,6 @@
 untrusted comment: verify with /etc/ports/jmq.pub
-RWTTPlFarK9CxM/24cXt2alH38hanQ0lpGAreotGd9EfCe9d/eFuwRBIxflVO1zroP6xXWF0X3LvQKodhIiPnMZyKxkm5pq5MQg=
-SHA256 (Pkgfile) = 4ec88ae2aa19dd45e5dff0f97bca23a404802bed47b3d3b92729ed16606500ca
+RWTTPlFarK9CxFmUgAAKOcWg1AzGFw8wPqzIvOPzpyf994CM++PWu8JHInQSTF1KanIEHsz4Tq2azewN8FVYvF4vd3JJqe3u4ww=
+SHA256 (Pkgfile) = 5067aa1daf4ab517752f6d82172a2821810762462fee353ac0286865b89d3b1e
 SHA256 (.footprint) = ec2f24969ad72c3f91a95252ce54ba6636f296e6ac8f9aa1c2a40346a44b9385
-SHA256 (xournalpp-1.2.2.tar.gz) = b873ea4e2beadc3061fab87faef31c374ae7876c88dbda5565c491945cf7290f
+SHA256 (xournalpp-1.2.3.tar.gz) = 8817abd1794760c2a3be3a35e56a5588a51e517bc591384fa321994d50e14e7c
+SHA256 (no-execinfo.patch) = 9e973475c2dbc46efadb97be27bd9b256e90feddf7edc3ef1edc6072c5d35559

xournalpp/Pkgfile

@@ -1,19 +1,23 @@
 # Description: notetaking and PDF annotation software
 # URL: https://github.com/xournalpp/xournalpp
 # Maintainer: John McQuah, jmcquah at disroot dot org
-# Depends on: gtksourceview libsndfile libzip lua poppler portaudio-cpp
+# Depends on: libsndfile libzip lua poppler portaudio-cpp
 # Optional: gpgme texlive
 
 name=xournalpp
-version=1.2.2
+version=1.2.3
 release=1
-source=(https://github.com/$name/$name/archive/v$version/$name-$version.tar.gz)
+source=(https://github.com/$name/$name/archive/v$version/$name-$version.tar.gz
+        # and a patch from Alpine Linux to accommodate MUSL builds
+        no-execinfo.patch)
 
 build() {
     # fail the build if dependencies are not met
     [ -e /usr/include/poppler/glib/poppler.h ] || \
     { echo "Rebuild poppler with glib present; otherwise xournalpp will not work."; exit 1; }
 
+    prt-get isinst glibc || patch -Np1 -d $name-$version < no-execinfo.patch
+
     cmake -S $name-$version -B build -G Ninja \
           -DCMAKE_INSTALL_PREFIX="/usr" \
           -DCMAKE_C_FLAGS="$CFLAGS" \

xournalpp/no-execinfo.patch

@@ -0,0 +1,72 @@
+--- a/src/core/control/CrashHandlerUnix.h
++++ b/src/core/control/CrashHandlerUnix.h
+@@ -13,7 +13,6 @@
+ #include <bitset>
+ #include <fstream>  // std::ofstream
+ 
+-#include <execinfo.h>
+ #include <gtk/gtk.h>
+ 
+ #include "util/PathUtil.h"
+@@ -112,11 +111,8 @@
+     void* array[100];
+     char** messages;
+ 
+-    size_t size;
++    size_t size = 0;
+ 
+-    // get void*'s for all entries on the stack
+-    size = backtrace(array, 100);
+-
+     time_t curtime = time(0);
+     char stime[128];
+     strftime(stime, sizeof(stime), "%Y%m%d-%H%M%S", localtime(&curtime));
+@@ -140,15 +136,6 @@
+     fp << "Gtk version " << gtk_get_major_version() << "." << gtk_get_minor_version() << "." << gtk_get_micro_version()
+        << std::endl
+        << std::endl;
+-
+-    messages = backtrace_symbols(array, size);
+-
+-    for (size_t i = 0; i < size; i++) {
+-        fp << FORMAT_STR("[bt]: ({1}) {2}") % i % messages[i];
+-        fp << "\n";
+-    }
+-
+-    free(messages);
+ 
+     fp << "\n\nTry to get a better stacktrace...\n";
+ 
+--- a/src/util/Stacktrace.cpp
++++ b/src/util/Stacktrace.cpp
+@@ -14,7 +14,6 @@
+ #else
+ 
+ #include <dlfcn.h>     // for dladdr
+-#include <execinfo.h>  // for backtrace, backtrace_symbols
+ #include <unistd.h>    // for readlink, ssize_t
+ 
+ #ifdef __APPLE__
+@@ -91,13 +90,10 @@
+     std::array<void*, 32> trace{};
+     std::array<char, 2048> buff{};
+ 
+-    int trace_size = backtrace(trace.data(), trace.size());
+-    char** messages = backtrace_symbols(trace.data(), trace_size);
++    int trace_size = 0;
+ 
+     // skip first stack frame (points here)
+     for (unsigned int i = 1; i < trace_size; ++i) {
+-        stream << "[bt] #" << i - 1 << " " << messages[i] << endl;
+-
+         Dl_info info;  // NOLINT(cppcoreguidelines-init-variables)
+         dladdr(trace[i], &info);
+ 
+@@ -115,7 +111,6 @@
+         pclose(fProc);
+     }
+ 
+-    free(messages);
+ }
+ #endif
+