Arch Linux User Repository

Please do not flag this as out of date simply because it shows an older version. "Note: VCS packages are not considered out of date when the pkgver changes, do not flag them as the maintainer will merely unflag the package and ignore you. AUR maintainers should not commit mere pkgver bumps."[1]

1. https://wiki.archlinux.org/index.php/Arch_User_Repository#Feedback

Hello, I am the maintainer of imgbrd-grabber, and I decided to review your package. Here are some things I noticed. 1: You have a v in your pkgver, which is not proper for a pkgver() on arch linux. 2: Your license() array is not SPDX compliant. 3: You are missing a submodule. 4: You are incorrectly doing your submodules. Whenever you are configuring the submodule to use the local source, you don't use the name of the git repo, but whatever the package had named their submodule in .gitmodules. 5: No need for your own Grabber.desktop since the project provides its own. 6: For cmake projects, please use cmake and do not directly call make at all. 7: this one is optional, but you can install your npm stuff before building. 8: No need to manually install an icon since the install process also takes care of that.

I wouldn't mind being co-maintainer of this package since I already maintain the main package.

diff --git a/Grabber.desktop b/Grabber.desktop
deleted file mode 100644
index 8703655..0000000
--- a/Grabber.desktop
+++ /dev/null
@@ -1,28 +0,0 @@
-[Desktop Entry]
-
-# The type as listed above
-Type=Application
-
-# The version of the desktop entry specification to which this file complies
-Version=1.0
-
-# The name of the application
-Name=Grabber
-
-# A comment which can/will be used as a tooltip
-Comment=a Very customizable imageboard/booru downloader
-
-# The path to the folder in which the executable is run
-Path=/usr/bin
-
-# The executable of the application, possibly with arguments.
-Exec=Grabber
-
-# The name of the icon that will be used to display this entry
-Icon=Grabber
-
-# Describes whether this application needs to be run in a terminal or not
-Terminal=false
-
-# Describes the categories in which this entry should be shown
-Categories=Graphics;
diff --git a/PKGBUILD b/PKGBUILD
index 4244bc4..120d4e1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,48 +1,61 @@
 # Maintainer: Flat <flat@imo.uto.moe>
 pkgname=imgbrd-grabber-git
-pkgver=v7.11.2.r107.g84b6896e
+pkgver=7.11.2.r174.gd54bdce
 pkgrel=1
 pkgdesc="Very customizable imageboard/booru downloader with powerful filenaming features."
 arch=('i686' 'x86_64')
 url="https://github.com/Bionus/imgbrd-grabber"
-license=('Apache')
+license=('Apache-2.0')
 depends=('qt6-multimedia' 'qt6-declarative' 'nodejs' 'qt6-networkauth' 'hicolor-icon-theme')
 makedepends=('git' 'cmake' 'qt6-tools' 'npm')
 optdepends=('openssl: used for HTTPS sources')
 provides=("${pkgname%-git}")
 conflicts=("${pkgname%-git}")
-source=('git+https://github.com/Bionus/imgbrd-grabber.git#branch=develop' 'Grabber.desktop' 'git+https://github.com/catchorg/Catch2.git' 'git+https://github.com/sakra/cotire.git' 'git+https://github.com/LaurentGomila/qt-android-cmake.git')
-md5sums=('SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP')
+source=('git+https://github.com/Bionus/imgbrd-grabber.git#branch=develop'
+   'git+https://github.com/catchorg/Catch2.git'
+   'git+https://github.com/sakra/cotire.git'
+   'git+https://github.com/LaurentGomila/qt-android-cmake.git' 
+   'git+https://github.com/lexbor/lexbor.git')
+md5sums=('SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP')


 pkgver() {
     cd "$srcdir/${pkgname%-git}"
-    git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+    git describe --long --abbrev=7 | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }

 prepare() {
     cd "$srcdir/${pkgname%-git}"
     git submodule init
-    git config submodule.catch.url "$srcdir/Catch2"
-    git config submodule.qt-android-cmake.url "$srcdir/qt-android-cmake"
-    git config submodule.cotire.url "$srcdir/cotire"
+    git config submodule.tests/src/vendor/catch.url "$srcdir/Catch2"
+    git config submodule.cmake/qt-android-cmake.url "$srcdir/qt-android-cmake"
+    git config submodule.cmake/cotire.url "$srcdir/cotire"
+    git config submodule.lib/vendor/lexbor.url "$srcdir/lexbor"
     git -c protocol.file.allow=always submodule update
 }

 build() {
+    cd "$srcdir/${pkgname%-git}/src/sites"
+
+    npm install --no-optional
+
+    cd "$srcdir"
+
     cmake -B build -S "${pkgname%-git}/src" \
         -DCMAKE_BUILD_TYPE='None' \
         -DCMAKE_INSTALL_PREFIX='/usr' \
         -DUSE_QSCINTILLA=0 \
         -DUSE_BREAKPAD=O \
         -Wno-dev
-    make -C build
+    cmake --build build
 }

 package() {
-    cd "$srcdir/build"
-    make DESTDIR="$pkgdir/" install
-    install -Dm644 "$srcdir/${pkgname%-git}/src/gui/resources/images/icon.png" "$pkgdir/usr/share/pixmaps/Grabber.png"
-    install -Dm644 "$srcdir/Grabber.desktop" "$pkgdir/usr/share/applications/Grabber.desktop"
+    cd "$srcdir"
+    DESTDIR="$pkgdir" cmake --install build
     touch "$pkgdir/usr/share/Grabber/settings.ini"
 }

Please update the PKGBUILD to use qt6

Looks like there may be something that is broken when compiling from upstream, when testing on adding qt5-networkauth. I will try to take a look at this soon and if it is upstream send a PR.

Please add qt5-networkauth to dependencies (make?)

@solace It's an upstream issue: https://github.com/Bionus/imgbrd-grabber/issues/2190

Grabber crashes when I open an image then close it. not sure what's causing this.

You're right. I'll ask upstream.

It doesn't matter if it is listed in the sources or not, it will be cloned on the submodule update. This is the recommended way to include submodules. https://wiki.archlinux.org/index.php/VCS_package_guidelines#Git_submodules

If you have a better suggestion of how to exclude this submodule alone I would be more than happy to test and implement it.

It doesn't matter whether they're in the submodules. You've explicitly listed them as sources instead of running git submodule update --init --recursive. qt-android-cmake is literally only used to build the android version, which we don't do. We can absolutely do without it in the sources.

They are required and are submodules of the repository. If the icon doesn't work that is an upstream issue, they provide the icon and .desktop file. https://github.com/Bionus/imgbrd-grabber/blob/develop/.gitmodules