summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephanie Wilde-Hobbs2023-03-03 13:53:28 +0100
committerStephanie Wilde-Hobbs2023-03-03 13:53:28 +0100
commit5894deb4868bd06b6873468da2aaf0c9c5d8982e (patch)
tree9e75b7f126d0303265c83d7a1ad952c48f858e7f
parentab45e50da8b0e8655d6ad6ff197d54a9c632ad69 (diff)
downloadaur-scopehal-apps-git.tar.gz
Fix submodules
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD6
-rw-r--r--modules.patch20
3 files changed, 25 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7b6f137873e5..9ea9de18deff 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = scopehal-apps-git
pkgdesc = glscopeclient and other client applications for libscopehal
- pkgver = 0.0.62934e0
+ pkgver = 0.0.f18ad75
pkgrel = 1
url = https://github.com/glscopeclient/scopehal-apps
arch = x86_64
@@ -24,8 +24,8 @@ pkgbase = scopehal-apps-git
source = git+https://github.com/glscopeclient/scopehal-apps.git
source = modules.patch
source = target_link_libraries.patch
- md5sums = SKIP
- md5sums = SKIP
- md5sums = SKIP
+ sha256sums = SKIP
+ sha256sums = afcabed21ee30a3b08b86c452e09f964632f9ac2a2ce6d9eeea430c3060748af
+ sha256sums = 39459c2f5b67968ca9b743e335026dc280e340ed6e3e4091ac26afd7d709f290
pkgname = scopehal-apps-git
diff --git a/PKGBUILD b/PKGBUILD
index f65be546dd58..92639eb81634 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=scopehal-apps-git
-pkgver=0.0.62934e0
+pkgver=0.0.f18ad75
pkgrel=1
pkgdesc="glscopeclient and other client applications for libscopehal"
arch=('x86_64')
@@ -12,7 +12,9 @@ makedepends=('cmake' 'git' 'vulkan-headers')
source=("git+https://github.com/glscopeclient/scopehal-apps.git"
"modules.patch"
"target_link_libraries.patch")
-md5sums=('SKIP' 'SKIP' 'SKIP')
+sha256sums=('SKIP'
+ 'afcabed21ee30a3b08b86c452e09f964632f9ac2a2ce6d9eeea430c3060748af'
+ '39459c2f5b67968ca9b743e335026dc280e340ed6e3e4091ac26afd7d709f290')
pkgver() {
cd "${srcdir}/scopehal-apps"
diff --git a/modules.patch b/modules.patch
index d13f4b4d8a7a..3c4fc741fa97 100644
--- a/modules.patch
+++ b/modules.patch
@@ -1,6 +1,8 @@
---- src/scopehal-apps/.gitmodules 2021-12-14 13:31:20.205388635 +0800
-+++ src/scopehal-apps/2.gitmodules 2021-12-14 13:38:23.108470633 +0800
-@@ -1,6 +1,6 @@
+diff --git a/.gitmodules b/.gitmodules
+index 478f69b..8350711 100644
+--- a/.gitmodules
++++ b/.gitmodules
+@@ -1,9 +1,9 @@
[submodule "lib"]
path = lib
- url = ../scopehal.git
@@ -9,3 +11,15 @@
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
+@@ -12,7 +12,7 @@
+ url = https://github.com/epezent/implot
+ [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