From 8dfa39443fc114271716b91bb64c6c7481bdb701 Mon Sep 17 00:00:00 2001 From: r0man1an Date: Sat, 27 Jun 2026 19:03:08 +0200 Subject: [PATCH 1/4] Haru: update to 2.4.6 --- common/shlibs | 2 +- .../Haru/patches/unitialized-ptr_error.patch | 55 ------------------- srcpkgs/Haru/template | 22 +++----- 3 files changed, 9 insertions(+), 70 deletions(-) delete mode 100644 srcpkgs/Haru/patches/unitialized-ptr_error.patch diff --git a/common/shlibs b/common/shlibs index eff504f95e145f..ace1730b29e41a 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3257,7 +3257,7 @@ libembb_mtapi_c.so embb-1.0.0_3 libembb_mtapi_network_c.so embb-1.0.0_3 libembb_base_cpp.so embb-1.0.0_3 libembb_base_c.so embb-1.0.0_3 -libhpdf-2.3.0.so Haru-2.3.0_3 +libhpdf.so.2.4 Haru-2.4.6_1 libKChart6.so.3 kdiagram6-3.0.0_1 libKGantt6.so.3 kdiagram6-3.0.0_1 libscrypt.so.0 libscrypt-1.21_1 diff --git a/srcpkgs/Haru/patches/unitialized-ptr_error.patch b/srcpkgs/Haru/patches/unitialized-ptr_error.patch deleted file mode 100644 index 39412d61af2a29..00000000000000 --- a/srcpkgs/Haru/patches/unitialized-ptr_error.patch +++ /dev/null @@ -1,55 +0,0 @@ -From d2fd3a47686fe8f1c1263d5d8190b2ceb2f4327e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Viktor=20Szak=C3=A1ts?= -Date: Sat, 5 Oct 2013 00:51:03 +0200 -Subject: [PATCH 1/4] fixed potentially uninitialized ptr error - -also deleted two line ending spaces ---- - src/hpdf_image_png.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git src/hpdf_image_png.c src/hpdf_image_png.c -index 3a35f5c..3f20a77 100644 ---- a/src/hpdf_image_png.c -+++ b/src/hpdf_image_png.c -@@ -280,8 +280,8 @@ ReadTransparentPngData (HPDF_Dict image, - case PNG_COLOR_TYPE_RGB_ALPHA: - row_len = 3 * width * sizeof(png_byte); - for (j = 0; j < height; j++) { -+ row = row_ptr[j]; - for (i = 0; i < width; i++) { -- row = row_ptr[j]; - memmove(row + (3 * i), row + (4*i), 3); - smask_data[width * j + i] = row[4 * i + 3]; - } -@@ -295,8 +295,8 @@ ReadTransparentPngData (HPDF_Dict image, - case PNG_COLOR_TYPE_GRAY_ALPHA: - row_len = width * sizeof(png_byte); - for (j = 0; j < height; j++) { -+ row = row_ptr[j]; - for (i = 0; i < width; i++) { -- row = row_ptr[j]; - row[i] = row[2 * i]; - smask_data[width * j + i] = row[2 * i + 1]; - } -@@ -474,7 +474,7 @@ LoadPngData (HPDF_Dict image, - HPDF_Dict smask; - png_bytep smask_data; - -- if (!png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) || -+ if (!png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) || - !png_get_tRNS(png_ptr, info_ptr, &trans, &num_trans, NULL)) { - goto no_transparent_color_in_palette; - } -@@ -534,7 +534,7 @@ LoadPngData (HPDF_Dict image, - - no_transparent_color_in_palette: - -- /* read images with alpha channel right away -+ /* read images with alpha channel right away - we have to do this because image transparent mask must be added to the Xref */ - if (xref && PNG_COLOR_MASK_ALPHA & color_type) { - HPDF_Dict smask; --- -2.24.0 - diff --git a/srcpkgs/Haru/template b/srcpkgs/Haru/template index aa33ffdb4b1e08..efad53c631b797 100644 --- a/srcpkgs/Haru/template +++ b/srcpkgs/Haru/template @@ -1,24 +1,19 @@ # Template file for 'Haru' pkgname=Haru -version=2.3.0 -revision=3 -build_style=gnu-configure -hostmakedepends="automake libtool" +version=2.4.6 +revision=1 +build_style=cmake +configure_args="-DLIBHPDF_STATIC=OFF" makedepends="zlib-devel libpng-devel" short_desc="Free, cross platform, open source library for generating PDF files" maintainer="Orphaned " license="Zlib" homepage="http://libharu.org/" -distfiles="https://github.com/libharu/libharu/archive/RELEASE_${version//./_}.tar.gz" -checksum=8f9e68cc5d5f7d53d1bc61a1ed876add1faf4f91070dbc360d8b259f46d9a4d2 +distfiles="https://github.com/libharu/libharu/archive/refs/tags/v${version}.tar.gz" +checksum=ec8f327520d1d354ce58b5d2af75b64f380cddc522437c169463b39760921348 -if [ "$CROSS_BUILD" ]; then - configure_args="--with-zlib=${XBPS_CROSS_BASE}/usr" - configure_args+=" --with-png=${XBPS_CROSS_BASE}/usr" -fi - -pre_configure() { - make -f build.mk +post_install() { + vlicense LICENSE } Haru-devel_package() { @@ -26,7 +21,6 @@ Haru-devel_package() { depends="${sourcepkg}>=${version}_${revision}" pkg_install() { vmove usr/include - vmove "usr/lib/*.a" vmove usr/lib/libhpdf.so } } From 193ed97dcbc50ee0ab59cc6c7ba6edd372b23710 Mon Sep 17 00:00:00 2001 From: r0man1an Date: Sat, 27 Jun 2026 19:49:13 +0200 Subject: [PATCH 2/4] blender: rebuild for Haru-2.4.6 --- srcpkgs/blender/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template index f08a3386d351e3..345ffb452b5637 100644 --- a/srcpkgs/blender/template +++ b/srcpkgs/blender/template @@ -1,7 +1,7 @@ # Template file for 'blender' pkgname=blender version=5.0.0 -revision=1 +revision=2 archs="x86_64* aarch64* ppc64*" build_style=cmake build_helper="qemu numpy" From 395d04a9354bfa89ec68628da9bee7d5e1e51cdc Mon Sep 17 00:00:00 2001 From: r0man1an Date: Sat, 27 Jun 2026 19:51:00 +0200 Subject: [PATCH 3/4] plplot: rebuild for Haru-2.4.6 --- srcpkgs/plplot/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/plplot/template b/srcpkgs/plplot/template index da982b378ee401..1293d4b703c165 100644 --- a/srcpkgs/plplot/template +++ b/srcpkgs/plplot/template @@ -1,7 +1,7 @@ # Template file for 'plplot' pkgname=plplot version=5.15.0 -revision=8 +revision=9 build_style=cmake build_helper="qemu numpy" configure_args=" From 10e2fee5d97d85e77baf1ec31861b41148d95b4c Mon Sep 17 00:00:00 2001 From: r0man1an Date: Sat, 27 Jun 2026 19:52:30 +0200 Subject: [PATCH 4/4] wt: rebuild for Haru-2.4.6 --- srcpkgs/wt/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/wt/template b/srcpkgs/wt/template index 39140ba861eba2..8932fc36f12b79 100644 --- a/srcpkgs/wt/template +++ b/srcpkgs/wt/template @@ -1,7 +1,7 @@ # Template file for 'wt' pkgname=wt version=4.12.0 -revision=4 +revision=5 build_style=cmake configure_args="-DBUILD_EXAMPLES=OFF" makedepends="boost-devel-minimal libboost_thread libboost_filesystem