Arch Linux User Repository

Tanks @ceres-c ! I just applied both changes. Versioning scheme you suggested is IMO better, as this is -git package and old versioning scheme implementation was fragile. Not sure why I missed notification about your comment.

There is a missing make dep (lsb-release) and an issue with the pkgver() function. Here's a PKGBUILD patch. Mind you, it changes the naming scheme, but I just needed the thing to build :)

diff --git a/PKGBUILD b/PKGBUILD
index 42a0ff5..feac6be 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,13 +9,13 @@ groups=()
 depends=('gtkmm3' 'libsigc++' 'ffts-git' 'openmp' 'glfw' 'yaml-cpp' 'glew' 'libsigc++-3.0' 'hidapi>=0.13.1')
 # could be also built against 'libsigc++' (2.x version) instead of 'libsigc++-3.0', what should be our target?
 optdepends=('libvulkan.so'  'spirv-tools' 'shaderc' 'liblxi' 'linux-gpib' )
-makedepends=('cmake' 'git' 'vulkan-headers' 'catch2')
+makedepends=('cmake' 'git' 'vulkan-headers' 'catch2' 'lsb-release')
 source=("git+https://github.com/ngscopeclient/scopehal-apps.git")
 sha256sums=('SKIP')

 pkgver() {
   cd "${srcdir}/scopehal-apps"
-  echo "0.0."$(git describe --always)
+  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }

 prepare() {

Figured it out. Passing -Wno-error=cpp in the build() function wasn't being honored by cmake. Had to add a line of sed to the PKGBUILD to modify "add_compile_options". I.e.:

prepare() {
  sed -i 's%url = \.\./%url = https://github.com/ngscopeclient/%' "$srcdir/scopehal-apps/.gitmodules"
  cd "$srcdir/scopehal-apps"
  git submodule update --init --recursive
  sed -i '65s/shadow/shadow -Wno-error=cpp/' CMakeLists.txt
}

Also had to recompile git dependencies due to libxml2 update. Should have done that first, but I didn't think of it. Hope this helps somebody.

I seem to be unable to get past the -Werror failure caused by the deprecation message inside a vulcan_hpp include... Any ideas?

[ 13%] Building CXX object lib/scopehal/CMakeFiles/scopehal.dir/cmake_pch.hxx.gch
In file included from /usr/include/vulkan/vulkan_hpp_macros.hpp:35,
                 from /usr/include/vulkan/vulkan.hpp:11,
                 from /usr/include/vulkan/vulkan_raii.hpp:11,
                 from /var/tmp/makepkg/scopehal-apps-git/src/build/lib/scopehal/CMakeFiles/scopehal.dir/cmake_pch.hxx:6,
                 from <command-line>:
/usr/include/c++/15.1.1/ciso646:46:4: error: #warning "<ciso646> is deprecated in C++17, use <version> to detect implementation-specific macros" [-Werror=cpp]
   46 | #  warning "<ciso646> is deprecated in C++17, use <version> to detect implementation-specific macros"
      |    ^~~~~~~
cc1plus: all warnings being treated as errors
make[2]: *** [lib/scopehal/CMakeFiles/scopehal.dir/build.make:80: lib/scopehal/CMakeFiles/scopehal.dir/cmake_pch.hxx.gch] Error 1
make[1]: *** [CMakeFiles/Makefile2:1428: lib/scopehal/CMakeFiles/scopehal.dir/all] Error 2
make: *** [Makefile:166: all] Error 2
==> ERROR: A failure occurred in build().
    Aborting...
error: failed to build 'scopehal-apps-git-0.0.e0dd8c5a-1': 
error: packages failed to build: scopehal-apps-git-0.0.e0dd8c5a-1

Tried adding -Wno-error to the cmake call inside build() to bypass warning failures, but that seemed to make no difference. Similarly, trying to set -DCMAKE_CXX_STANDARD=20 to make vulcan_hpp pull in <version> instead of <ciso646> made no difference.

@ftk and others: PKGBUILD received an update. Thank you for suggestions!

Hi, can we get linux-gpib as optional dependency? (as seen in patches in previous comments)

Also, could you please update PKGBUILD so it follows template https://wiki.archlinux.org/title/CMake_package_guidelines#Template and it does not call make directly, as people like me, may have different cmake build system than GNU make (e.g. Ninja).

removes patches

diff --git a/PKGBUILD b/PKGBUILD
index 92639eb..4aa6966 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,20 +1,17 @@

 pkgname=scopehal-apps-git
-pkgver=0.0.f18ad75
+pkgver=0.0.33c7cdd
 pkgrel=1
 pkgdesc="glscopeclient and other client applications for libscopehal"
 arch=('x86_64')
 url="https://github.com/glscopeclient/scopehal-apps"
 license=('BSD')
 groups=()
-depends=('gtkmm3' 'libsigc++' 'ffts' 'openmp' 'glfw' 'libvulkan.so' 'yaml-cpp' 'glew' 'catch2' 'spirv-tools' 'shaderc' 'liblxi' 'linux-gpib')
-makedepends=('cmake' 'git' 'vulkan-headers')
-source=("git+https://github.com/glscopeclient/scopehal-apps.git"
-        "modules.patch"
-        "target_link_libraries.patch")
-sha256sums=('SKIP'
-            'afcabed21ee30a3b08b86c452e09f964632f9ac2a2ce6d9eeea430c3060748af'
-            '39459c2f5b67968ca9b743e335026dc280e340ed6e3e4091ac26afd7d709f290')
+depends=('gtkmm3' 'libsigc++' 'ffts-git' 'openmp' 'glfw' 'yaml-cpp' 'glew')
+makedepends=('cmake' 'git' 'vulkan-headers' 'catch2')
+optdepends=('libvulkan.so'  'spirv-tools' 'shaderc' 'liblxi' 'linux-gpib' )
+source=("git+https://github.com/glscopeclient/scopehal-apps.git")
+sha256sums=('SKIP')

 pkgver() {
   cd "${srcdir}/scopehal-apps"
@@ -22,10 +19,9 @@ pkgver() {
 }

 prepare() {
-    patch "$srcdir/scopehal-apps/.gitmodules" modules.patch
-       cd "$srcdir/scopehal-apps"
-       git submodule update --init --recursive
-    patch -p1 < "$srcdir"/target_link_libraries.patch
+  sed -i 's%url = \.\./%url = https://github.com/glscopeclient/%' "$srcdir/scopehal-apps/.gitmodules"
+  cd "$srcdir/scopehal-apps"
+  git submodule update --init --recursive
 }

 build() {

Hi!

The modules.patch needs to be changed to:

diff --git a/.gitmodules b/.gitmodules
index 478f69b..8350711 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,18 +1,18 @@
 [submodule "lib"]
    path = lib
-   url = ../scopehal.git
+   url = https://github.com/glscopeclient/scopehal.git
 [submodule "doc"]
    path = doc
-   url = ../scopehal-docs.git
+   url = https://github.com/glscopeclient/scopehal-docs.git
 [submodule "src/imgui"]
    path = src/imgui
    url = https://github.com/ocornut/imgui
 [submodule "src/implot"]
    path = src/implot
-   url = ../implot.git
+   url = https://github.com/glscopeclient/implot.git
 [submodule "src/imgui-node-editor"]
    path = src/imgui-node-editor
-   url = ../imgui-node-editor.git
+   url = https://github.com/glscopeclient/imgui-node-editor.git
 [submodule "src/ImGuiFileDialog"]
    path = src/ImGuiFileDialog
    url = https://github.com/aiekick/ImGuiFileDialog

(set absolute path to implot)

Uh, as the previous owner I'm sorry that I've not responded to the comments here. I've been on MacOS for a few months, and Arch on my old computer is being uninstalled, so I had to orphan this package for good. Hope someone who really needed this software can pick it up.

The git URL needs to be updated to https://github.com/glscopeclient/scopehal-apps for this PKGBUILD to work