From caa4f9793f670c1ae67569ff8a7d731367fe35cb Mon Sep 17 00:00:00 2001 From: John Date: Thu, 12 Oct 2023 17:10:25 +0200 Subject: [PATCH 1/8] New package: immer-0.8.1 --- srcpkgs/immer/template | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 srcpkgs/immer/template diff --git a/srcpkgs/immer/template b/srcpkgs/immer/template new file mode 100644 index 0000000000000..f7a96c677c73a --- /dev/null +++ b/srcpkgs/immer/template @@ -0,0 +1,13 @@ +# Template file for 'immer' +pkgname=immer +version=0.8.1 +revision=1 +build_style=cmake +configure_args="-Dimmer_BUILD_TESTS=OFF -Dimmer_BUILD_EXAMPLES=OFF" +short_desc="Immutable and persistent data structures for C++" +maintainer="John " +license="BSL-1.0" +homepage="https://github.com/arximboldi/immer" +distfiles="https://github.com/arximboldi/immer/archive/refs/tags/v${version}.tar.gz" +checksum=de8411c84830864604bb685dc8f2e3c0dbdc40b95b2f6726092f7dcc85e75209 +make_check=no # Requires catch2 prior version 3 From 9ccf8238115bf672863bca4c4d59bb6e12cb97a7 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 12 Oct 2023 17:16:17 +0200 Subject: [PATCH 2/8] New package: lager-0.1.0 --- srcpkgs/lager/template | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 srcpkgs/lager/template diff --git a/srcpkgs/lager/template b/srcpkgs/lager/template new file mode 100644 index 0000000000000..e73ed87726466 --- /dev/null +++ b/srcpkgs/lager/template @@ -0,0 +1,13 @@ +# Template file for 'lager' +pkgname=lager +version=0.1.0 +revision=1 +build_style=cmake +configure_args="-Dlager_BUILD_TESTS=OFF -Dlager_BUILD_EXAMPLES=OFF" +short_desc="C++ library for value-oriented design using the unidirectional data-flow architecture — Redux for C++" +maintainer="John " +license="BSL-1.0" +homepage="https://sinusoid.es/lager/" +distfiles="https://github.com/arximboldi/lager/archive/refs/tags/v${version}.tar.gz" +checksum=bec57bddd16a35d8ebbba8b94ba90e3a7ba96d740da542025aea70c925ac8084 +make_check=no # Requires catch2 prior version 3 From 9e19bc5e57a094e27b38978cf69ae346c4ba3a47 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 12 Oct 2023 17:16:19 +0200 Subject: [PATCH 3/8] New package: zug-0.1.0 --- srcpkgs/zug/template | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 srcpkgs/zug/template diff --git a/srcpkgs/zug/template b/srcpkgs/zug/template new file mode 100644 index 0000000000000..a9ada4fcc5a54 --- /dev/null +++ b/srcpkgs/zug/template @@ -0,0 +1,12 @@ +# Template file for 'zug' +pkgname=zug +version=0.1.0 +revision=1 +build_style=cmake +short_desc="Transducers for C++ — Clojure style higher order push/pull sequence transformations" +maintainer="John " +license="BSL-1.0" +homepage="https://sinusoid.es/zug/" +distfiles="https://github.com/arximboldi/zug/archive/refs/tags/v${version}.tar.gz" +checksum=7d9d57a55399784392ba8fa67fcf246b9f5aec8f002c69e1fe4b5f66657214b8 +make_check=no # Requires catch2 prior version 3 From 902b17f7ca7e6c8a78fab578b36e5c241887d46a Mon Sep 17 00:00:00 2001 From: John Date: Thu, 12 Oct 2023 17:28:49 +0200 Subject: [PATCH 4/8] fbreader: rebuild against libunibreak-5.1_1 --- srcpkgs/fbreader/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/fbreader/template b/srcpkgs/fbreader/template index 52efa6fd72472..211d84e01a3b6 100644 --- a/srcpkgs/fbreader/template +++ b/srcpkgs/fbreader/template @@ -1,7 +1,7 @@ # Template file for 'fbreader' pkgname=fbreader version=0.99.4 -revision=4 +revision=5 build_style=gnu-makefile hostmakedepends="pkg-config qt5-host-tools" makedepends="fribidi-devel bzip2-devel expat-devel libcurl-devel From 9b4fe22950e28399698f0e388465361b08afd662 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 12 Oct 2023 17:29:15 +0200 Subject: [PATCH 5/8] libunibreak: update to 5.1. --- common/shlibs | 2 +- srcpkgs/libunibreak/template | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/shlibs b/common/shlibs index 050471e671604..bb14c2b3119ab 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2504,7 +2504,7 @@ libfixedfann.so.2 fann-2.2.0_1 libfann.so.2 fann-2.2.0_1 libdoublefann.so.2 fann-2.2.0_1 libxerces-c-3.2.so libxerces-c-3.2.0_1 -libunibreak.so.3 libunibreak-4.0_1 +libunibreak.so.5 libunibreak-5.1_1 libiperf.so.0 iperf3-3.1.1_1 libKF5UnitConversion.so.5 kunitconversion-5.26.0_1 libfdk-aac.so.2 fdk-aac-2.0.0_1 diff --git a/srcpkgs/libunibreak/template b/srcpkgs/libunibreak/template index b8bb602f3e167..2626b75ff51cd 100644 --- a/srcpkgs/libunibreak/template +++ b/srcpkgs/libunibreak/template @@ -1,6 +1,6 @@ # Template file for 'libunibreak' pkgname=libunibreak -version=4.3 +version=5.1 revision=1 build_style=gnu-configure hostmakedepends="automake libtool" @@ -9,7 +9,7 @@ maintainer="Orphaned " license="zlib-acknowledgement" homepage="https://github.com/adah1972/libunibreak" distfiles="https://github.com/adah1972/${pkgname}/archive/${pkgname}_${version/./_}.tar.gz" -checksum=68ec132550ee261a9d880b8bcad059d0d30035f4a9119975c30c0eff4fa309a7 +checksum=d59878d82c84a60b592940a8e1a264f0a9714f0a9a8868b099846f780d9dc167 pre_configure() { autoreconf -vfi From b8eadddfb2ff40aea89ab1ad5c5494936642f99a Mon Sep 17 00:00:00 2001 From: John Date: Thu, 12 Oct 2023 19:22:46 +0200 Subject: [PATCH 6/8] krita: update to 5.2.0 --- common/shlibs | 2 +- srcpkgs/krita/patches/libraw-0.21.patch | 28 ------------------------- srcpkgs/krita/template | 10 +++++---- 3 files changed, 7 insertions(+), 33 deletions(-) delete mode 100644 srcpkgs/krita/patches/libraw-0.21.patch diff --git a/common/shlibs b/common/shlibs index bb14c2b3119ab..cb2757a48ffa3 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3892,7 +3892,7 @@ libJudy.so.1 judy-1.0.5_1 libsignal-protocol-c.so.2 libsignal-protocol-c-2.3.3_2 libKSeExprUI.so.4 seexpr-krita-4.0.4.0_1 libKSeExpr.so.4 seexpr-krita-4.0.4.0_1 -libkritaqmicinterface.so.17 krita-5.0.0_1 +libkritaqmicinterface.so.19 krita-5.2.0_1 liburing.so.2 liburing-2.0_1 libbson-1.0.so.0 libbson-1.17.4_2 libsonic.so.0 libsonic-0.2.0_1 diff --git a/srcpkgs/krita/patches/libraw-0.21.patch b/srcpkgs/krita/patches/libraw-0.21.patch deleted file mode 100644 index fd2d40e5cc7bc..0000000000000 --- a/srcpkgs/krita/patches/libraw-0.21.patch +++ /dev/null @@ -1,28 +0,0 @@ -From e753d2453d1614b65b288e49fa5d5371764feaa8 Mon Sep 17 00:00:00 2001 -From: Antonio Rojas -Date: Sun, 18 Dec 2022 16:28:38 +0100 -Subject: [PATCH] Fix build with libraw 0.21 - ---- - plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw.cpp | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw.cpp b/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw.cpp -index dcaecc6fa71..71425f909c2 100644 ---- a/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw.cpp -+++ b/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw.cpp -@@ -383,7 +383,11 @@ bool KDcraw::extractRAWData(const QString& filePath, QByteArray& rawData, DcrawI - d->setProgress(0.3); - - raw.imgdata.params.output_bps = 16; -+#if LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 21) -+ raw.imgdata.rawparams.shot_select = shotSelect; -+#else - raw.imgdata.params.shot_select = shotSelect; -+#endif - ret = raw.unpack(); - - if (ret != LIBRAW_SUCCESS) --- -GitLab - diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template index 84a9ff309a54b..ae7479951c386 100644 --- a/srcpkgs/krita/template +++ b/srcpkgs/krita/template @@ -1,7 +1,7 @@ # Template file for 'krita' pkgname=krita -version=5.0.8 -revision=9 +version=5.2.0 +revision=1 build_style=cmake configure_args="-Wno-dev -DBUILD_TESTING=OFF" hostmakedepends="extra-cmake-modules gettext pkg-config python3 @@ -15,14 +15,15 @@ makedepends="karchive-devel kconfig-devel kwidgetsaddons-devel kcompletion-devel poppler-qt5-devel giflib-devel python3-devel python3-PyQt5 python3-PyQt5-devel quazip-devel libheif-devel seexpr-krita-devel libopenjpeg2-devel qt5-plugin-mysql qt5-plugin-sqlite qt5-plugin-odbc - qt5-plugin-pgsql qt5-plugin-tds libwebp-devel libmypaint-devel libjxl-devel" + qt5-plugin-pgsql qt5-plugin-tds libwebp-devel libmypaint-devel libjxl-devel + libkdcraw5-devel immer zug lager libunibreak-devel mlt7-devel xsimd" depends="qt5-plugin-sqlite" short_desc="Painting and image editing program" maintainer="John " license="GPL-3.0-only" homepage="https://krita.org/" distfiles="${KDE_SITE}/krita/${version}/krita-${version}.tar.xz" -checksum=4c221a3c7bbbb8d3297ffe9032c8946cbd835623f22b27f08f617aaa4e496083 +checksum=a3791a9cbb590d9964b45c0c1ed89c37d422e38606f70885f16de1ff2f645baf python_version=3 replaces="calligra-krita>=0" # FIXME @@ -37,6 +38,7 @@ pre_configure() { if [ "$CROSS_BUILD" ]; then configure_args+=" -D_find_sip_py=$wrksrc/cmake/modules/FindSIP.py" configure_args+=" -D_find_pyqt5_py=$wrksrc/cmake/modules/FindPyQt5.py" + configure_args+=" -DTIFF_CAN_WRITE_PSD_TAGS_EXITCODE=0" fi } From fd67d43cb1ba5ebc3ecdc81ff2f238e0234277c9 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 13 Oct 2023 19:21:21 +0200 Subject: [PATCH 7/8] fftw: fix cmake module --- srcpkgs/fftw/template | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fftw/template b/srcpkgs/fftw/template index 1eb5c61554fde..9ef60208a5b0c 100644 --- a/srcpkgs/fftw/template +++ b/srcpkgs/fftw/template @@ -1,8 +1,8 @@ # Template file for 'fftw' pkgname=fftw version=3.3.10 -revision=1 -hostmakedepends="libtool automake" +revision=2 +hostmakedepends="libtool automake cmake" makedepends="libgomp-devel" short_desc="Library for computing the discrete Fourier transform (DFT)" maintainer="Orphaned " @@ -37,6 +37,18 @@ do_configure() { mkdir ${wrksrc}/build-single cd ${wrksrc}/build-single ../configure ${configure_args} ${CARGS} --enable-float ${_sse} + + cd ${wrksrc} + # fix wrong soname in FFTW3LibraryDepends.cmake + vsed -e 's/3.6.9/3.6.10/' -i CMakeLists.txt + + # create missing FFTW3LibraryDepends.cmake + cmake -B build -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=None \ + -D ENABLE_OPENMP=ON -D ENABLE_THREADS=ON -D ENABLE_FLOAT=ON \ + -D ENABLE_LONG_DOUBLE=ON -D ENABLE_QUAD_PRECISION=ON -D ENABLE_SSE=ON \ + -D ENABLE_SSE2=ON -D ENABLE_AVX=ON -D ENABLE_AVX2=ON + # fix broken IMPORTED_LOCATION: https://github.com/FFTW/fftw3/issues/130#issuecomment-1030280157 + sed -e 's|\(IMPORTED_LOCATION_NONE\).*|\1 "/usr/lib/libfftw3.so.3"|' -i build/FFTW3LibraryDepends.cmake } do_build() { @@ -58,6 +70,7 @@ do_install() { cd ${wrksrc}/build-${f} make DESTDIR=${DESTDIR} install done + vinstall ${wrksrc}/build/FFTW3LibraryDepends.cmake 644 usr/lib/cmake/fftw3/ } libfftw_package() { From d2765b33ad73d9a6c40d4b38505b6fd291bdbc07 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 13 Oct 2023 20:20:46 +0200 Subject: [PATCH 8/8] New package: xsimd-11.1.0 --- srcpkgs/xsimd/template | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 srcpkgs/xsimd/template diff --git a/srcpkgs/xsimd/template b/srcpkgs/xsimd/template new file mode 100644 index 0000000000000..0edc9a91316a6 --- /dev/null +++ b/srcpkgs/xsimd/template @@ -0,0 +1,20 @@ +# Template file for 'xsimd' +pkgname=xsimd +version=11.1.0 +revision=1 +build_style=cmake +short_desc="C++ wrappers for SIMD intrinsics and parallelized, optimized mathematical functions" +maintainer="John " +license="BSD-3-Clause" +homepage="https://github.com/xtensor-stack/xsimd" +distfiles="https://github.com/xtensor-stack/xsimd/archive/refs/tags/${version}.tar.gz" +checksum=aa54dba8daade472656eba0d27154f072fec06ee3831aefcac69a5f6c7dbbae7 + +if [ -z "$CROSS_BUILD" ]; then + configure_args="-DBUILD_TESTS=ON" + makedepends="doctest-devel" +fi + +post_install() { + vlicense LICENSE +}