Arch Linux User Repository

Hello, this package has some problems: 1) Not a real -git package as it downloads a specific commit; 2) Does not have an SPDX compliant license; 3) Missing some actual dependencies; 3) Does not download git submodules in the source array; 4) Does not have a pkgver() function for a real -git package; 5) Does not currently compile.

Therefore, I have created a patch file to fix all of these problems. There also two new patches: pedantic.patch and pedantic2.patch, which need to be created and added to the git repo for it to build.

Here is the patch file:

diff --git a/PKGBUILD b/PKGBUILD
index 22f6c12..1e6d62c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,37 +1,52 @@
 # Maintainer: yustin <#archlinux-proaudio@libera.chat>
+# Contributor: HurricanePootis <hurricanepootis@protonmail.com>

 pkgname=rju-git
 _pkgname=rju
 _commit=8d86d170
-pkgver=r220.8d86d170
-pkgrel=2
+pkgver=0.19.r15.g359627c
+pkgrel=1
 pkgdesc='JackAudioToolkit'
 arch=( 'x86_64' )
 url='https://rohandrape.net/?t=rju'
-license=( 'gpl' )
-depends=( 'jack' 'asciidoc' 'libsamplerate' 'liblo' 'libsndfile' )
-makedepends=( 'git' )
+license=( 'GPL-2.0-only' )
+depends=( 'jack' 'asciidoc' 'libsamplerate' 'liblo' 'libsndfile' 'libxext' 'libx11' 'libpng')
+makedepends=( 'git')
 conflicts=( 'rju' )
-source=( "git+https://gitlab.com/rd--/rju#commit=${_commit}"
-         vstsdkpath.patch
-         xrealloc.patch
-       )
+provides=('rju')
+options=('!lto' '!buildflags')
+source=( "git+https://gitlab.com/rd--/rju"
+          "git+https://gitlab.com/rd--/r-common"
+          "vstsdk::git+https://github.com/R-Tur/VST_SDK_2.4.git"
+          "pedantic.patch"
+          "pedantic2.patch")

-sha256sums=( 'SKIP'
-             '11dfd9a08f916f3f03904b59ae3c49df4686a1ba86baa7b27773e050ed62380b'
-             'fe261c0185256ff4a698f0a6e25a2789d197972863b3f17158af44a4452119f0'
-           )
+sha256sums=('SKIP'
+            'SKIP'
+            'SKIP'
+            'cbe07a7f04fd6bc2d96ea7a295d9d2e8b313820d7e553e00b7c118ed711bd43d'
+            '33e6e91a207a90a1eccb186e03a1f6e9c8d810f6e5d2b5b3e4a7ddb83d9c72d3')
+
+pkgver() {
+  cd "$srcdir/$_pkgname"
+  git describe --long --tags --abbrev=7 | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+}

 prepare() {
-  cd ${srcdir}/${_pkgname}/cmd
-  patch -p0 < ${startdir}/vstsdkpath.patch
-  git submodule update --init --recursive
-  patch -p0 < ${startdir}/xrealloc.patch
+  cd "$srcdir/$_pkgname"
+  patch -p1 < "$srcdir/pedantic.patch"
+  git submodule init
+  git config submoudle.cmd/r-command.url "$srcdir/r-command"
+  git -c protocol.file.allow=always submodule update
+  cd "$srcdir/$_pkgname/cmd/r-common"
+  patch -p1 < "$srcdir/pedantic2.patch"
 }

 build() {
   cd ${srcdir}/${_pkgname}/cmd
-  make all -j1
+  export CFLAGS+=" -I$srcdir/vstsdk/"
+  export CXXFLAGS+=" -I$srcdir/vstsdk"
+  make all

   cd ${srcdir}/${_pkgname}/md
   for i in *.md ; do asciidoc $i; done
diff --git a/vstsdkpath.patch b/vstsdkpath.patch
deleted file mode 100644
index 6edf356..0000000
--- a/vstsdkpath.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.orig  2023-02-02 11:36:36.880472368 +0100
-+++ Makefile   2023-02-02 11:39:18.057135099 +0100
-@@ -2,7 +2,7 @@
- 
- bin = rju-data rju-dl rju-level rju-lxvst rju-osc rju-play rju-plumbing rju-record rju-scope rju-transport rju-udp lxvst-query
- 
--VST_SDK = $(HOME)/opt/src/vst3_sdk
-+VST_SDK = /usr/include/vst36 
- 
- CC = gcc # gcc clang
- CXX = g++ # g++ clang++
diff --git a/xrealloc.patch b/xrealloc.patch
deleted file mode 100644
index 63cb15e..0000000
--- a/xrealloc.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- r-common/c/file.h.orig 2023-02-02 12:24:32.340402083 +0100
-+++ r-common/c/file.h  2023-02-02 12:24:41.567068523 +0100
-@@ -1,7 +1,6 @@
- #ifndef _COMMON_FILE_H
- #define _COMMON_FILE_H
- 
--void *xrealloc(void *p, size_t size);
- bool file_exists_p(const char *filename);
- time_t stat_mtime(const char *filename);
- size_t stat_size(const char *filename);

Here is pedantic.patch:

diff --git a/cmd/Makefile b/cmd/Makefile
index 23bacd1..0fe5e8c 100644
--- a/cmd/Makefile
+++ b/cmd/Makefile
@@ -8,7 +8,7 @@ CC = gcc # gcc clang
 CXX = g++ # g++ clang++
 AR = ar # ar llvm-ar

-CPPFLAGS += -Wall -pedantic -O3 -g -ffast-math
+CPPFLAGS += -Wall -O3 -g -ffast-math -fpermissive
 CFLAGS += -D_POSIX_C_SOURCE=200809 -std=c99
 CXXFLAGS +=
 LDLIBS = r-common/c/lib-r-common.a -ljack -lpthread -lm

Here is pedantic2.patch:

diff --git a/c/Makefile b/c/Makefile
index e6fa6f7..b496c1d 100644
--- a/c/Makefile
+++ b/c/Makefile
@@ -86,7 +86,7 @@ obj = beq.o \
 CC = gcc # gcc clang
 AR = ar # ar llvm-ar-13

-CPPFLAGS += -g -Wall -pedantic -O3 -ffast-math
+CPPFLAGS += -g -Wall -O3 -ffast-math -fpermissive
 CFLAGS += -D_POSIX_C_SOURCE=200809 -std=c11

 %.o : %.c %.h