* [PR PATCH] imgbrd-grabber: update to 7.13.0
@ 2025-01-28 7:28 ivelieu
2025-02-07 2:58 ` [PR PATCH] [Updated] " ivelieu
0 siblings, 1 reply; 2+ messages in thread
From: ivelieu @ 2025-01-28 7:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 927 bytes --]
There is a new pull request by ivelieu against master on the void-packages repository
https://github.com/ivelieu/void-packages imgbrd-grabber
https://github.com/void-linux/void-packages/pull/54131
imgbrd-grabber: update to 7.13.0
Updated to qt6 and using latest lexbor 2.4.0, upstream is using a 4 year old version of lexbor
#### Testing the changes
- I tested the changes in this PR: **YES** (I ran the executable and was able to download some images)
#### New package (lexbor)
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES** - compiled, required
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures:
- aarch64-musl
A patch file from https://github.com/void-linux/void-packages/pull/54131.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-imgbrd-grabber-54131.patch --]
[-- Type: text/x-diff, Size: 9436 bytes --]
From ffb4f1419662bf244d65542dccedde373702f7e4 Mon Sep 17 00:00:00 2001
From: ivelieu <28797826+ivelieu@users.noreply.github.com>
Date: Tue, 28 Jan 2025 18:16:53 +1100
Subject: [PATCH 1/2] imgbrd-grabber: update to 7.13.0.
---
.../imgbrd-grabber/patches/QPainterPath.patch | 9 ------
srcpkgs/imgbrd-grabber/patches/catch.patch | 17 ++++++++++
.../patches/lexbor-update.patch | 21 ++++++++++++
srcpkgs/imgbrd-grabber/patches/lexbor.patch | 27 ++++++++++++++++
.../imgbrd-grabber/patches/skip-test.patch | 10 ++++++
srcpkgs/imgbrd-grabber/template | 32 +++++++++++--------
6 files changed, 94 insertions(+), 22 deletions(-)
delete mode 100644 srcpkgs/imgbrd-grabber/patches/QPainterPath.patch
create mode 100644 srcpkgs/imgbrd-grabber/patches/catch.patch
create mode 100644 srcpkgs/imgbrd-grabber/patches/lexbor-update.patch
create mode 100644 srcpkgs/imgbrd-grabber/patches/lexbor.patch
create mode 100644 srcpkgs/imgbrd-grabber/patches/skip-test.patch
diff --git a/srcpkgs/imgbrd-grabber/patches/QPainterPath.patch b/srcpkgs/imgbrd-grabber/patches/QPainterPath.patch
deleted file mode 100644
index 3b460c3386b90c..00000000000000
--- a/srcpkgs/imgbrd-grabber/patches/QPainterPath.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/gui/src/ui/QBouton.cpp 2019-05-19 13:41:39.000000000 +0200
-+++ b/gui/src/ui/QBouton.cpp 2020-09-01 01:09:55.472537243 +0200
-@@ -1,5 +1,6 @@
- #include "ui/QBouton.h"
- #include <QPainter>
-+#include <QPainterPath>
- #include <QPaintEvent>
- #include <QtMath>
-
diff --git a/srcpkgs/imgbrd-grabber/patches/catch.patch b/srcpkgs/imgbrd-grabber/patches/catch.patch
new file mode 100644
index 00000000000000..7edadf35b3ac1f
--- /dev/null
+++ b/srcpkgs/imgbrd-grabber/patches/catch.patch
@@ -0,0 +1,17 @@
+don't use git submodule
+--- a/src/CMakeLists.txt 2025-01-27 17:38:18.152414737 +1100
++++ b/src/CMakeLists.txt 2025-01-27 17:41:08.938986637 +1100
+@@ -123,11 +123,12 @@
+ find_package(Qt6 COMPONENTS Qml REQUIRED)
+ message(STATUS "Qt6 version: ${Qt6_VERSION}")
+
++find_package(Catch2 REQUIRED)
++include_directories(${XBPS_CROSS_BASE}/usr/include/catch2)
+ add_subdirectory(lib)
+ add_subdirectory(gui)
+ add_subdirectory(gui-qml)
+ add_subdirectory(cli)
+-add_subdirectory(tests)
+ add_subdirectory(e2e EXCLUDE_FROM_ALL)
+ add_subdirectory(crash-reporter)
+
diff --git a/srcpkgs/imgbrd-grabber/patches/lexbor-update.patch b/srcpkgs/imgbrd-grabber/patches/lexbor-update.patch
new file mode 100644
index 00000000000000..8c3b6503a9003d
--- /dev/null
+++ b/srcpkgs/imgbrd-grabber/patches/lexbor-update.patch
@@ -0,0 +1,21 @@
+Update lexbor to 2.4.0
+--- a/src/lib/src/utils/html-node.cpp 2025-01-12 00:43:30.000000000 +1100
++++ b/src/lib/src/utils/html-node.cpp 2025-01-27 17:57:55.493038111 +1100
+@@ -136,7 +136,7 @@
+ }
+
+
+-lxb_status_t find_callback(lxb_dom_node_t *node, lxb_css_selector_specificity_t *spec, void *ctx)
++lxb_status_t find_callback(lxb_dom_node_t *node, lxb_css_selector_specificity_t spec, void *ctx)
+ {
+ Q_UNUSED(spec)
+
+@@ -154,7 +154,7 @@
+ {
+ // Create CSS parser
+ auto *parser = lxb_css_parser_create();
+- auto parser_status = lxb_css_parser_init(parser, NULL, NULL);
++ auto parser_status = lxb_css_parser_init(parser, NULL);
+ if (parser_status != LXB_STATUS_OK) {
+ log(QStringLiteral("Error creating CSS parser: %1.").arg(parser_status), Logger::Error);
+ return {};
diff --git a/srcpkgs/imgbrd-grabber/patches/lexbor.patch b/srcpkgs/imgbrd-grabber/patches/lexbor.patch
new file mode 100644
index 00000000000000..e48870a99c4cdb
--- /dev/null
+++ b/srcpkgs/imgbrd-grabber/patches/lexbor.patch
@@ -0,0 +1,27 @@
+don't use git submodule
+--- a/src/lib/CMakeLists.txt 2025-01-12 00:43:30.000000000 +1100
++++ b/src/lib/CMakeLists.txt 2025-01-27 12:33:30.219274168 +1100
+@@ -19,13 +19,11 @@
+ endif()
+
+ # Lexbor
+-add_subdirectory(vendor/lexbor)
+-set(LIBS ${LIBS} lexbor_static)
+-include_directories("vendor/lexbor/source/")
++set(LIBS ${LIBS} lexbor)
+
+ include(ListFilterRegex)
+ file(GLOB_RECURSE SOURCES "src/*.cpp" "vendor/*.cpp" "vendor/*.c")
+-listFilterRegex(SOURCES "vendor/lexbor/")
++# listFilterRegex(SOURCES "vendor/lexbor/")
+ include_directories("src/" ".")
+
+ if(WIN_FILE_PROPS)
+@@ -37,6 +35,7 @@
+
+ add_library(${PROJECT_NAME} STATIC ${SOURCES})
+ target_link_libraries(${PROJECT_NAME} ${QT_LIBRARIES} ${LIBS})
++target_include_directories(${PROJECT_NAME} PUBLIC lexbor)
+
+ # Pre-compiled header
+ if(USE_PCH)
diff --git a/srcpkgs/imgbrd-grabber/patches/skip-test.patch b/srcpkgs/imgbrd-grabber/patches/skip-test.patch
new file mode 100644
index 00000000000000..a10e05cf498c6c
--- /dev/null
+++ b/srcpkgs/imgbrd-grabber/patches/skip-test.patch
@@ -0,0 +1,10 @@
+--- a/src/lib/tests/src/downloader/image-downloader-test.cpp 2025-01-12 00:43:30.000000000 +1100
++++ b/src/lib/tests/src/downloader/image-downloader-test.cpp 2025-01-28 14:56:40.601117188 +1100
+@@ -157,6 +157,7 @@
+
+ SECTION("OpenError")
+ {
++ SKIP("Test fails");
+ auto img = createImage(profile, site);
+ ImageDownloader downloader(profile, img, "///", "///root/toto", 1, false, false, nullptr, false, false);
+
diff --git a/srcpkgs/imgbrd-grabber/template b/srcpkgs/imgbrd-grabber/template
index d1e0ef6a517786..b8f646435959f4 100644
--- a/srcpkgs/imgbrd-grabber/template
+++ b/srcpkgs/imgbrd-grabber/template
@@ -1,33 +1,39 @@
# Template file for 'imgbrd-grabber'
pkgname=imgbrd-grabber
-version=7.1.1
+version=7.13.0
revision=1
build_style=cmake
-hostmakedepends="nodejs"
-makedepends="qt5-declarative-devel qt5-multimedia-devel qt5-plugin-mysql
-qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds
-qt5-script-devel qt5-tools-devel"
+configure_args="-DXBPS_CROSS_BASE=${XBPS_CROSS_BASE}"
+build_wrksrc=src
+cmake_builddir=../build
+hostmakedepends="nodejs qt6-tools qt6-shadertools"
+makedepends="qt6-declarative-devel qt6-multimedia-devel qt6-plugin-mysql
+qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite catch2 qt6-networkauth-devel
+qt6-webengine-devel lexbor-devel qt6-shadertools-devel"
short_desc="Powerful imageboard/booru downloader"
maintainer="SolitudeSF <solitudesf@protonmail.com>"
license="Apache-2.0"
homepage="https://bionus.github.io/imgbrd-grabber"
changelog="https://github.com/Bionus/imgbrd-grabber/releases"
distfiles="https://github.com/Bionus/imgbrd-grabber/archive/v${version}.tar.gz"
-checksum=4ecb247f92fb4ba7c3245439bcd221e8c64dd037c1761065a663adb6b4571740
+checksum=9d64a8790d9865498e17670b9db175372978fe60c1b70eef1a9b2cfbb53d3d2f
if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" qt5-host-tools qt5-qmake"
+ hostmakedepends+=" qt6-declarative-host-tools qt5-qmake"
fi
case "$XBPS_TARGET_MACHINE" in
- i686*) broken="segfaults with node" ;;
+ armv5* | armv6* | armv7* | ppc* | riscv64* | i686*) broken="qt6-webengine missing" ;;
esac
-pre_configure() {
- vsed -i 's|USE_QSCINTILLA 1|USE_QSCINTILLA 0|' gui/CMakeLists.txt
- vsed -i 's|USE_BREAKPAD 1|USE_BREAKPAD 0|' gui/CMakeLists.txt
+pre_build() {
+ vsed -i tests/src/catch.h -e 's/vendor\/catch\/src\/catch2\///'
+ vsed -i tests/src/main.cpp -e 's/vendor\/catch\/src\/catch2\///'
}
-post_install() {
- touch ${DESTDIR}/usr/share/Grabber/settings.ini
+do_check() {
+ cd lib
+ QT_QPA_PLATFORM=offscreen ../../build/lib/tests/lib-tests
+ QT_QPA_PLATFORM=offscreen ../../build/cli/tests/cli-tests
+ QT_QPA_PLATFORM=offscreen ../../build/gui/tests/gui-tests
}
From b51af2998d9265c49a0e6f9d7de4330847db7cae Mon Sep 17 00:00:00 2001
From: ivelieu <28797826+ivelieu@users.noreply.github.com>
Date: Tue, 28 Jan 2025 18:17:05 +1100
Subject: [PATCH 2/2] New package: lexbor-2.4.0
---
common/shlibs | 1 +
srcpkgs/lexbor-devel | 1 +
srcpkgs/lexbor/template | 27 +++++++++++++++++++++++++++
3 files changed, 29 insertions(+)
create mode 120000 srcpkgs/lexbor-devel
create mode 100644 srcpkgs/lexbor/template
diff --git a/common/shlibs b/common/shlibs
index 3dcacc7de76d9d..fc78c1a2dc83bf 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1219,6 +1219,7 @@ libgnt.so.0 libgnt-2.10.6_1
libao.so.4 libao-1.1.0_1
libjansson.so.4 jansson-2.4_1
libleveldb.so.1 leveldb-1.8.0_1
+liblexbor.so.2 lexbor-2.4.0_1
libcprops.so.15 libcprops-0.1.12_1
libopus.so.0 opus-1.0.2_1
libconfig++.so.11 libconfig++-1.7.1_1
diff --git a/srcpkgs/lexbor-devel b/srcpkgs/lexbor-devel
new file mode 120000
index 00000000000000..0f44d74f2a017d
--- /dev/null
+++ b/srcpkgs/lexbor-devel
@@ -0,0 +1 @@
+lexbor
\ No newline at end of file
diff --git a/srcpkgs/lexbor/template b/srcpkgs/lexbor/template
new file mode 100644
index 00000000000000..07266a91ef60c5
--- /dev/null
+++ b/srcpkgs/lexbor/template
@@ -0,0 +1,27 @@
+# Template file for 'lexbor'
+pkgname=lexbor
+version=2.4.0
+revision=1
+build_style=cmake
+configure_args="-DLEXBOR_BUILD_TESTS=ON"
+short_desc="Browser engine library"
+maintainer="Ivelieu <ivelieu1@gmail.com>"
+license="Apache-2.0"
+homepage="https://lexbor.com/"
+changelog="https://raw.githubusercontent.com/lexbor/lexbor/refs/heads/master/CHANGELOG.md"
+distfiles="https://github.com/lexbor/lexbor/archive/refs/tags/v${version}.tar.gz"
+checksum=8949744d425743828891de6d80327ccb64b5146f71ff6c992644e6234e63930e
+
+pre_install() {
+ cmake --install build
+}
+
+lexbor-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ vmove "usr/lib/*.a"
+ }
+}
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PR PATCH] [Updated] imgbrd-grabber: update to 7.13.0
2025-01-28 7:28 [PR PATCH] imgbrd-grabber: update to 7.13.0 ivelieu
@ 2025-02-07 2:58 ` ivelieu
0 siblings, 0 replies; 2+ messages in thread
From: ivelieu @ 2025-02-07 2:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 932 bytes --]
There is an updated pull request by ivelieu against master on the void-packages repository
https://github.com/ivelieu/void-packages imgbrd-grabber
https://github.com/void-linux/void-packages/pull/54131
imgbrd-grabber: update to 7.13.0
Updated to qt6 and using latest lexbor 2.4.0, upstream is using a 4 year old version of lexbor
#### Testing the changes
- I tested the changes in this PR: **YES** (I ran the executable and was able to download some images)
#### New package (lexbor)
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES** - compiled, required
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures:
- aarch64-musl
A patch file from https://github.com/void-linux/void-packages/pull/54131.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-imgbrd-grabber-54131.patch --]
[-- Type: text/x-diff, Size: 9387 bytes --]
From 1e6cea6938250fe78ac5172046de65da3e2cb096 Mon Sep 17 00:00:00 2001
From: ivelieu <ivelieu1@gmail.com>
Date: Fri, 7 Feb 2025 13:56:32 +1100
Subject: [PATCH 1/2] imgbrd-grabber: update to 7.13.0.
---
.../imgbrd-grabber/patches/QPainterPath.patch | 9 ------
srcpkgs/imgbrd-grabber/patches/catch.patch | 17 ++++++++++
.../patches/lexbor-update.patch | 21 ++++++++++++
srcpkgs/imgbrd-grabber/patches/lexbor.patch | 27 ++++++++++++++++
.../imgbrd-grabber/patches/skip-test.patch | 10 ++++++
srcpkgs/imgbrd-grabber/template | 32 +++++++++++--------
6 files changed, 94 insertions(+), 22 deletions(-)
delete mode 100644 srcpkgs/imgbrd-grabber/patches/QPainterPath.patch
create mode 100644 srcpkgs/imgbrd-grabber/patches/catch.patch
create mode 100644 srcpkgs/imgbrd-grabber/patches/lexbor-update.patch
create mode 100644 srcpkgs/imgbrd-grabber/patches/lexbor.patch
create mode 100644 srcpkgs/imgbrd-grabber/patches/skip-test.patch
diff --git a/srcpkgs/imgbrd-grabber/patches/QPainterPath.patch b/srcpkgs/imgbrd-grabber/patches/QPainterPath.patch
deleted file mode 100644
index 3b460c3386b90c..00000000000000
--- a/srcpkgs/imgbrd-grabber/patches/QPainterPath.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/gui/src/ui/QBouton.cpp 2019-05-19 13:41:39.000000000 +0200
-+++ b/gui/src/ui/QBouton.cpp 2020-09-01 01:09:55.472537243 +0200
-@@ -1,5 +1,6 @@
- #include "ui/QBouton.h"
- #include <QPainter>
-+#include <QPainterPath>
- #include <QPaintEvent>
- #include <QtMath>
-
diff --git a/srcpkgs/imgbrd-grabber/patches/catch.patch b/srcpkgs/imgbrd-grabber/patches/catch.patch
new file mode 100644
index 00000000000000..7edadf35b3ac1f
--- /dev/null
+++ b/srcpkgs/imgbrd-grabber/patches/catch.patch
@@ -0,0 +1,17 @@
+don't use git submodule
+--- a/src/CMakeLists.txt 2025-01-27 17:38:18.152414737 +1100
++++ b/src/CMakeLists.txt 2025-01-27 17:41:08.938986637 +1100
+@@ -123,11 +123,12 @@
+ find_package(Qt6 COMPONENTS Qml REQUIRED)
+ message(STATUS "Qt6 version: ${Qt6_VERSION}")
+
++find_package(Catch2 REQUIRED)
++include_directories(${XBPS_CROSS_BASE}/usr/include/catch2)
+ add_subdirectory(lib)
+ add_subdirectory(gui)
+ add_subdirectory(gui-qml)
+ add_subdirectory(cli)
+-add_subdirectory(tests)
+ add_subdirectory(e2e EXCLUDE_FROM_ALL)
+ add_subdirectory(crash-reporter)
+
diff --git a/srcpkgs/imgbrd-grabber/patches/lexbor-update.patch b/srcpkgs/imgbrd-grabber/patches/lexbor-update.patch
new file mode 100644
index 00000000000000..8c3b6503a9003d
--- /dev/null
+++ b/srcpkgs/imgbrd-grabber/patches/lexbor-update.patch
@@ -0,0 +1,21 @@
+Update lexbor to 2.4.0
+--- a/src/lib/src/utils/html-node.cpp 2025-01-12 00:43:30.000000000 +1100
++++ b/src/lib/src/utils/html-node.cpp 2025-01-27 17:57:55.493038111 +1100
+@@ -136,7 +136,7 @@
+ }
+
+
+-lxb_status_t find_callback(lxb_dom_node_t *node, lxb_css_selector_specificity_t *spec, void *ctx)
++lxb_status_t find_callback(lxb_dom_node_t *node, lxb_css_selector_specificity_t spec, void *ctx)
+ {
+ Q_UNUSED(spec)
+
+@@ -154,7 +154,7 @@
+ {
+ // Create CSS parser
+ auto *parser = lxb_css_parser_create();
+- auto parser_status = lxb_css_parser_init(parser, NULL, NULL);
++ auto parser_status = lxb_css_parser_init(parser, NULL);
+ if (parser_status != LXB_STATUS_OK) {
+ log(QStringLiteral("Error creating CSS parser: %1.").arg(parser_status), Logger::Error);
+ return {};
diff --git a/srcpkgs/imgbrd-grabber/patches/lexbor.patch b/srcpkgs/imgbrd-grabber/patches/lexbor.patch
new file mode 100644
index 00000000000000..e48870a99c4cdb
--- /dev/null
+++ b/srcpkgs/imgbrd-grabber/patches/lexbor.patch
@@ -0,0 +1,27 @@
+don't use git submodule
+--- a/src/lib/CMakeLists.txt 2025-01-12 00:43:30.000000000 +1100
++++ b/src/lib/CMakeLists.txt 2025-01-27 12:33:30.219274168 +1100
+@@ -19,13 +19,11 @@
+ endif()
+
+ # Lexbor
+-add_subdirectory(vendor/lexbor)
+-set(LIBS ${LIBS} lexbor_static)
+-include_directories("vendor/lexbor/source/")
++set(LIBS ${LIBS} lexbor)
+
+ include(ListFilterRegex)
+ file(GLOB_RECURSE SOURCES "src/*.cpp" "vendor/*.cpp" "vendor/*.c")
+-listFilterRegex(SOURCES "vendor/lexbor/")
++# listFilterRegex(SOURCES "vendor/lexbor/")
+ include_directories("src/" ".")
+
+ if(WIN_FILE_PROPS)
+@@ -37,6 +35,7 @@
+
+ add_library(${PROJECT_NAME} STATIC ${SOURCES})
+ target_link_libraries(${PROJECT_NAME} ${QT_LIBRARIES} ${LIBS})
++target_include_directories(${PROJECT_NAME} PUBLIC lexbor)
+
+ # Pre-compiled header
+ if(USE_PCH)
diff --git a/srcpkgs/imgbrd-grabber/patches/skip-test.patch b/srcpkgs/imgbrd-grabber/patches/skip-test.patch
new file mode 100644
index 00000000000000..a10e05cf498c6c
--- /dev/null
+++ b/srcpkgs/imgbrd-grabber/patches/skip-test.patch
@@ -0,0 +1,10 @@
+--- a/src/lib/tests/src/downloader/image-downloader-test.cpp 2025-01-12 00:43:30.000000000 +1100
++++ b/src/lib/tests/src/downloader/image-downloader-test.cpp 2025-01-28 14:56:40.601117188 +1100
+@@ -157,6 +157,7 @@
+
+ SECTION("OpenError")
+ {
++ SKIP("Test fails");
+ auto img = createImage(profile, site);
+ ImageDownloader downloader(profile, img, "///", "///root/toto", 1, false, false, nullptr, false, false);
+
diff --git a/srcpkgs/imgbrd-grabber/template b/srcpkgs/imgbrd-grabber/template
index d1e0ef6a517786..185347052d45c1 100644
--- a/srcpkgs/imgbrd-grabber/template
+++ b/srcpkgs/imgbrd-grabber/template
@@ -1,33 +1,39 @@
# Template file for 'imgbrd-grabber'
pkgname=imgbrd-grabber
-version=7.1.1
+version=7.13.0
revision=1
build_style=cmake
-hostmakedepends="nodejs"
-makedepends="qt5-declarative-devel qt5-multimedia-devel qt5-plugin-mysql
-qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds
-qt5-script-devel qt5-tools-devel"
+configure_args="-DXBPS_CROSS_BASE=${XBPS_CROSS_BASE}"
+build_wrksrc=src
+cmake_builddir=../build
+hostmakedepends="nodejs qt6-tools qt6-shadertools"
+makedepends="qt6-declarative-devel qt6-multimedia-devel qt6-plugin-mysql
+qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite catch2 qt6-networkauth-devel
+qt6-webengine-devel lexbor-devel qt6-shadertools-devel"
short_desc="Powerful imageboard/booru downloader"
maintainer="SolitudeSF <solitudesf@protonmail.com>"
license="Apache-2.0"
homepage="https://bionus.github.io/imgbrd-grabber"
changelog="https://github.com/Bionus/imgbrd-grabber/releases"
distfiles="https://github.com/Bionus/imgbrd-grabber/archive/v${version}.tar.gz"
-checksum=4ecb247f92fb4ba7c3245439bcd221e8c64dd037c1761065a663adb6b4571740
+checksum=9d64a8790d9865498e17670b9db175372978fe60c1b70eef1a9b2cfbb53d3d2f
if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" qt5-host-tools qt5-qmake"
+ hostmakedepends+=" qt6-declarative-host-tools qt5-qmake"
fi
case "$XBPS_TARGET_MACHINE" in
- i686*) broken="segfaults with node" ;;
+ armv5* | armv6* | armv7* | ppc* | riscv64* | i686*) broken="qt6-webengine missing" ;;
esac
-pre_configure() {
- vsed -i 's|USE_QSCINTILLA 1|USE_QSCINTILLA 0|' gui/CMakeLists.txt
- vsed -i 's|USE_BREAKPAD 1|USE_BREAKPAD 0|' gui/CMakeLists.txt
+pre_build() {
+ vsed -i tests/src/catch.h -e 's/vendor\/catch\/src\/catch2\///'
+ vsed -i tests/src/main.cpp -e 's/vendor\/catch\/src\/catch2\///'
}
-post_install() {
- touch ${DESTDIR}/usr/share/Grabber/settings.ini
+do_check() {
+ cd lib
+ QT_QPA_PLATFORM=offscreen ../../build/lib/tests/lib-tests
+ QT_QPA_PLATFORM=offscreen ../../build/cli/tests/cli-tests
+ QT_QPA_PLATFORM=offscreen ../../build/gui/tests/gui-tests
}
From 54c0514d14de8faa65f79e58b225e60bf107d3da Mon Sep 17 00:00:00 2001
From: ivelieu <ivelieu1@gmail.com>
Date: Fri, 7 Feb 2025 13:56:58 +1100
Subject: [PATCH 2/2] New package: lexbor-2.4.0
---
common/shlibs | 1 +
srcpkgs/lexbor-devel | 1 +
srcpkgs/lexbor/template | 27 +++++++++++++++++++++++++++
3 files changed, 29 insertions(+)
create mode 120000 srcpkgs/lexbor-devel
create mode 100644 srcpkgs/lexbor/template
diff --git a/common/shlibs b/common/shlibs
index 3dcacc7de76d9d..fc78c1a2dc83bf 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1219,6 +1219,7 @@ libgnt.so.0 libgnt-2.10.6_1
libao.so.4 libao-1.1.0_1
libjansson.so.4 jansson-2.4_1
libleveldb.so.1 leveldb-1.8.0_1
+liblexbor.so.2 lexbor-2.4.0_1
libcprops.so.15 libcprops-0.1.12_1
libopus.so.0 opus-1.0.2_1
libconfig++.so.11 libconfig++-1.7.1_1
diff --git a/srcpkgs/lexbor-devel b/srcpkgs/lexbor-devel
new file mode 120000
index 00000000000000..0f44d74f2a017d
--- /dev/null
+++ b/srcpkgs/lexbor-devel
@@ -0,0 +1 @@
+lexbor
\ No newline at end of file
diff --git a/srcpkgs/lexbor/template b/srcpkgs/lexbor/template
new file mode 100644
index 00000000000000..07266a91ef60c5
--- /dev/null
+++ b/srcpkgs/lexbor/template
@@ -0,0 +1,27 @@
+# Template file for 'lexbor'
+pkgname=lexbor
+version=2.4.0
+revision=1
+build_style=cmake
+configure_args="-DLEXBOR_BUILD_TESTS=ON"
+short_desc="Browser engine library"
+maintainer="Ivelieu <ivelieu1@gmail.com>"
+license="Apache-2.0"
+homepage="https://lexbor.com/"
+changelog="https://raw.githubusercontent.com/lexbor/lexbor/refs/heads/master/CHANGELOG.md"
+distfiles="https://github.com/lexbor/lexbor/archive/refs/tags/v${version}.tar.gz"
+checksum=8949744d425743828891de6d80327ccb64b5146f71ff6c992644e6234e63930e
+
+pre_install() {
+ cmake --install build
+}
+
+lexbor-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ vmove "usr/lib/*.a"
+ }
+}
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-02-07 2:58 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-01-28 7:28 [PR PATCH] imgbrd-grabber: update to 7.13.0 ivelieu
2025-02-07 2:58 ` [PR PATCH] [Updated] " ivelieu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).