From 8d643c6fddaf029b045ddbe29e2f21ece1a7fd50 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Tue, 6 Apr 2021 20:11:23 +0200 Subject: [PATCH 001/152] cairo-dock-plugins: replace vte290 with vte3. --- srcpkgs/cairo-dock-plugins/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cairo-dock-plugins/template b/srcpkgs/cairo-dock-plugins/template index 7069ed9ed64..6bb439f1b5d 100644 --- a/srcpkgs/cairo-dock-plugins/template +++ b/srcpkgs/cairo-dock-plugins/template @@ -6,7 +6,7 @@ build_style=cmake hostmakedepends="gettext pkg-config" makedepends="alsa-lib-devel fftw-devel pulseaudio-devel libexif-devel libical-devel libxklavier-devel zeitgeist-devel libsensors-devel vala-devel - cairo-dock-devel gnome-menus-devel vte290-devel python3-devel upower-devel" + cairo-dock-devel gnome-menus-devel vte3-devel python3-devel upower-devel" depends="cairo-dock>=${version} upower" short_desc="Plugins for cairo-dock" maintainer="Orphaned " From 2c2b94c7d2a45e447a3e0fc26a85bfdcfc02dd51 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Tue, 6 Apr 2021 20:19:05 +0200 Subject: [PATCH 002/152] nemiver: replace vte290 with vte3. This commit also fixes issues with xlint. --- srcpkgs/nemiver/template | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/srcpkgs/nemiver/template b/srcpkgs/nemiver/template index 8c6f02c6b0c..947ef8352a1 100644 --- a/srcpkgs/nemiver/template +++ b/srcpkgs/nemiver/template @@ -1,22 +1,26 @@ -# Template build file for 'nemiver'. +# Template file for 'nemiver' pkgname=nemiver version=0.9.6 -revision=4 -lib32disabled=yes +revision=5 build_style=gnu-configure configure_args="--disable-static --enable-gsettings=yes --disable-schemas-install --disable-schemas-compile" -depends="gdb gsettings-desktop-schemas" -makedepends="boost-devel sqlite-devel libxml2-devel libgtop-devel ghex-devel - gtksourceviewmm-devel vte290-devel gsettings-desktop-schemas-devel - libgdlmm-devel" hostmakedepends="pkg-config gdb intltool itstool glib-devel" +makedepends="boost-devel sqlite-devel libxml2-devel libgtop-devel ghex-devel + gtksourceviewmm-devel vte3-devel gsettings-desktop-schemas-devel + libgdlmm-devel" +depends="gdb gsettings-desktop-schemas" short_desc="Graphical front-end for gdb" maintainer="Enno Boland " +license="GPL-2.0-only" homepage="https://wiki.gnome.org/Apps/Nemiver" -license="GPL-2" distfiles="https://download.gnome.org/sources/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" checksum=85ab8cf6c4f83262f441cb0952a6147d075c3c53d0687389a3555e946b694ef2 +lib32disabled=yes + +pre_configure() { + cp data/nemiver.appdata.xml data/nemiver.appdata.xml.in +} post_install() { rm -rf ${DESTDIR}/usr/include From 4cc38dccdff67958153dc79b74703b6416e8d5f9 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Tue, 6 Apr 2021 20:27:56 +0200 Subject: [PATCH 003/152] removed-packages: add vte290 --- srcpkgs/removed-packages/template | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 163647c10e4..7e5d660788a 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -1,7 +1,7 @@ # Template file for 'removed-packages' pkgname=removed-packages version=0.1 -revision=42 +revision=43 build_style=meta short_desc="Uninstalls packages removed from repository" maintainer="Piotr Wójcik " @@ -292,6 +292,8 @@ replaces=" vte<=0.28.2_16 vte-devel<=0.28.2_16 vte-python<=0.28.2_16 + vte290-devel<=0.36.5_5 + vte290<=0.36.5_5 wireguard-go<=0.0.20181222_2 wireshark-gtk<=3.0.7_1 libxnoise<=0.2.21_4 From c30d67d8139223e10a8dffba64db4531680aa3af Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Tue, 6 Apr 2021 20:29:44 +0200 Subject: [PATCH 004/152] vte290: removed, obsolete. use vte3 instead --- srcpkgs/vte290-devel | 1 - srcpkgs/vte290/template | 47 ----------------------------------------- srcpkgs/vte290/update | 2 -- 3 files changed, 50 deletions(-) delete mode 120000 srcpkgs/vte290-devel delete mode 100644 srcpkgs/vte290/template delete mode 100644 srcpkgs/vte290/update diff --git a/srcpkgs/vte290-devel b/srcpkgs/vte290-devel deleted file mode 120000 index 1c5ff05369a..00000000000 --- a/srcpkgs/vte290-devel +++ /dev/null @@ -1 +0,0 @@ -vte290 \ No newline at end of file diff --git a/srcpkgs/vte290/template b/srcpkgs/vte290/template deleted file mode 100644 index c030b2c06b4..00000000000 --- a/srcpkgs/vte290/template +++ /dev/null @@ -1,47 +0,0 @@ -# Template file for 'vte290' -pkgname=vte290 -version=0.36.5 -revision=5 -wrksrc=vte-${version} -build_style=gnu-configure -build_helper="gir" -configure_args="--with-gtk=3.0 --disable-gnome-pty-helper --disable-static - $(vopt_enable gir introspection) $(vopt_enable gir vala)" -hostmakedepends="glib-devel intltool pkg-config - $(vopt_if gir 'gobject-introspection vala-devel')" -makedepends="gtk+3-devel ncurses-devel" -short_desc="Terminal widget with improved accessibility and I18N support" -maintainer="Orphaned " -license="LGPL-2.1-or-later" -homepage="http://www.gnome.org" -distfiles="${GNOME_SITE}/vte/${version%.*}/vte-${version}.tar.xz" -checksum=c2c2ce9640f08b07667f1037862fe991081495446b735c0afb98f45e35b64edf - -# Fix musl build -CFLAGS="-D_GNU_SOURCE" -# Package build options -build_options="gir" -build_options_default="gir" - -post_patch() { - vsed -i -e "/DATADIRNAME=/s/=.*/=share/" configure -} - -post_install() { - # Rename conflicting file - mv ${DESTDIR}/etc/profile.d/{vte,vte290}.sh -} - -vte290-devel_package() { - depends="gtk+3-devel vte290>=${version}_${revision}" - short_desc+=" - development files" - pkg_install() { - vmove usr/include - vmove usr/lib/pkgconfig - vmove "usr/lib/*.so" - if [ "$build_option_gir" ]; then - vmove usr/share/gir-1.0 - fi - vmove usr/share/gtk-doc - } -} diff --git a/srcpkgs/vte290/update b/srcpkgs/vte290/update deleted file mode 100644 index d7d8a504da7..00000000000 --- a/srcpkgs/vte290/update +++ /dev/null @@ -1,2 +0,0 @@ -pkgname=vte -ignore="[!0].* 0.[!3]* 0.3[!6]*" From e49068331fc5259513916331c3b4010e4f204f97 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Fri, 16 Apr 2021 20:42:58 +0200 Subject: [PATCH 005/152] pugixml: update to 1.11.4. --- srcpkgs/pugixml/patches/pkg-config.patch | 18 ------------------ srcpkgs/pugixml/template | 6 +++--- 2 files changed, 3 insertions(+), 21 deletions(-) delete mode 100644 srcpkgs/pugixml/patches/pkg-config.patch diff --git a/srcpkgs/pugixml/patches/pkg-config.patch b/srcpkgs/pugixml/patches/pkg-config.patch deleted file mode 100644 index d021d58889f..00000000000 --- a/srcpkgs/pugixml/patches/pkg-config.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- CMakeLists.txt.bak 2017-09-30 16:33:46.956774231 +0200 -+++ CMakeLists.txt 2017-09-30 16:34:08.857775066 +0200 -@@ -52,7 +52,7 @@ - - if(BUILD_PKGCONFIG) - # Install library into its own directory under LIBDIR -- set(INSTALL_SUFFIX /pugixml-${PUGIXML_VERSION_STRING}) -+ # set(INSTALL_SUFFIX /pugixml-${PUGIXML_VERSION_STRING}) - endif() - - install(TARGETS pugixml EXPORT pugixml-config -@@ -75,4 +75,4 @@ - add_executable(check ${TEST_SOURCES}) - target_link_libraries(check pugixml) - add_custom_command(TARGET check POST_BUILD COMMAND check WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}) --endif() -\ No newline at end of file -+endif() diff --git a/srcpkgs/pugixml/template b/srcpkgs/pugixml/template index 4e0d5c256f2..45d0d36a67b 100644 --- a/srcpkgs/pugixml/template +++ b/srcpkgs/pugixml/template @@ -1,15 +1,15 @@ # Template file for 'pugixml' pkgname=pugixml -version=1.9 +version=1.11.4 revision=1 build_style=cmake -configure_args="-DBUILD_SHARED_LIBS=On -DBUILD_PKGCONFIG=On" +configure_args="-DBUILD_SHARED_LIBS=On" short_desc="Light-weight, simple and fast XML parser for C++ with XPath support" maintainer="Enno Boland " license="MIT" homepage="http://pugixml.org/" distfiles="http://github.com/zeux/pugixml/releases/download/v${version}/pugixml-${version}.tar.gz" -checksum=d156d35b83f680e40fd6412c4455fdd03544339779134617b9b28d19e11fdba6 +checksum=8ddf57b65fb860416979a3f0640c2ad45ddddbbafa82508ef0a0af3ce7061716 post_install() { tail -22 readme.txt > LICENSE From 5f73330e29981688068ede388830d3ee97add1fc Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 17 Apr 2021 10:46:05 +0200 Subject: [PATCH 006/152] New package: ptex-2.3.2 --- common/shlibs | 1 + srcpkgs/ptex-devel | 1 + srcpkgs/ptex/template | 29 +++++++++++++++++++++++++++++ 3 files changed, 31 insertions(+) create mode 120000 srcpkgs/ptex-devel create mode 100644 srcpkgs/ptex/template diff --git a/common/shlibs b/common/shlibs index 5f51c81f52b..a0ded246677 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2968,6 +2968,7 @@ libPocoRedis.so.64 poco-1.9.4_3 libPocoEncodings.so.64 poco-1.9.4_3 libPocoNetSSL.so.64 poco-1.9.4_3 libPocoCrypto.so.64 poco-1.9.4_3 +libPtex.so ptex-2.3.2_1 libopenblas.so.0 openblas-0.2.19_1 librtaudio.so.6 rtaudio-5.1.0_1 librtmidi.so.5 rtmidi-4.0.0_1 diff --git a/srcpkgs/ptex-devel b/srcpkgs/ptex-devel new file mode 120000 index 00000000000..43a4f13c2a2 --- /dev/null +++ b/srcpkgs/ptex-devel @@ -0,0 +1 @@ +ptex \ No newline at end of file diff --git a/srcpkgs/ptex/template b/srcpkgs/ptex/template new file mode 100644 index 00000000000..f6a5347ccb4 --- /dev/null +++ b/srcpkgs/ptex/template @@ -0,0 +1,29 @@ +# Template file for 'ptex' +pkgname=ptex +version=2.3.2 +revision=1 +build_style=cmake +configure_args="-DPTEX_VER=$version" +hostmakedepends="pkg-config" +makedepends="zlib-devel" +short_desc="Per-Face Texture Mapping for Production Rendering" +maintainer="Enno Boland " +license="BSD-3-Clause" +homepage="http://ptex.us/" +distfiles="https://github.com/wdas/ptex/archive/refs/tags/v${version}.tar.gz" +checksum=30aeb85b965ca542a8945b75285cd67d8e207d23dbb57fcfeaab587bb443402b + +post_install() { + sed '1,/\/\*/d;/\*\//,$d' src/ptex/PtexCache.h > LICENSE + vlicense LICENSE +} + +ptex-devel_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/share/cmake + vmove usr/include + vmove "usr/lib/*.a" + } +} From 95622a0f0168db9e4cf9bf6fb1ee2e4d8696a9f4 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 17 Apr 2021 11:52:02 +0200 Subject: [PATCH 007/152] New package: Field3D-1.7.3 --- common/shlibs | 1 + srcpkgs/Field3D-devel | 1 + srcpkgs/Field3D/template | 21 +++++++++++++++++++++ 3 files changed, 23 insertions(+) create mode 120000 srcpkgs/Field3D-devel create mode 100644 srcpkgs/Field3D/template diff --git a/common/shlibs b/common/shlibs index a0ded246677..41a310e34d4 100644 --- a/common/shlibs +++ b/common/shlibs @@ -412,6 +412,7 @@ libproxy.so.1 libproxy-0.4.6_1 libmoar.so MoarVM-2015.11_1 libFLAC.so.8 libflac-1.2.1_1 libFLAC++.so.6 libflac-1.2.1_1 +libField3D.so.1.7 Field3D-1.7.3_1 libMAC.so.6 libMAC-5.28_1 libmad.so.0 libmad-0.15.1b_1 libmatroska.so.7 libmatroska-1.6.0_1 diff --git a/srcpkgs/Field3D-devel b/srcpkgs/Field3D-devel new file mode 120000 index 00000000000..7482d5683e8 --- /dev/null +++ b/srcpkgs/Field3D-devel @@ -0,0 +1 @@ +Field3D \ No newline at end of file diff --git a/srcpkgs/Field3D/template b/srcpkgs/Field3D/template new file mode 100644 index 00000000000..a9791dbfde4 --- /dev/null +++ b/srcpkgs/Field3D/template @@ -0,0 +1,21 @@ +# Template file for 'Field3D' +pkgname=Field3D +version=1.7.3 +revision=1 +build_style=cmake +makedepends="boost-devel hdf5-devel ilmbase-devel" +short_desc="Library for storing voxel data on disk and in memory" +maintainer="Enno Boland " +license="GPL-3.0-or-later" +homepage="https://github.com/imageworks/Field3D/wiki/Field3D-Home" +distfiles="https://github.com/imageworks/Field3D/archive/refs/tags/v${version}.tar.gz" +checksum=b6168bc27abe0f5e9b8d01af7794b3268ae301ac72b753712df93125d51a0fd4 + +Field3D-devel_package() { + depends="${sourcepkg}>=${version}_${revision} $makedepends" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove "usr/lib/*.so" + } +} From 5a9466f3e3924ef762785e0f5c8a8aeaf88a7831 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Fri, 16 Apr 2021 21:18:16 +0200 Subject: [PATCH 008/152] openimageio: update to 2.2.13.1. --- common/shlibs | 4 +- .../patches/find-openexr-cmake.patch | 197 ------------------ .../openimageio/patches/fix-tiff-4.2.0.patch | 23 -- srcpkgs/openimageio/template | 19 +- 4 files changed, 13 insertions(+), 230 deletions(-) delete mode 100644 srcpkgs/openimageio/patches/find-openexr-cmake.patch delete mode 100644 srcpkgs/openimageio/patches/fix-tiff-4.2.0.patch diff --git a/common/shlibs b/common/shlibs index 41a310e34d4..d9dd3f1f347 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2164,8 +2164,8 @@ libgom-1.0.so.0 gom-0.3.0_1 libetpan.so.20 libetpan-1.9.3_4 libxmp.so.4 libxmp-4.3.7_1 libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1 -libOpenImageIO_Util.so.1.8 openimageio-1.8.12_1 -libOpenImageIO.so.1.8 openimageio-1.8.12_1 +libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1 +libOpenImageIO.so.2.2 openimageio-2.2.13.1_1 libOpenColorIO.so.1 opencolorio-1.0.8_1 libyaml-cpp.so.0.6 yaml-cpp-0.6.2_1 libpaper.so.1 libpaper-1.1.24_1 diff --git a/srcpkgs/openimageio/patches/find-openexr-cmake.patch b/srcpkgs/openimageio/patches/find-openexr-cmake.patch deleted file mode 100644 index c17c383371f..00000000000 --- a/srcpkgs/openimageio/patches/find-openexr-cmake.patch +++ /dev/null @@ -1,197 +0,0 @@ ---- src/cmake/modules/FindOpenEXR.cmake 2018-12-01 17:42:08.000000000 +0100 -+++ src/cmake/modules/FindOpenEXR.cmake 2019-12-02 21:37:56.477945777 +0100 -@@ -2,17 +2,12 @@ - # - # This module will set - # OPENEXR_FOUND true, if found --# OPENEXR_INCLUDE_DIR directory where headers are found -+# OPENEXR_INCLUDES directory where headers are found - # OPENEXR_LIBRARIES libraries for OpenEXR + IlmBase - # ILMBASE_LIBRARIES libraries just IlmBase - # OPENEXR_VERSION OpenEXR version (accurate for >= 2.0.0, - # otherwise will just guess 1.6.1) - # --# Special inputs: --# OPENEXR_CUSTOM_INCLUDE_DIR - custom location of headers --# OPENEXR_CUSTOM_LIB_DIR - custom location of libraries --# OPENEXR_CUSTOM_LIB_PREFIX - special snowflake library prefix --# OPENEXR_CUSTOM_LIB_SUFFIX - special snowflake library suffix - # - - # Other standard issue macros -@@ -30,18 +25,25 @@ - # Attempt to find OpenEXR with pkgconfig - find_package(PkgConfig) - if (PKG_CONFIG_FOUND) -- pkg_check_modules(_ILMBASE QUIET IlmBase) -- pkg_check_modules(_OPENEXR QUIET OpenEXR>=2.0.0) -+ if (NOT Ilmbase_ROOT AND NOT ILMBASE_ROOT -+ AND NOT DEFINED ENV{Ilmbase_ROOT} AND NOT DEFINED ENV{ILMBASE_ROOT}) -+ pkg_check_modules(_ILMBASE QUIET IlmBase>=2.0.0) -+ endif () -+ if (NOT OpenEXR_ROOT AND NOT OPENEXR_ROOT -+ AND NOT DEFINED ENV{OpenEXR_ROOT} AND NOT DEFINED ENV{OPENEXR_ROOT}) -+ pkg_check_modules(_OPENEXR QUIET OpenEXR>=2.0.0) -+ endif () - endif (PKG_CONFIG_FOUND) - - # List of likely places to find the headers -- note priority override of --# OPENEXR_CUSTOM_INCLUDE_DIR and ${OPENEXR_HOME}/include. -+# ${OPENEXR_ROOT}/include. - # ILMBASE is needed in case ilmbase an openexr are installed in separate - # directories, like NixOS does - set (GENERIC_INCLUDE_PATHS -- ${OPENEXR_CUSTOM_INCLUDE_DIR} -- ${OPENEXR_HOME}/include -- ${ILMBASE_HOME}/include -+ ${OPENEXR_ROOT}/include -+ $ENV{OPENEXR_ROOT}/include -+ ${ILMBASE_ROOT}/include -+ $ENV{ILMBASE_ROOT}/include - ${_ILMBASE_INCLUDEDIR} - ${_OPENEXR_INCLUDEDIR} - /usr/local/include -@@ -50,22 +52,19 @@ - /sw/include - /opt/local/include ) - --# Find the include file locations. We call find_path twice -- first using --# only the custom paths, then if that fails, try the default paths only. --# This seems to be the most robust way I can find to not get confused when --# both system and custom libraries are present. -+# Find the include file locations. - find_path (ILMBASE_INCLUDE_PATH OpenEXR/IlmBaseConfig.h -- PATHS ${GENERIC_INCLUDE_PATHS} NO_DEFAULT_PATH) --find_path (ILMBASE_INCLUDE_PATH OpenEXR/IlmBaseConfig.h) -+ HINTS ${ILMBASE_INCLUDE_DIR} ${OPENEXR_INCLUDE_DIR} -+ ${GENERIC_INCLUDE_PATHS} ) - find_path (OPENEXR_INCLUDE_PATH OpenEXR/OpenEXRConfig.h -- PATHS ${GENERIC_INCLUDE_PATHS} NO_DEFAULT_PATH) --find_path (OPENEXR_INCLUDE_PATH OpenEXR/OpenEXRConfig.h) -+ HINTS ${OPENEXR_INCLUDE_DIR} -+ ${GENERIC_INCLUDE_PATHS} ) - - # Try to figure out version number - if (DEFINED _OPENEXR_VERSION AND NOT "${_OPENEXR_VERSION}" STREQUAL "") - set (OPENEXR_VERSION "${_OPENEXR_VERSION}") -- string (REGEX REPLACE "([0-9]+)\\.[0-9]+" "\\1" OPENEXR_VERSION_MAJOR "${_OPENEXR_VERSION}") -- string (REGEX REPLACE "[0-9]+\\.([0-9]+)" "\\1" OPENEXR_VERSION_MINOR "${_OPENEXR_VERSION}") -+ string (REGEX REPLACE "([0-9]+)\\.[0-9\\.]+" "\\1" OPENEXR_VERSION_MAJOR "${_OPENEXR_VERSION}") -+ string (REGEX REPLACE "[0-9]+\\.([0-9]+)(\\.[0-9]+)?" "\\1" OPENEXR_VERSION_MINOR "${_OPENEXR_VERSION}") - elseif (EXISTS "${OPENEXR_INCLUDE_PATH}/OpenEXR/ImfMultiPartInputFile.h") - # Must be at least 2.0 - file(STRINGS "${OPENEXR_INCLUDE_PATH}/OpenEXR/OpenEXRConfig.h" TMP REGEX "^#define OPENEXR_VERSION_STRING .*$") -@@ -83,24 +82,10 @@ - - - # List of likely places to find the libraries -- note priority override of --# OPENEXR_CUSTOM_LIB_DIR and ${OPENEXR_HOME}/lib. -- --# If there's no OPENEXR_HOME or ILMBASE_HOME, then the path will point to --# "/lib", which may not always be wanted/expected. --if (OPENEXR_CUSTOM_LIB_DIR) -- set (GENERIC_LIBRARY_PATHS ${GENERIC_LIBRARY_PATHS} ${OPENEXR_CUSTOM_LIB_DIR}) --endif() -- --if (OPENEXR_HOME) -- set (GENERIC_LIBRARY_PATHS ${GENERIC_LIBRARY_PATHS} ${OPENEXR_HOME}) --endif() -- --if (ILMBASE_HOME) -- set (GENERIC_LIBRARY_PATHS ${GENERIC_LIBRARY_PATHS} ${ILMBASE_HOME}) --endif() -- -+# ${OPENEXR_ROOT}/lib. - set (GENERIC_LIBRARY_PATHS -- ${GENERIC_LIBRARY_PATHS} -+ ${OPENEXR_ROOT}/lib -+ ${ILMBASE_ROOT}/lib - ${OPENEXR_INCLUDE_PATH}/../lib - ${ILMBASE_INCLUDE_PATH}/../lib - ${_ILMBASE_LIBDIR} -@@ -113,6 +98,8 @@ - /opt/local/lib - $ENV{PROGRAM_FILES}/OpenEXR/lib/static ) - -+# message (STATUS "Generic lib paths: ${GENERIC_LIBRARY_PATHS}") -+ - # Handle request for static libs by altering CMAKE_FIND_LIBRARY_SUFFIXES. - # We will restore it at the end of this file. - set (_openexr_orig_suffixes ${CMAKE_FIND_LIBRARY_SUFFIXES}) -@@ -124,42 +111,19 @@ - endif () - endif () - --# Look for the libraries themselves, for all the components. Like with the --# headers, we do two finds -- first for custom locations, then for default. -+# Look for the libraries themselves, for all the components. - # This is complicated because the OpenEXR libraries may or may not be - # built with version numbers embedded. - set (_openexr_components IlmThread IlmImf Imath Iex Half) - foreach (COMPONENT ${_openexr_components}) - string (TOUPPER ${COMPONENT} UPPERCOMPONENT) - # First try with the version embedded -- set (FULL_COMPONENT_NAME ${OPENEXR_CUSTOM_LIB_PREFIX}${COMPONENT}-${OPENEXR_VERSION_MAJOR}_${OPENEXR_VERSION_MINOR}${OPENEXR_CUSTOM_LIB_SUFFIX}) -- find_library (OPENEXR_${UPPERCOMPONENT}_LIBRARY ${FULL_COMPONENT_NAME} -- PATHS ${GENERIC_LIBRARY_PATHS} NO_DEFAULT_PATH) -- # Again, with no directory restrictions -- find_library (OPENEXR_${UPPERCOMPONENT}_LIBRARY ${FULL_COMPONENT_NAME}) -- # Try again without the version -- set (FULL_COMPONENT_NAME ${OPENEXR_CUSTOM_LIB_PREFIX}${COMPONENT}${OPENEXR_CUSTOM_LIB_SUFFIX}) -- find_library (OPENEXR_${UPPERCOMPONENT}_LIBRARY ${FULL_COMPONENT_NAME} -- PATHS ${GENERIC_LIBRARY_PATHS} NO_DEFAULT_PATH) -- # One more time, with no restrictions -- find_library (OPENEXR_${UPPERCOMPONENT}_LIBRARY ${FULL_COMPONENT_NAME}) -+ find_library (OPENEXR_${UPPERCOMPONENT}_LIBRARY -+ NAMES ${COMPONENT}-${OPENEXR_VERSION_MAJOR}_${OPENEXR_VERSION_MINOR} -+ ${COMPONENT} -+ HINTS ${OPENEXR_LIBRARY_DIR} $ENV{OPENEXR_LIBRARY_DIR} -+ ${GENERIC_LIBRARY_PATHS} ) - endforeach () --#Half usually has no suffix --find_library (OPENEXR_HALF_LIBRARY ${OPENEXR_CUSTOM_LIB_PREFIX}Half -- PATHS ${GENERIC_LIBRARY_PATHS} NO_DEFAULT_PATH) --find_library (OPENEXR_HALF_LIBRARY ${OPENEXR_CUSTOM_LIB_PREFIX}Half) -- --# Set the FOUND, INCLUDE_DIR, and LIBRARIES variables. --if (ILMBASE_INCLUDE_PATH AND OPENEXR_INCLUDE_PATH AND -- OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND -- OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY) -- set (OPENEXR_FOUND TRUE) -- set (ILMBASE_FOUND TRUE) -- set (ILMBASE_INCLUDE_DIR ${ILMBASE_INCLUDE_PATH} CACHE STRING "The include paths needed to use IlmBase") -- set (OPENEXR_INCLUDE_DIR ${OPENEXR_INCLUDE_PATH} CACHE STRING "The include paths needed to use OpenEXR") -- set (ILMBASE_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY} ${OPENEXR_ILMTHREAD_LIBRARY} ${ILMBASE_PTHREADS} CACHE STRING "The libraries needed to use IlmBase") -- set (OPENEXR_LIBRARIES ${OPENEXR_ILMIMF_LIBRARY} ${ILMBASE_LIBRARIES} ${ZLIB_LIBRARIES} CACHE STRING "The libraries needed to use OpenEXR") --endif () - - find_package_handle_standard_args (OpenEXR - REQUIRED_VARS ILMBASE_INCLUDE_PATH OPENEXR_INCLUDE_PATH -@@ -168,11 +132,17 @@ - VERSION_VAR OPENEXR_VERSION - ) - --MARK_AS_ADVANCED( -- ILMBASE_INCLUDE_DIR -- OPENEXR_INCLUDE_DIR -- ILMBASE_LIBRARIES -- OPENEXR_LIBRARIES -+if (OPENEXR_FOUND) -+ set (ILMBASE_FOUND TRUE) -+ set (ILMBASE_INCLUDES ${ILMBASE_INCLUDE_PATH}) -+ set (OPENEXR_INCLUDES ${OPENEXR_INCLUDE_PATH}) -+ set (ILMBASE_INCLUDE_DIR ${ILMBASE_INCLUDE_PATH}) -+ set (OPENEXR_INCLUDE_DIR ${OPENEXR_INCLUDE_PATH}) -+ set (ILMBASE_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY} ${OPENEXR_ILMTHREAD_LIBRARY} ${ILMBASE_PTHREADS} CACHE STRING "The libraries needed to use IlmBase") -+ set (OPENEXR_LIBRARIES ${OPENEXR_ILMIMF_LIBRARY} ${ILMBASE_LIBRARIES} ${ZLIB_LIBRARIES} CACHE STRING "The libraries needed to use OpenEXR") -+endif () -+ -+mark_as_advanced( - OPENEXR_ILMIMF_LIBRARY - OPENEXR_IMATH_LIBRARY - OPENEXR_IEX_LIBRARY -@@ -181,3 +151,4 @@ - - # Restore the original CMAKE_FIND_LIBRARY_SUFFIXES - set (CMAKE_FIND_LIBRARY_SUFFIXES ${_openexr_orig_suffixes}) -+ diff --git a/srcpkgs/openimageio/patches/fix-tiff-4.2.0.patch b/srcpkgs/openimageio/patches/fix-tiff-4.2.0.patch deleted file mode 100644 index 20ba5792f7d..00000000000 --- a/srcpkgs/openimageio/patches/fix-tiff-4.2.0.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- src/libOpenImageIO/exif.cpp 2018-12-01 17:42:08.000000000 +0100 -+++ src/libOpenImageIO/exif.cpp 2021-01-16 13:30:01.747255896 +0100 -@@ -212,7 +212,7 @@ - }; - - -- -+#if !defined(GPSTAG_VERSIONID) - enum GPSTag { - GPSTAG_VERSIONID = 0, - GPSTAG_LATITUDEREF = 1, GPSTAG_LATITUDE = 2, -@@ -237,6 +237,11 @@ - GPSTAG_DIFFERENTIAL = 30, - GPSTAG_HPOSITIONINGERROR = 31 - }; -+#endif -+#if !defined(GPSTAG_HPOSITIONINGERROR) -+/* The tiff.h tag name differs from the one used here */ -+#define GPSTAG_HPOSITIONINGERROR GPSTAG_GPSHPOSITIONINGERROR -+#endif - - static const EXIF_tag_info gps_tag_table[] = { - { GPSTAG_VERSIONID, "GPS:VersionID", TIFF_BYTE, 4 }, diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template index bcab0e90b7d..3f35a3a98bb 100644 --- a/srcpkgs/openimageio/template +++ b/srcpkgs/openimageio/template @@ -1,22 +1,25 @@ # Template file for 'openimageio' pkgname=openimageio -version=1.8.17 -revision=3 +version=2.2.13.1 +revision=1 wrksrc="oiio-Release-${version}" build_style=cmake -configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=0 +configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1 -DSTOP_ON_WARNING=0 -DUSE_STD_REGEX_EXITCODE=0" -hostmakedepends="pkg-config" +hostmakedepends="pkg-config git" makedepends="boost-devel giflib-devel libraw-devel libopenjpeg-devel libwebp-devel libjpeg-turbo-devel tiff-devel libpng-devel libopenexr-devel freetype-devel - ffmpeg-devel opencolorio-devel" + ffmpeg-devel opencolorio-devel ptex-devel libheif-devel openvdb-devel + Field3D-devel" short_desc="Library for reading and writing images" maintainer="lemmi " -license="BSD" +license="BSD-3-Clause" homepage="https://sites.google.com/site/openimageio/home" changelog="https://raw.githubusercontent.com/OpenImageIO/oiio/release/CHANGES.md" distfiles="https://github.com/OpenImageIO/oiio/archive/Release-${version}.tar.gz" -checksum=a019086c05a6150d445a2240bab1723dff540dde5f5c327c36a97f0b5ae0e157 +checksum=7f810124e866ac14ad9c11b0ab528a6ed4c8e62a190cc44a77eed8159f57405c +# Runs checks even for features we disabled. +make_check=no CXXFLAGS="-faligned-new" case "$XBPS_TARGET_MACHINE" in @@ -48,7 +51,7 @@ pre_build() { } post_install() { - vlicense LICENSE + vlicense LICENSE.md LICENSE } openimageio-devel_package() { From 726149f2c23523175b7ff57952b8764212da2415 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Fri, 16 Apr 2021 20:31:28 +0200 Subject: [PATCH 009/152] blender: update to 2.92.0. --- .../{musl.patch => 0001-musl-fixes.patch} | 78 ++++++++----------- .../patches/0002-fix-linking-issue.patch | 25 ++++++ srcpkgs/blender/patches/altivec-all.patch | 32 -------- ...patch => no-Werror-double-promotion.patch} | 12 ++- srcpkgs/blender/patches/python39.patch | 25 ------ srcpkgs/blender/template | 15 +++- 6 files changed, 74 insertions(+), 113 deletions(-) rename srcpkgs/blender/patches/{musl.patch => 0001-musl-fixes.patch} (53%) create mode 100644 srcpkgs/blender/patches/0002-fix-linking-issue.patch delete mode 100644 srcpkgs/blender/patches/altivec-all.patch rename srcpkgs/blender/patches/{disable_werror.patch => no-Werror-double-promotion.patch} (51%) delete mode 100644 srcpkgs/blender/patches/python39.patch diff --git a/srcpkgs/blender/patches/musl.patch b/srcpkgs/blender/patches/0001-musl-fixes.patch similarity index 53% rename from srcpkgs/blender/patches/musl.patch rename to srcpkgs/blender/patches/0001-musl-fixes.patch index 5cfded1586d..0e64369b437 100644 --- a/srcpkgs/blender/patches/musl.patch +++ b/srcpkgs/blender/patches/0001-musl-fixes.patch @@ -1,46 +1,22 @@ -From 8f2b2e92ffdec658d4eb999f41acf6c74a5b32ed Mon Sep 17 00:00:00 2001 +Imported from https://git.alpinelinux.org/aports/plain/testing/blender/0001-musl-fixes.patch?id=42cee48643cb6ccc1a110e66446aa74408ee0160 +adapted to not use __MUSL__ definition + +From e530dc5b32695c208aa46bfe460ac7d76159a6d3 Mon Sep 17 00:00:00 2001 From: Leon Marz -Date: Tue, 1 Sep 2020 09:09:50 +0200 -Subject: [PATCH 1/2] musl fixes - -[ Taken from https://git.alpinelinux.org/aports/plain/testing/blender/0001-musl-fixes.patch ] - -Original Patch by Nathanael Copa +Date: Wed, 25 Nov 2020 10:10:41 +0100 +Subject: [PATCH 1/3] musl fixes +Original patch by Nathanael Copa --- - CMakeLists.txt | 13 +++++++++++++ - intern/guardedalloc/intern/mallocn_intern.h | 2 +- - intern/libc_compat/libc_compat.c | 2 -- - source/blender/blenlib/intern/system.c | 4 +++- - source/creator/creator_signals.c | 2 +- - 5 files changed, 18 insertions(+), 5 deletions(-) + intern/guardedalloc/intern/mallocn_intern.h | 2 +- + intern/libc_compat/libc_compat.c | 2 -- + source/blender/blenlib/intern/system.c | 4 +++- + source/blender/gpu/GPU_vertex_buffer.h | 1 - + source/creator/creator_signals.c | 2 +- + 5 files changed, 5 insertions(+), 6 deletions(-) -diff --git a/CMakeLists.txt b/CMakeLists.txt -index cee8675..111e6e3 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -138,6 +138,19 @@ get_blender_version() - #----------------------------------------------------------------------------- - # Options - -+# musl-libc related checks (missing execinfo.h and feenableexcept()) -+include(CheckIncludeFiles) -+check_include_files(execinfo.h HAVE_EXECINFO_H) -+if(HAVE_EXECINFO_H) -+ add_definitions(-DHAVE_EXECINFO_H) -+endif() -+ -+include(CheckLibraryExists) -+check_library_exists(m feenableexcept "fenv.h" HAVE_FEENABLEEXCEPT) -+if(HAVE_FEENABLEEXCEPT) -+ add_definitions(-DHAVE_FEENABLEEXCEPT) -+endif() -+ - # Blender internal features - option(WITH_BLENDER "Build blender (disable to build only the blender player)" ON) - mark_as_advanced(WITH_BLENDER) diff --git a/intern/guardedalloc/intern/mallocn_intern.h b/intern/guardedalloc/intern/mallocn_intern.h -index 8fc3e43..ee443c4 100644 +index aa95615..f7e347d 100644 --- a/intern/guardedalloc/intern/mallocn_intern.h +++ b/intern/guardedalloc/intern/mallocn_intern.h @@ -33,7 +33,7 @@ @@ -48,7 +24,7 @@ index 8fc3e43..ee443c4 100644 #define USE_MALLOC_USABLE_SIZE /* internal, when we have malloc_usable_size() */ -#if defined(__linux__) || (defined(__FreeBSD_kernel__) && !defined(__FreeBSD__)) || \ -+#if defined(__linux__) && defined(HAVE_EXECINFO_H) || (defined(__FreeBSD_kernel__) && !defined(__FreeBSD__)) || \ ++#if (defined(__FreeBSD_kernel__) && !defined(__FreeBSD__)) || \ defined(__GLIBC__) # include # define HAVE_MALLOC_STATS @@ -71,14 +47,14 @@ index 78e387e..d21c281 100644 -# endif /* __GLIBC_PREREQ */ #endif /* __linux__ */ diff --git a/source/blender/blenlib/intern/system.c b/source/blender/blenlib/intern/system.c -index 20edbb9..6e856cd 100644 +index 8e3d489..4d0789b 100644 --- a/source/blender/blenlib/intern/system.c +++ b/source/blender/blenlib/intern/system.c @@ -35,7 +35,9 @@ # include "BLI_winstuff.h" #else -+#if defined(HAVE_EXECINFO_H) ++#if defined(__GLIBC__) # include +#endif # include @@ -89,12 +65,24 @@ index 20edbb9..6e856cd 100644 /* ------------- */ /* Linux / Apple */ -# if defined(__linux__) || defined(__APPLE__) -+# if defined(__linux__) && defined(HAVE_EXECINFO_H) || defined(__APPLE__) ++# if defined(__linux__) && defined(__GLIBC__) || defined(__APPLE__) # define SIZE 100 void *buffer[SIZE]; +diff --git a/source/blender/gpu/GPU_vertex_buffer.h b/source/blender/gpu/GPU_vertex_buffer.h +index eeaebd3..93a77a2 100644 +--- a/source/blender/gpu/GPU_vertex_buffer.h ++++ b/source/blender/gpu/GPU_vertex_buffer.h +@@ -118,7 +118,6 @@ GPU_INLINE void *GPU_vertbuf_raw_step(GPUVertBufRaw *a) + { + unsigned char *data = a->data; + a->data += a->stride; +- BLI_assert(data < a->_data_end); + return (void *)data; + } + diff --git a/source/creator/creator_signals.c b/source/creator/creator_signals.c -index ad0b7b2..01d5e37 100644 +index 29e12a9..d90da8f 100644 --- a/source/creator/creator_signals.c +++ b/source/creator/creator_signals.c @@ -269,7 +269,7 @@ void main_signal_setup_fpe(void) @@ -102,10 +90,10 @@ index ad0b7b2..01d5e37 100644 signal(SIGFPE, sig_handle_fpe); -# if defined(__linux__) && defined(__GNUC__) -+# if defined(__linux__) && defined(__GNUC__) && defined(HAVE_FEENABLEEXCEPT) ++# if defined(__linux__) && defined(__GNUC__) && defined(__GLIBC__) feenableexcept(FE_DIVBYZERO | FE_INVALID | FE_OVERFLOW); # endif /* defined(__linux__) && defined(__GNUC__) */ # if defined(OSX_SSE_FPE) -- -2.28.0 +2.30.1 diff --git a/srcpkgs/blender/patches/0002-fix-linking-issue.patch b/srcpkgs/blender/patches/0002-fix-linking-issue.patch new file mode 100644 index 00000000000..28683714e12 --- /dev/null +++ b/srcpkgs/blender/patches/0002-fix-linking-issue.patch @@ -0,0 +1,25 @@ +Imported from https://git.alpinelinux.org/aports/plain/testing/blender/0002-fix-linking-issue.patch?id=42cee48643cb6ccc1a110e66446aa74408ee0160 + +From 54f5929131f537b6cbb74b5a7da45858cef6020b Mon Sep 17 00:00:00 2001 +From: Leon Marz +Date: Tue, 1 Sep 2020 09:11:18 +0200 +Subject: [PATCH 2/3] fix linking issue + +--- + intern/ghost/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt +index 1739659..d6b442b 100644 +--- a/intern/ghost/CMakeLists.txt ++++ b/intern/ghost/CMakeLists.txt +@@ -484,5 +484,5 @@ if(WITH_XR_OPENXR) + endif() + + add_definitions(${GL_DEFINITIONS}) +- ++list(APPEND LIB "-lX11" "-lXi" "-lXxf86vm" "-lXfixes" "-lXrender") + blender_add_lib(bf_intern_ghost "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") +-- +2.30.1 + diff --git a/srcpkgs/blender/patches/altivec-all.patch b/srcpkgs/blender/patches/altivec-all.patch deleted file mode 100644 index 115e1ea6fd0..00000000000 --- a/srcpkgs/blender/patches/altivec-all.patch +++ /dev/null @@ -1,32 +0,0 @@ -This applies a better workaround for C++ type conflicts -in AltiVec/C++, allowing it to build on BE ppc(64). - ---- a/extern/clew/include/clew.h -+++ b/extern/clew/include/clew.h -@@ -370,15 +370,18 @@ typedef unsigned int cl_GLenum; - - /* Define basic vector types */ - /* Workaround for ppc64el platform: conflicts with bool from C++. */ --#if defined( __VEC__ ) && !(defined(__PPC64__) && defined(__LITTLE_ENDIAN__)) -+#if defined(__VEC__) - #include /* may be omitted depending on compiler. AltiVec spec provides no way to detect whether the header is required. */ -- typedef vector unsigned char __cl_uchar16; -- typedef vector signed char __cl_char16; -- typedef vector unsigned short __cl_ushort8; -- typedef vector signed short __cl_short8; -- typedef vector unsigned int __cl_uint4; -- typedef vector signed int __cl_int4; -- typedef vector float __cl_float4; -+ #undef vector -+ #undef bool -+ #undef pixel -+ typedef __vector unsigned char __cl_uchar16; -+ typedef __vector signed char __cl_char16; -+ typedef __vector unsigned short __cl_ushort8; -+ typedef __vector signed short __cl_short8; -+ typedef __vector unsigned int __cl_uint4; -+ typedef __vector signed int __cl_int4; -+ typedef __vector float __cl_float4; - #define __CL_UCHAR16__ 1 - #define __CL_CHAR16__ 1 - #define __CL_USHORT8__ 1 diff --git a/srcpkgs/blender/patches/disable_werror.patch b/srcpkgs/blender/patches/no-Werror-double-promotion.patch similarity index 51% rename from srcpkgs/blender/patches/disable_werror.patch rename to srcpkgs/blender/patches/no-Werror-double-promotion.patch index 9fada907e1c..2d17a6da181 100644 --- a/srcpkgs/blender/patches/disable_werror.patch +++ b/srcpkgs/blender/patches/no-Werror-double-promotion.patch @@ -1,13 +1,11 @@ -diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt -index f22688f..c32aad1 100644 ---- a/intern/cycles/CMakeLists.txt -+++ b/intern/cycles/CMakeLists.txt -@@ -227,8 +227,6 @@ endif() - +--- ./intern/cycles/CMakeLists.txt.orig 2021-04-16 20:47:50.466754473 +0200 ++++ ./intern/cycles/CMakeLists.txt 2021-04-16 20:48:06.199903232 +0200 +@@ -336,7 +336,7 @@ endif() # Warnings if(CMAKE_COMPILER_IS_GNUCXX) -- ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS _has_cxxflag_float_conversion "-Werror=float-conversion") + ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS _has_cxxflag_float_conversion "-Werror=float-conversion") - ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS _has_cxxflag_double_promotion "-Werror=double-promotion") ++ #ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS _has_cxxflag_double_promotion "-Werror=double-promotion") ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS _has_no_error_unused_macros "-Wno-error=unused-macros") unset(_has_cxxflag_float_conversion) unset(_has_cxxflag_double_promotion) diff --git a/srcpkgs/blender/patches/python39.patch b/srcpkgs/blender/patches/python39.patch deleted file mode 100644 index 1e14eb06203..00000000000 --- a/srcpkgs/blender/patches/python39.patch +++ /dev/null @@ -1,25 +0,0 @@ -The deprecated PyEval_ReleaseLock() triggers a segfault with Python 3.9.0. -See issue at https://developer.blender.org/T81688 and fix at -https://developer.blender.org/rB5edba9b42f684bf8b99894bb6988e7f46180e12c - ---- a/source/blender/python/generic/bpy_threads.c 2020-10-13 15:29:16.708347045 -0400 -+++ b/source/blender/python/generic/bpy_threads.c 2020-10-13 15:29:43.123345331 -0400 -@@ -29,14 +29,11 @@ - /* analogue of PyEval_SaveThread() */ - BPy_ThreadStatePtr BPY_thread_save(void) - { -- PyThreadState *tstate = PyThreadState_Swap(NULL); -- /* note: tstate can be NULL when quitting Blender */ -- -- if (tstate && PyEval_ThreadsInitialized()) { -- PyEval_ReleaseLock(); -+ /* The thread-state can be NULL when quitting Blender. */ -+ if (_PyThreadState_UncheckedGet()) { -+ return (BPy_ThreadStatePtr)PyEval_SaveThread(); - } -- -- return (BPy_ThreadStatePtr)tstate; -+ return NULL; - } - - /* analogue of PyEval_RestoreThread() */ diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template index 01b3677ff4f..5daa3ce0b4a 100644 --- a/srcpkgs/blender/template +++ b/srcpkgs/blender/template @@ -1,7 +1,7 @@ # Template file for 'blender' pkgname=blender -version=2.90.1 -revision=2 +version=2.92.0 +revision=1 archs="x86_64* ppc64*" build_style="cmake" pycompile_dirs="/usr/share/blender/${version%.*}/scripts" @@ -18,16 +18,23 @@ makedepends="libgomp-devel libpng-devel tiff-devel python3-devel glu-devel libsamplerate-devel ffmpeg-devel fftw-devel boost-devel pcre-devel llvm libopenexr-devel libopenjpeg2-devel libXi-devel openimageio-devel opencolorio-devel opencollada-devel python3-numpy libXrender-devel - OpenSubdiv-devel tbb-devel libxml2-devel openvdb-devel alembic-devel" + OpenSubdiv-devel tbb-devel libxml2-devel openvdb-devel alembic-devel + pugixml-devel" depends="desktop-file-utils hicolor-icon-theme" short_desc="3D graphics creation suite" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="http://www.blender.org" distfiles="http://download.blender.org/source/${pkgname}-${version}.tar.xz" -checksum=e78dcc946c823ad1bd89bcc6938fc6b375540ec3eff58649586acf1f6a653d99 +checksum=e791cfc403292383577c3c8ce2cd34e5aa2cd8da0a7483041049a1609ddb4595 python_version=3 +CXXFLAGS="-DNDEBUG" +CFLAGS="$CXXFLAGS" +LDFLAGS="-Wl,-z,stack-size=2097152" patch_args="-Np1" +# Blender tests are executed against a system installation of blender. This +# is currently not supported by xbps-src. +make_check=no case "$XBPS_TARGET_MACHINE" in *-musl) ;; From c4aac46536d3f49eb97f140c49ec3634d9dba1af Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Tue, 20 Apr 2021 09:58:40 +0200 Subject: [PATCH 010/152] libodfgen: update to 0.1.8. --- srcpkgs/libodfgen/template | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/srcpkgs/libodfgen/template b/srcpkgs/libodfgen/template index 0f9c18e30f8..2455f64ddc8 100644 --- a/srcpkgs/libodfgen/template +++ b/srcpkgs/libodfgen/template @@ -1,17 +1,17 @@ # Template file for 'libodfgen' pkgname=libodfgen -version=0.1.7 -revision=2 +version=0.1.8 +revision=1 build_style=gnu-configure configure_args="--enable-debug" -makedepends="boost-devel librevenge-devel" hostmakedepends="pkg-config" +makedepends="boost-devel librevenge-devel libxml2-devel" short_desc="Library for generating documents in Open Document Format" maintainer="Enno Boland " license="LGPL-2.1-or-later, MPL-2.0" homepage="http://sourceforge.net/p/libwpd/libodfgen/" distfiles="${SOURCEFORGE_SITE}/libwpd/${pkgname}/${pkgname}-${version}/${pkgname}-${version}.tar.xz" -checksum=323e491f956c8ca2abb12c998e350670930a32317bf9662b0615dd4b3922b831 +checksum=55200027fd46623b9bdddd38d275e7452d1b0ff8aeddcad6f9ae6dc25f610625 libodfgen-devel_package() { depends="libodfgen>=${version}_${revision} $makedepends" @@ -22,4 +22,3 @@ libodfgen-devel_package() { vmove "usr/lib/*.so" } } - From 17f22d773b98fa9cb6ddfb530db2e8b53b320f5f Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Mon, 19 Apr 2021 12:36:23 +0200 Subject: [PATCH 011/152] k3b: update to 20.12.3. --- srcpkgs/k3b/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template index 25d781a56bd..9bc0a6edf44 100644 --- a/srcpkgs/k3b/template +++ b/srcpkgs/k3b/template @@ -1,6 +1,6 @@ # Template file for 'k3b' pkgname=k3b -version=20.12.2 +version=20.12.3 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules pkg-config qt5-qmake gettext @@ -15,4 +15,4 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://kde.org/applications/en/multimedia/org.kde.k3b" distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz" -checksum=8fa4def0d8c4c62b6860ffe5ca0e67a121d94ef99823465e5b7a5a7345460f3f +checksum=88e8d3410748e11c77755f5e7b577afb34d1c4d99e529dcc5ab9b663992c5b8c From 9a9b33819e1f2267af6f0438f4b4700a61f10b7b Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Tue, 20 Apr 2021 12:13:25 +0200 Subject: [PATCH 012/152] bpftrace: update to 0.12.1. --- srcpkgs/bpftrace/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/bpftrace/template b/srcpkgs/bpftrace/template index f8357249eec..2576fb5a455 100644 --- a/srcpkgs/bpftrace/template +++ b/srcpkgs/bpftrace/template @@ -1,6 +1,6 @@ # Template file for 'bpftrace' pkgname=bpftrace -version=0.12.0 +version=0.12.1 revision=1 archs="x86_64* aarch64* ppc64*" build_style=cmake @@ -12,7 +12,7 @@ maintainer="Leah Neukirchen " license="Apache-2.0" homepage="https://github.com/iovisor/bpftrace/" distfiles="https://github.com/iovisor/bpftrace/archive/v${version}.tar.gz" -checksum=8752c9eac8d9ab16d2227bb68f1d723ec83310895ab6f503ab6cfcf8b193acc0 +checksum=523c0353c9e508f23d50d3e2b65b09997d10750c3828f369e979759610b71caa post_install() { # clashes with bcc-tools From a98064e5665662a4bc13487bec0db9e4ec50f88f Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Tue, 20 Apr 2021 12:13:59 +0200 Subject: [PATCH 013/152] python3-argcomplete: update to 1.12.3. --- srcpkgs/python3-argcomplete/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-argcomplete/template b/srcpkgs/python3-argcomplete/template index 4a56b0daba1..3fd7daf0f85 100644 --- a/srcpkgs/python3-argcomplete/template +++ b/srcpkgs/python3-argcomplete/template @@ -1,6 +1,6 @@ # Template file for 'python3-argcomplete' pkgname=python3-argcomplete -version=1.12.2 +version=1.12.3 revision=1 wrksrc="argcomplete-${version}" build_style=python3-module @@ -10,4 +10,4 @@ maintainer="Leah Neukirchen " license="Apache-2.0" homepage="https://github.com/kislyuk/argcomplete" distfiles="${PYPI_SITE}/a/argcomplete/argcomplete-${version}.tar.gz" -checksum=de0e1282330940d52ea92a80fea2e4b9e0da1932aaa570f84d268939d1897b04 +checksum=2c7dbffd8c045ea534921e63b0be6fe65e88599990d8dc408ac8c542b72a5445 From bd2ef0e9c558cf8061db5475f3e0015c9def477c Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Tue, 20 Apr 2021 12:15:26 +0200 Subject: [PATCH 014/152] virt-what: update to 1.21. --- srcpkgs/virt-what/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/virt-what/template b/srcpkgs/virt-what/template index ee3ad8b04b0..6403a915bec 100644 --- a/srcpkgs/virt-what/template +++ b/srcpkgs/virt-what/template @@ -1,6 +1,6 @@ # Template file for 'virt-what' pkgname=virt-what -version=1.20 +version=1.21 revision=1 build_style=gnu-configure short_desc="Detect when running in a virtual machine" @@ -8,4 +8,4 @@ maintainer="Leah Neukirchen " license="GPL-2.0-or-later" homepage="https://people.redhat.com/~rjones/virt-what/" distfiles="https://people.redhat.com/~rjones/${pkgname}/files/${pkgname}-${version}.tar.gz" -checksum=f913dcd29add5121e3ffc0f2d0f17e19ff3183e8ab8ca417a5b6be43787910e8 +checksum=12cb455334aa4cfd53ab78f27e2252e94d1f676dd093f48327ed94d8080d1f7b From bf3ccf4ccf2c9c29bf87fd049543895d685245e2 Mon Sep 17 00:00:00 2001 From: Michael Taboada Date: Tue, 20 Apr 2021 02:16:43 -0700 Subject: [PATCH 015/152] gst-plugins-ugly1: Fix not building 32bit package --- srcpkgs/gst-plugins-ugly1/template | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/srcpkgs/gst-plugins-ugly1/template b/srcpkgs/gst-plugins-ugly1/template index 9e403f826de..09c5eeceabf 100644 --- a/srcpkgs/gst-plugins-ugly1/template +++ b/srcpkgs/gst-plugins-ugly1/template @@ -1,7 +1,7 @@ # Template file for 'gst-plugins-ugly1' pkgname=gst-plugins-ugly1 version=1.18.4 -revision=1 +revision=2 wrksrc="${pkgname/1/}-${version}" build_style=meson configure_args="-Damrnb=disabled -Damrwbdec=disabled -Dsidplay=disabled" @@ -17,4 +17,3 @@ license="LGPL-2.1-or-later" homepage="https://gstreamer.freedesktop.org" distfiles="${homepage}/src/${pkgname/1/}/${pkgname/1/}-${version}.tar.xz" checksum=218df0ce0d31e8ca9cdeb01a3b0c573172cc9c21bb3d41811c7820145623d13c -lib32disabled=yes From 776305912b121bd4cdf052e2d329741be40c7e6d Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Tue, 20 Apr 2021 15:42:33 +0200 Subject: [PATCH 016/152] blender: add patch that misses --- srcpkgs/blender/patches/altivec-all.patch | 32 +++++++++++++++++++++++ srcpkgs/blender/template | 2 +- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/blender/patches/altivec-all.patch diff --git a/srcpkgs/blender/patches/altivec-all.patch b/srcpkgs/blender/patches/altivec-all.patch new file mode 100644 index 00000000000..115e1ea6fd0 --- /dev/null +++ b/srcpkgs/blender/patches/altivec-all.patch @@ -0,0 +1,32 @@ +This applies a better workaround for C++ type conflicts +in AltiVec/C++, allowing it to build on BE ppc(64). + +--- a/extern/clew/include/clew.h ++++ b/extern/clew/include/clew.h +@@ -370,15 +370,18 @@ typedef unsigned int cl_GLenum; + + /* Define basic vector types */ + /* Workaround for ppc64el platform: conflicts with bool from C++. */ +-#if defined( __VEC__ ) && !(defined(__PPC64__) && defined(__LITTLE_ENDIAN__)) ++#if defined(__VEC__) + #include /* may be omitted depending on compiler. AltiVec spec provides no way to detect whether the header is required. */ +- typedef vector unsigned char __cl_uchar16; +- typedef vector signed char __cl_char16; +- typedef vector unsigned short __cl_ushort8; +- typedef vector signed short __cl_short8; +- typedef vector unsigned int __cl_uint4; +- typedef vector signed int __cl_int4; +- typedef vector float __cl_float4; ++ #undef vector ++ #undef bool ++ #undef pixel ++ typedef __vector unsigned char __cl_uchar16; ++ typedef __vector signed char __cl_char16; ++ typedef __vector unsigned short __cl_ushort8; ++ typedef __vector signed short __cl_short8; ++ typedef __vector unsigned int __cl_uint4; ++ typedef __vector signed int __cl_int4; ++ typedef __vector float __cl_float4; + #define __CL_UCHAR16__ 1 + #define __CL_CHAR16__ 1 + #define __CL_USHORT8__ 1 diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template index 5daa3ce0b4a..e480e63b8aa 100644 --- a/srcpkgs/blender/template +++ b/srcpkgs/blender/template @@ -1,7 +1,7 @@ # Template file for 'blender' pkgname=blender version=2.92.0 -revision=1 +revision=2 archs="x86_64* ppc64*" build_style="cmake" pycompile_dirs="/usr/share/blender/${version%.*}/scripts" From f33e443914285eb474597f431fde651084b58d30 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Tue, 20 Apr 2021 09:12:48 -0500 Subject: [PATCH 017/152] nvidia390: update to 390.143. --- common/shlibs | 2 +- srcpkgs/nvidia390/files/linux-5.11.patch | 348 ----------------------- srcpkgs/nvidia390/template | 9 +- 3 files changed, 5 insertions(+), 354 deletions(-) delete mode 100644 srcpkgs/nvidia390/files/linux-5.11.patch diff --git a/common/shlibs b/common/shlibs index d9dd3f1f347..b1e6ecdedf7 100644 --- a/common/shlibs +++ b/common/shlibs @@ -133,7 +133,7 @@ libnvidia-gtk2.so.346.47 nvidia-gtklibs-346.47_1 ignore libnvidia-gtk3.so.346.47 nvidia-gtklibs-346.47_1 ignore libnvidia-glcore.so.390.87 nvidia390-libs-390.87_1 ignore libnvidia-glsi.so.346.72 nvidia-libs-346.72_1 ignore -libnvidia-fatbinaryloader.so.390.141 nvidia390-libs-390.141_1 ignore +libnvidia-fatbinaryloader.so.390.143 nvidia390-libs-390.143_1 ignore libnvidia-fatbinaryloader.so.430.40 nvidia-libs-430.40_1 ignore libglapi.so.0 libglapi-7.11_1 libgbm.so.1 libgbm-9.0_1 diff --git a/srcpkgs/nvidia390/files/linux-5.11.patch b/srcpkgs/nvidia390/files/linux-5.11.patch deleted file mode 100644 index f08c8fcad1e..00000000000 --- a/srcpkgs/nvidia390/files/linux-5.11.patch +++ /dev/null @@ -1,348 +0,0 @@ -Adapted by Ike Devolder: -https://gitlab.com/herecura/packages/nvidia-390xx-dkms/-/blob/herecura/linux-5.11.patch - -from Joan Bruguera's patch for 460xx: -https://gist.github.com/joanbm/cf75fc567aef271c830a0fcdfc25a94a - -diff --git a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h -index 0d7e516..dae9c09 100644 ---- a/kernel/common/inc/nv-linux.h -+++ b/kernel/common/inc/nv-linux.h -@@ -115,7 +115,9 @@ - - #include /* module_param() */ - #include /* flush_tlb(), flush_tlb_all() */ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0)) - #include /* page table entry lookup */ -+#endif - - #include /* pci_find_class, etc */ - #include /* tasklets, interrupt helpers */ -diff --git a/kernel/conftest.sh b/kernel/conftest.sh -index 23aca36..cc9543b 100755 ---- a/kernel/conftest.sh -+++ b/kernel/conftest.sh -@@ -1729,6 +1729,8 @@ compile_test() { - # Determine if the DRM subsystem is usable - # - CODE=" -+ #include -+ - #if defined(NV_DRM_DRMP_H_PRESENT) - #include - #endif -@@ -1737,6 +1739,10 @@ compile_test() { - #include - #endif - -+ #if defined(NV_DRM_DRM_GEM_H_PRESENT) -+ #include -+ #endif -+ - #if defined(NV_DRM_DRM_PRIME_H_PRESENT) - #include - #endif -@@ -1746,13 +1752,22 @@ compile_test() { - #endif - - void conftest_drm_available(void) { -- struct drm_driver drv; - - /* 2013-01-15 89177644a7b6306e6084a89eab7e290f4bfef397 */ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0)) -+ // Avoid failure due to all the changes in torvalds/linux commit d693def4fd1c23f1ca5aed1afb9993b3a2069ad2 -+ struct drm_driver drv; - drv.gem_prime_pin = 0; - drv.gem_prime_get_sg_table = 0; - drv.gem_prime_vmap = 0; - drv.gem_prime_vunmap = 0; -+#else -+ struct drm_gem_object_funcs gem; -+ gem.pin = 0; -+ gem.get_sg_table = 0; -+ gem.vmap = 0; -+ gem.vunmap = 0; -+#endif - (void)drm_gem_prime_import; - (void)drm_gem_prime_export; - -diff --git a/kernel/nvidia-drm/nvidia-drm-crtc.c b/kernel/nvidia-drm/nvidia-drm-crtc.c -index 780df0e..35eb1e4 100644 ---- a/kernel/nvidia-drm/nvidia-drm-crtc.c -+++ b/kernel/nvidia-drm/nvidia-drm-crtc.c -@@ -20,6 +20,7 @@ - * DEALINGS IN THE SOFTWARE. - */ - -+#include - #include "nvidia-drm-conftest.h" /* NV_DRM_ATOMIC_MODESET_AVAILABLE */ - - #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE) -@@ -336,9 +337,19 @@ static int head_modeset_config_attach_connector( - * the 'nv_drm_crtc_state::req_config', that is fine becase 'nv_drm_crtc_state' - * will be discarded if ->atomic_check() fails. - */ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0)) - static int nv_drm_crtc_atomic_check(struct drm_crtc *crtc, - struct drm_crtc_state *crtc_state) -+#else -+// Changes in torvalds/linux commit d693def4fd1c23f1ca5aed1afb9993b3a2069ad2 -+static int nv_drm_crtc_atomic_check(struct drm_crtc *crtc, -+ struct drm_atomic_state *atomic_state) -+#endif - { -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 11, 0)) -+ // Changes in torvalds/linux commit d693def4fd1c23f1ca5aed1afb9993b3a2069ad2 -+ struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(atomic_state, crtc); -+#endif - struct nv_drm_crtc_state *nv_crtc_state = to_nv_crtc_state(crtc_state); - struct NvKmsKapiHeadRequestedConfig *req_config = - &nv_crtc_state->req_config; -@@ -408,8 +419,14 @@ static void nv_drm_crtc_disable(struct drm_crtc *crtc) - } - - #ifdef NV_DRM_CRTC_HELPER_FUNCS_HAS_ATOMIC_ENABLE -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0)) - static void nv_drm_crtc_atomic_enable(struct drm_crtc *crtc, - struct drm_crtc_state *old_crtc_state) -+#else -+// Changes in torvalds/linux commit d693def4fd1c23f1ca5aed1afb9993b3a2069ad2 -+static void nv_drm_crtc_atomic_enable(struct drm_crtc *crtc, -+ struct drm_atomic_state *old_atomic_state) -+#endif - { - - } -diff --git a/kernel/nvidia-drm/nvidia-drm-drv.c b/kernel/nvidia-drm/nvidia-drm-drv.c -index 1b4cc6d..0c26646 100644 ---- a/kernel/nvidia-drm/nvidia-drm-drv.c -+++ b/kernel/nvidia-drm/nvidia-drm-drv.c -@@ -20,6 +20,7 @@ - * DEALINGS IN THE SOFTWARE. - */ - -+#include - #include "nvidia-drm-conftest.h" /* NV_DRM_AVAILABLE and NV_DRM_DRM_GEM_H_PRESENT */ - - #include "nvidia-drm-priv.h" -@@ -700,10 +701,13 @@ static struct drm_driver nv_drm_driver = { - .num_ioctls = ARRAY_SIZE(nv_drm_ioctls), - - .prime_handle_to_fd = drm_gem_prime_handle_to_fd, -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0)) -+ // Deprecated in favour of equivalent in drm_get_object in torvalds/linux commit d693def4fd1c23f1ca5aed1afb9993b3a2069ad2 - .gem_prime_export = nv_drm_gem_prime_export, - .gem_prime_get_sg_table = nv_drm_gem_prime_get_sg_table, - .gem_prime_vmap = nv_drm_gem_prime_vmap, - .gem_prime_vunmap = nv_drm_gem_prime_vunmap, -+#endif - - #if defined(NV_DRM_DRIVER_HAS_GEM_PRIME_RES_OBJ) - .gem_prime_res_obj = nv_drm_gem_prime_res_obj, -@@ -727,11 +731,14 @@ static struct drm_driver nv_drm_driver = { - .desc = "NVIDIA DRM driver", - .date = "20160202", - -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0)) -+ // This is now behind a CONFIG_DRM_LEGACY Kconfig flag.(torvalds/linux commit 57bb1ee6034046be70aed33fd6d447bb2b7261fa) - #if defined(NV_DRM_DRIVER_HAS_LEGACY_DEV_LIST) - .legacy_dev_list = LIST_HEAD_INIT(nv_drm_driver.legacy_dev_list), - #else - .device_list = LIST_HEAD_INIT(nv_drm_driver.device_list), - #endif -+#endif - }; - - -@@ -758,8 +765,6 @@ static void nv_drm_update_drm_driver_features(void) - nv_drm_driver.dumb_create = nv_drm_dumb_create; - nv_drm_driver.dumb_map_offset = nv_drm_dumb_map_offset; - nv_drm_driver.dumb_destroy = drm_gem_dumb_destroy; -- -- nv_drm_driver.gem_vm_ops = &nv_drm_gem_vma_ops; - #endif /* NV_DRM_ATOMIC_MODESET_AVAILABLE */ - } - -diff --git a/kernel/nvidia-drm/nvidia-drm-gem-user-memory.c b/kernel/nvidia-drm/nvidia-drm-gem-user-memory.c -index 4ac4559..28ef84c 100644 ---- a/kernel/nvidia-drm/nvidia-drm-gem-user-memory.c -+++ b/kernel/nvidia-drm/nvidia-drm-gem-user-memory.c -@@ -20,6 +20,7 @@ - * DEALINGS IN THE SOFTWARE. - */ - -+#include - #include "nvidia-drm-conftest.h" - - #if defined(NV_DRM_AVAILABLE) -@@ -32,6 +33,8 @@ - #include "nvidia-drm-helper.h" - #include "nvidia-drm-ioctl.h" - -+#include "linux/dma-buf.h" -+ - static inline - void __nv_drm_gem_user_memory_free(struct nv_drm_gem_object *nv_gem) - { -@@ -54,6 +57,7 @@ static struct sg_table *__nv_drm_gem_user_memory_prime_get_sg_table( - nv_user_memory->pages_count); - } - -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0)) - static void *__nv_drm_gem_user_memory_prime_vmap( - struct nv_drm_gem_object *nv_gem) - { -@@ -69,6 +73,28 @@ static void __nv_drm_gem_user_memory_prime_vunmap( - { - nv_drm_vunmap(address); - } -+#else -+// Updated vmap/vunmap operations to use struct dma_buf_map instead of raw pointers -+// See torvalds/linux commits ccc22d41bd9acec58cdc7c3b012e1887aba40af4, 6619ccf1bb1d0ebb071f758111efa83918b216fc -+static int __nv_drm_gem_user_memory_prime_vmap( -+ struct nv_drm_gem_object *nv_gem, -+ struct dma_buf_map *map) -+{ -+ struct nv_drm_gem_user_memory *nv_user_memory = to_nv_user_memory(nv_gem); -+ -+ map->vaddr = nv_drm_vmap(nv_user_memory->pages, -+ nv_user_memory->pages_count); -+ map->is_iomem = false; -+ return 0; -+} -+ -+static void __nv_drm_gem_user_memory_prime_vunmap( -+ struct nv_drm_gem_object *gem, -+ struct dma_buf_map *map) -+{ -+ nv_drm_vunmap(map->vaddr); -+} -+#endif - - static struct nv_drm_gem_object_funcs __nv_gem_user_memory_ops = { - .free = __nv_drm_gem_user_memory_free, -diff --git a/kernel/nvidia-drm/nvidia-drm-gem.c b/kernel/nvidia-drm/nvidia-drm-gem.c -index 4ab8b36..9556993 100644 ---- a/kernel/nvidia-drm/nvidia-drm-gem.c -+++ b/kernel/nvidia-drm/nvidia-drm-gem.c -@@ -20,6 +20,7 @@ - * DEALINGS IN THE SOFTWARE. - */ - -+#include - #include "nvidia-drm-conftest.h" - - #if defined(NV_DRM_AVAILABLE) -@@ -29,6 +30,7 @@ - #include "nvidia-drm-prime-fence.h" - #include "nvidia-drm-gem.h" - #include "nvidia-dma-resv-helper.h" -+#include "nvidia-drm-gem-nvkms-memory.h" - - #if defined(NV_DRM_DRM_PRIME_H_PRESENT) - #include -@@ -56,6 +58,13 @@ void nv_drm_gem_free(struct drm_gem_object *gem) - static struct drm_gem_object_funcs nv_drm_gem_funcs = { - .free = nv_drm_gem_free, - .get_sg_table = nv_drm_gem_prime_get_sg_table, -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 11, 0)) -+ // New functions moved from drm_driver because of torvalds/linux commit d693def4fd1c23f1ca5aed1afb9993b3a2069ad2 -+ .export = drm_gem_prime_export, -+ .vmap = nv_drm_gem_prime_vmap, -+ .vunmap = nv_drm_gem_prime_vunmap, -+ .vm_ops = &nv_drm_gem_vma_ops, -+#endif - }; - #endif - -@@ -124,6 +133,7 @@ struct sg_table *nv_drm_gem_prime_get_sg_table(struct drm_gem_object *gem) - return ERR_PTR(-ENOTSUPP); - } - -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0)) - void *nv_drm_gem_prime_vmap(struct drm_gem_object *gem) - { - struct nv_drm_gem_object *nv_gem = to_nv_gem_object(gem); -@@ -143,6 +153,29 @@ void nv_drm_gem_prime_vunmap(struct drm_gem_object *gem, void *address) - nv_gem->ops->prime_vunmap(nv_gem, address); - } - } -+#else -+// Updated vmap/vunmap operations to use struct dma_buf_map instead of raw pointers -+// See torvalds/linux commits ccc22d41bd9acec58cdc7c3b012e1887aba40af4, 6619ccf1bb1d0ebb071f758111efa83918b216fc -+int nv_drm_gem_prime_vmap(struct drm_gem_object *gem, struct dma_buf_map *map) -+{ -+ struct nv_drm_gem_object *nv_gem = to_nv_gem_object(gem); -+ -+ if (nv_gem->ops->prime_vmap != NULL) { -+ return nv_gem->ops->prime_vmap(nv_gem, map); -+ } -+ -+ return -ENOTSUPP; -+} -+ -+void nv_drm_gem_prime_vunmap(struct drm_gem_object *gem, struct dma_buf_map *map) -+{ -+ struct nv_drm_gem_object *nv_gem = to_nv_gem_object(gem); -+ -+ if (nv_gem->ops->prime_vunmap != NULL) { -+ nv_gem->ops->prime_vunmap(nv_gem, map); -+ } -+} -+#endif - - #if defined(NV_DRM_DRIVER_HAS_GEM_PRIME_RES_OBJ) - nv_dma_resv_t* nv_drm_gem_prime_res_obj(struct drm_gem_object *obj) -diff --git a/kernel/nvidia-drm/nvidia-drm-gem.h b/kernel/nvidia-drm/nvidia-drm-gem.h -index fd64b2d..e12fafb 100644 ---- a/kernel/nvidia-drm/nvidia-drm-gem.h -+++ b/kernel/nvidia-drm/nvidia-drm-gem.h -@@ -23,6 +23,7 @@ - #ifndef __NVIDIA_DRM_GEM_H__ - #define __NVIDIA_DRM_GEM_H__ - -+#include - #include "nvidia-drm-conftest.h" - - #if defined(NV_DRM_AVAILABLE) -@@ -44,13 +45,22 @@ - #include "nvidia-dma-resv-helper.h" - #endif - -+#include "linux/dma-buf.h" -+ - struct nv_drm_gem_object; - - struct nv_drm_gem_object_funcs { - void (*free)(struct nv_drm_gem_object *nv_gem); - struct sg_table *(*prime_get_sg_table)(struct nv_drm_gem_object *nv_gem); -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0)) - void *(*prime_vmap)(struct nv_drm_gem_object *nv_gem); - void (*prime_vunmap)(struct nv_drm_gem_object *nv_gem, void *address); -+#else -+ // Updated vmap/vunmap operations to use struct dma_buf_map instead of raw pointers -+ // See torvalds/linux commits ccc22d41bd9acec58cdc7c3b012e1887aba40af4, 6619ccf1bb1d0ebb071f758111efa83918b216fc -+ int (*prime_vmap)(struct nv_drm_gem_object *nv_gem, struct dma_buf_map *map); -+ void (*prime_vunmap)(struct nv_drm_gem_object *nv_gem, struct dma_buf_map *map); -+#endif - }; - - struct nv_drm_gem_object { -@@ -185,9 +195,17 @@ void nv_drm_gem_object_init(struct nv_drm_device *nv_dev, - - struct sg_table *nv_drm_gem_prime_get_sg_table(struct drm_gem_object *gem); - -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0)) - void *nv_drm_gem_prime_vmap(struct drm_gem_object *gem); - - void nv_drm_gem_prime_vunmap(struct drm_gem_object *gem, void *address); -+#else -+// Updated vmap/vunmap operations to use struct dma_buf_map instead of raw pointers -+// See torvalds/linux commits ccc22d41bd9acec58cdc7c3b012e1887aba40af4, 6619ccf1bb1d0ebb071f758111efa83918b216fc -+int nv_drm_gem_prime_vmap(struct drm_gem_object *gem, struct dma_buf_map *map); -+ -+void nv_drm_gem_prime_vunmap(struct drm_gem_object *gem, struct dma_buf_map *map); -+#endif - - #if defined(NV_DRM_DRIVER_HAS_GEM_PRIME_RES_OBJ) - nv_dma_resv_t* nv_drm_gem_prime_res_obj(struct drm_gem_object *obj); diff --git a/srcpkgs/nvidia390/template b/srcpkgs/nvidia390/template index 223015cd21c..04ada084118 100644 --- a/srcpkgs/nvidia390/template +++ b/srcpkgs/nvidia390/template @@ -3,8 +3,8 @@ _desc="NVIDIA drivers (GeForce 400, 500 series)" pkgname=nvidia390 -version=390.141 -revision=3 +version=390.143 +revision=1 maintainer="Andrew Benson " license="custom:NVIDIA Proprietary" homepage="https://www.nvidia.com" @@ -22,11 +22,11 @@ conflicts="xserver-abi-video>24_1" if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then _pkg="NVIDIA-Linux-x86-${version}" distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86/${version}/${_pkg}.run" - checksum=8dfbc8ce77d2f49780105dd7e3058bbf8e663e9b17495507b7544ece34ffaf43 + checksum=01e96b7534dea3fdfe65d5cad229e264307c80952479942d368466db9cfe6d06 else _pkg="NVIDIA-Linux-x86_64-${version}-no-compat32" distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86_64/${version}/${_pkg}.run" - checksum=d7d763aa52574b554dd3d8cbb93a6a63572a9c2bfd3bc3873ec5338c067f70ba + checksum=6b823444c764ca065904adbc5b040e506f47e27713d83795f664361309c5f0a5 fi subpackages="nvidia390-gtklibs nvidia390-dkms nvidia390-opencl nvidia390-libs" @@ -37,7 +37,6 @@ do_extract() { ./${_pkg}.run --extract-only rm -f ${_pkg}.run cd ${_pkg} - patch -Np1 < ${FILESDIR}/linux-5.11.patch } pre_install() { From 3588ad758e9bad22f20aac4f232e9e2267accac3 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Tue, 20 Apr 2021 09:29:51 -0500 Subject: [PATCH 018/152] wimlib: update to 1.13.4. --- srcpkgs/wimlib/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/wimlib/template b/srcpkgs/wimlib/template index 24c66d8adb8..9af4fc14017 100644 --- a/srcpkgs/wimlib/template +++ b/srcpkgs/wimlib/template @@ -1,6 +1,6 @@ # Template file for 'wimlib' pkgname=wimlib -version=1.13.3 +version=1.13.4 revision=1 build_style=gnu-configure hostmakedepends="pkg-config" @@ -10,7 +10,8 @@ maintainer="Andrew Benson " license="GPL-3.0-or-later" homepage="https://wimlib.net/" distfiles="${homepage}/downloads/wimlib-${version}.tar.gz" -checksum=8a0741d07d9314735b040cea6168f6daf1ac1c72d350d703f286b118135dfa7e +checksum=4b87dd0ad9cc1a58cee5721afebb98011dab549e72f2b55533f315f08b2ede12 +make_check=extended wimlib-devel_package() { short_desc+=" - development files" From 572daa604ea494fc262ee346fbc95ff69ec450b7 Mon Sep 17 00:00:00 2001 From: travankor Date: Tue, 20 Apr 2021 08:42:04 -0700 Subject: [PATCH 019/152] sakura: update to 3.8.1. --- srcpkgs/sakura/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/sakura/template b/srcpkgs/sakura/template index 096bc37d9bc..a774cb6ee4d 100644 --- a/srcpkgs/sakura/template +++ b/srcpkgs/sakura/template @@ -1,6 +1,6 @@ # Template file for 'sakura' pkgname=sakura -version=3.8.0 +version=3.8.1 revision=1 build_style=cmake hostmakedepends="perl pkg-config gettext" @@ -11,5 +11,5 @@ maintainer="travankor " license="GPL-2.0-only" homepage="https://launchpad.net/sakura" distfiles="https://launchpad.net/sakura/trunk/${version}/+download/sakura-${version}.tar.bz2" -checksum=0c414b368cb8f4263d3a899cd2b96e8caf839d916f3ee806e9f50d098fc2fa0f +checksum=40bc43fdb2950160d361d4ab690196d39da22fb634b756cec942991ff9ee9cdc patch_args="-Np1" From 3605457d100523cb425ea49bf6cab376825322c0 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Fri, 16 Apr 2021 12:11:56 -0500 Subject: [PATCH 020/152] opensurge: update to 0.5.2.1. --- srcpkgs/opensurge/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/opensurge/template b/srcpkgs/opensurge/template index 1e8d42c4fa8..f39fb002807 100644 --- a/srcpkgs/opensurge/template +++ b/srcpkgs/opensurge/template @@ -1,6 +1,6 @@ # Template file for 'opensurge' pkgname=opensurge -version=0.5.2 +version=0.5.2.1 revision=1 build_style=cmake hostmakedepends="surgescript pkg-config" @@ -10,7 +10,7 @@ maintainer="Andrew Benson " license="GPL-3.0-or-later" homepage="https://opensurge2d.org/" distfiles="https://github.com/alemart/opensurge/archive/v${version}.tar.gz" -checksum=838b8ba506e45c800091d8ba7bb830d024907934fba35bf369d92fe13feaa3de +checksum=27764a82d97b54026c90044fbc31ea4a61f7836568020b869e63376322a155af replaces="opensurge-data>=0" pre_configure() { From 1cbe819b9f1bb02980f7036181e8cdb299c08f56 Mon Sep 17 00:00:00 2001 From: Anthony Iliopoulos Date: Tue, 20 Apr 2021 13:26:30 +0200 Subject: [PATCH 021/152] sshguard: update to 2.4.2. Closes: #30375 [via git-merge-pr] --- srcpkgs/sshguard/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/sshguard/template b/srcpkgs/sshguard/template index 7fa96dbcaa9..d1cbdf1da58 100644 --- a/srcpkgs/sshguard/template +++ b/srcpkgs/sshguard/template @@ -1,6 +1,6 @@ # Template file for 'sshguard' pkgname=sshguard -version=2.4.1 +version=2.4.2 revision=1 build_style=gnu-configure hostmakedepends="flex" @@ -9,7 +9,7 @@ maintainer="Lodvær " license="BSD-3-Clause" homepage="https://www.sshguard.net/" distfiles="${SOURCEFORGE_SITE}/sshguard/sshguard-${version}.tar.gz" -checksum=875d02e6e67dced614790ed5e36aef1160edea940f353a79306cbb1852af3c67 +checksum=2770b776e5ea70a9bedfec4fd84d57400afa927f0f7522870d2dcbbe1ace37e8 make_dirs="/var/db/sshguard 0755 root root" conf_files="/etc/sshguard.conf" From bbef570be93b82f14b7cf8e9d7d4b6dc1c9f9d5e Mon Sep 17 00:00:00 2001 From: Imran Khan Date: Tue, 20 Apr 2021 21:07:54 +0600 Subject: [PATCH 022/152] crun: update to 0.19.1. Closes: #30389 [via git-merge-pr] --- srcpkgs/crun/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/crun/template b/srcpkgs/crun/template index 1f364f7fb58..1aa3027388e 100644 --- a/srcpkgs/crun/template +++ b/srcpkgs/crun/template @@ -1,6 +1,6 @@ # Template file for 'crun' pkgname=crun -version=0.19 +version=0.19.1 revision=1 build_style=gnu-configure configure_args="--disable-systemd" @@ -11,7 +11,7 @@ maintainer="Imran Khan " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://github.com/containers/crun" distfiles="https://github.com/containers/crun/releases/download/${version}/crun-${version}.tar.gz" -checksum=8065b73ae37ccfb960915fa10051e2bf27850d1c2c69ffeb9eec17c6f198d1c9 +checksum=7b190ff934355e69636e24c12864326a6ebccdbb12af1f14bead217118eb19cb if [ "$XBPS_TARGET_LIBC" = "musl" ]; then makedepends+=" argp-standalone" From 98abd6dd27302d989e611fa5c804fc0acb7dd69e Mon Sep 17 00:00:00 2001 From: q66 Date: Wed, 21 Apr 2021 00:05:31 +0200 Subject: [PATCH 023/152] New package: libwpe-1.10.0 --- common/shlibs | 1 + srcpkgs/libwpe/template | 31 +++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 srcpkgs/libwpe/template diff --git a/common/shlibs b/common/shlibs index b1e6ecdedf7..f27f21d04ed 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2994,6 +2994,7 @@ libyaz_icu.so.5 yaz-5.23.1_1 libyaz.so.5 yaz-5.23.1_1 libyaz_server.so.5 yaz-5.23.1_1 libgcab-1.0.so.0 gcab-0.7_1 +libwpe-1.0.so.1 libwpe-1.10.0_1 libliveMedia.so.81 live555-2020.08.11_2 libgroupsock.so.8 live555-2020.08.11_2 libUsageEnvironment.so.3 live555-2020.08.11_2 diff --git a/srcpkgs/libwpe/template b/srcpkgs/libwpe/template new file mode 100644 index 00000000000..e09c714fbfe --- /dev/null +++ b/srcpkgs/libwpe/template @@ -0,0 +1,31 @@ +# Template file for 'libwpe' +pkgname=libwpe +version=1.10.0 +revision=1 +build_style=cmake +hostmakedepends="pkg-config" +makedepends="MesaLib-devel libxkbcommon-devel" +short_desc="General-purpose library for WPE WebKit" +maintainer="q66 " +license="BSD-2-Clause" +homepage="https://wpewebkit.org" +distfiles="https://wpewebkit.org/releases/${pkgname}-${version}.tar.xz" +checksum=2415e270d45e3595ed4052bc105f733744dc2d3677e12ff4a831e5029841084d + +do_check() { + : # no tests +} + +post_install() { + vlicense COPYING +} + +libwpe-devel_package() { + depends="${sourcepkg}>=${version}_${revision} libxkbcommon-devel" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" + } +} From 14104a67b4f7d0c399bf1c66c4adc0b0d79da149 Mon Sep 17 00:00:00 2001 From: q66 Date: Wed, 21 Apr 2021 00:43:20 +0200 Subject: [PATCH 024/152] libwpe: add missing symlink that i accidentally did not commit --- srcpkgs/libwpe-devel | 1 + 1 file changed, 1 insertion(+) create mode 120000 srcpkgs/libwpe-devel diff --git a/srcpkgs/libwpe-devel b/srcpkgs/libwpe-devel new file mode 120000 index 00000000000..a6d6943eaef --- /dev/null +++ b/srcpkgs/libwpe-devel @@ -0,0 +1 @@ +libwpe \ No newline at end of file From 27de9de40a368da4e8c5d2171f0ffee20f13eca3 Mon Sep 17 00:00:00 2001 From: q66 Date: Wed, 21 Apr 2021 00:17:30 +0200 Subject: [PATCH 025/152] New package: wpebackend-fdo-1.8.3 --- common/shlibs | 1 + srcpkgs/wpebackend-fdo-devel | 1 + srcpkgs/wpebackend-fdo/template | 27 +++++++++++++++++++++++++++ 3 files changed, 29 insertions(+) create mode 120000 srcpkgs/wpebackend-fdo-devel create mode 100644 srcpkgs/wpebackend-fdo/template diff --git a/common/shlibs b/common/shlibs index f27f21d04ed..848ea46232b 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2995,6 +2995,7 @@ libyaz.so.5 yaz-5.23.1_1 libyaz_server.so.5 yaz-5.23.1_1 libgcab-1.0.so.0 gcab-0.7_1 libwpe-1.0.so.1 libwpe-1.10.0_1 +libWPEBackend-fdo-1.0.so.1 wpebackend-fdo-1.8.3_1 libliveMedia.so.81 live555-2020.08.11_2 libgroupsock.so.8 live555-2020.08.11_2 libUsageEnvironment.so.3 live555-2020.08.11_2 diff --git a/srcpkgs/wpebackend-fdo-devel b/srcpkgs/wpebackend-fdo-devel new file mode 120000 index 00000000000..6587510430e --- /dev/null +++ b/srcpkgs/wpebackend-fdo-devel @@ -0,0 +1 @@ +wpebackend-fdo \ No newline at end of file diff --git a/srcpkgs/wpebackend-fdo/template b/srcpkgs/wpebackend-fdo/template new file mode 100644 index 00000000000..ab99f91c96e --- /dev/null +++ b/srcpkgs/wpebackend-fdo/template @@ -0,0 +1,27 @@ +# Template file for 'wpebackend-fdo' +pkgname=wpebackend-fdo +version=1.8.3 +revision=1 +build_style=meson +hostmakedepends="pkg-config" +makedepends="glib-devel libepoxy-devel libwpe-devel wayland-devel" +short_desc="FreeDesktop.org backend for WPE" +maintainer="q66 " +license="BSD-2-Clause" +homepage="https://wpewebkit.org" +distfiles="https://wpewebkit.org/releases/${pkgname}-${version}.tar.xz" +checksum=3d0b4282a1bd9e0664d7a20abe14e982f3285296ac62de56cae2a404b9d28b9e + +post_install() { + vlicense COPYING +} + +wpebackend-fdo-devel_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + # the .so file belongs in the main package as it's dlopened + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + } +} From a93027c87648c31b78e58fd113cb6595bcb8dffb Mon Sep 17 00:00:00 2001 From: q66 Date: Wed, 21 Apr 2021 00:53:59 +0200 Subject: [PATCH 026/152] wpebackend-fdo: need wayland-devel on host --- srcpkgs/wpebackend-fdo/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/wpebackend-fdo/template b/srcpkgs/wpebackend-fdo/template index ab99f91c96e..e0588805cbc 100644 --- a/srcpkgs/wpebackend-fdo/template +++ b/srcpkgs/wpebackend-fdo/template @@ -3,7 +3,7 @@ pkgname=wpebackend-fdo version=1.8.3 revision=1 build_style=meson -hostmakedepends="pkg-config" +hostmakedepends="pkg-config wayland-devel" makedepends="glib-devel libepoxy-devel libwpe-devel wayland-devel" short_desc="FreeDesktop.org backend for WPE" maintainer="q66 " From 9b29bd5522791283616dbe9779ff607c713c1f05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= Date: Tue, 20 Apr 2021 20:11:13 -0300 Subject: [PATCH 027/152] mariadb: fix configure with cmake>=3.20.1. While here, also move patching for musl to post_patch. --- srcpkgs/mariadb/patches/cmake.patch | 15 +++++++++++++++ srcpkgs/mariadb/template | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/mariadb/patches/cmake.patch diff --git a/srcpkgs/mariadb/patches/cmake.patch b/srcpkgs/mariadb/patches/cmake.patch new file mode 100644 index 00000000000..27b4a507e23 --- /dev/null +++ b/srcpkgs/mariadb/patches/cmake.patch @@ -0,0 +1,15 @@ +caused configure error after update to cmake 3.20.1 + +diff --git libmariadb/cmake/ConnectorName.cmake libmariadb/cmake/ConnectorName.cmake +index b7bbbad..357b8ac 100644 +--- libmariadb/cmake/ConnectorName.cmake ++++ libmariadb/cmake/ConnectorName.cmake +@@ -22,7 +22,7 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Windows") + SET(MACHINE_NAME "x64") + ELSE() + SET(MACHINE_NAME "32") +- END() ++ ENDIF() + ENDIF() + + SET(product_name "mysql-connector-c-${CPACK_PACKAGE_VERSION}-${PLATFORM_NAME}${CONCAT_SIGN}${MACHINE_NAME}") diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template index 8cbc1357da6..e6b8a820277 100644 --- a/srcpkgs/mariadb/template +++ b/srcpkgs/mariadb/template @@ -35,7 +35,7 @@ system_accounts="mysql" mysql_homedir="/var/lib/mysql" make_dirs="/var/lib/mysql 0700 mysql mysql" -pre_configure() { +post_patch() { case "$XBPS_TARGET_MACHINE" in *-musl) patch -p0 -i ${FILESDIR}/musl-have-stacktrace.patch From 2e369c38c6dd41c332cd9f8b26c87f1d4d2790ac Mon Sep 17 00:00:00 2001 From: q66 Date: Wed, 21 Apr 2021 00:26:30 +0200 Subject: [PATCH 028/152] webkit2gtk: enable WPE renderer, use large thread stacks on musl --- ...riptcore.patch => musl-thread-stack.patch} | 92 ++++++++++--------- srcpkgs/webkit2gtk/template | 26 +++--- 2 files changed, 59 insertions(+), 59 deletions(-) rename srcpkgs/webkit2gtk/patches/{fix-musl-javascriptcore.patch => musl-thread-stack.patch} (55%) diff --git a/srcpkgs/webkit2gtk/patches/fix-musl-javascriptcore.patch b/srcpkgs/webkit2gtk/patches/musl-thread-stack.patch similarity index 55% rename from srcpkgs/webkit2gtk/patches/fix-musl-javascriptcore.patch rename to srcpkgs/webkit2gtk/patches/musl-thread-stack.patch index 16b4189c96c..a0acbde956e 100644 --- a/srcpkgs/webkit2gtk/patches/fix-musl-javascriptcore.patch +++ b/srcpkgs/webkit2gtk/patches/musl-thread-stack.patch @@ -1,11 +1,7 @@ -Source: @q66, @pullmoll -Original upstream: Alpine Linux -Reason: fixing machine context access for musl libc; reduce stack/heap usage for jsc; fix some overly restrictive __GLIBC__ checks +Source: https://github.com/WebKit/WebKit/commit/6884d13 (tweaked values) -Updated for latest webkit2gtk. - --diff --git Source/JavaScriptCore/runtime/MachineContext.h Source/JavaScriptCore/runtime/MachineContext.h -index ead9cdf..09dc28a 100644 +diff --git Source/JavaScriptCore/runtime/MachineContext.h Source/JavaScriptCore/runtime/MachineContext.h +index ead9cdf..86b36ca 100644 --- Source/JavaScriptCore/runtime/MachineContext.h +++ Source/JavaScriptCore/runtime/MachineContext.h @@ -196,7 +196,7 @@ static inline void*& stackPointerImpl(mcontext_t& machineContext) @@ -13,7 +9,7 @@ index ead9cdf..09dc28a 100644 #endif -#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) -+#elif OS(FUCHSIA) || defined(__linux__) ++#elif OS(FUCHSIA) || OS(LINUX) #if CPU(X86) return reinterpret_cast((uintptr_t&) machineContext.gregs[REG_ESP]); @@ -22,7 +18,7 @@ index ead9cdf..09dc28a 100644 #endif -#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) -+#elif OS(FUCHSIA) || defined(__linux__) ++#elif OS(FUCHSIA) || OS(LINUX) // The following sequence depends on glibc's sys/ucontext.h. #if CPU(X86) @@ -31,7 +27,7 @@ index ead9cdf..09dc28a 100644 #endif -#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) -+#elif OS(FUCHSIA) || defined(__linux__) ++#elif OS(FUCHSIA) || OS(LINUX) // The following sequence depends on glibc's sys/ucontext.h. #if CPU(X86) @@ -40,7 +36,7 @@ index ead9cdf..09dc28a 100644 #endif -#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) -+#elif OS(FUCHSIA) || defined(__linux__) ++#elif OS(FUCHSIA) || OS(LINUX) // The following sequence depends on glibc's sys/ucontext.h. #if CPU(X86) @@ -49,32 +45,34 @@ index ead9cdf..09dc28a 100644 #endif -#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) -+#elif OS(FUCHSIA) || defined(__linux__) ++#elif OS(FUCHSIA) || OS(LINUX) // The following sequence depends on glibc's sys/ucontext.h. #if CPU(X86) diff --git Source/JavaScriptCore/runtime/OptionsList.h Source/JavaScriptCore/runtime/OptionsList.h -index bc1cedb..f161f1c 100644 +index bc1cedb..f4a86a5 100644 --- Source/JavaScriptCore/runtime/OptionsList.h +++ Source/JavaScriptCore/runtime/OptionsList.h -@@ -39,6 +39,16 @@ namespace JSC { +@@ -71,6 +71,18 @@ JS_EXPORT_PRIVATE bool canUseJITCage(); + // On instantiation of the first VM instance, the Options will be write protected + // and cannot be modified thereafter. - JS_EXPORT_PRIVATE bool canUseJITCage(); - -+#if defined(__GLIBC__) ++#if OS(LINUX) && !defined(__BIONIC__) && !defined(__GLIBC__) ++// non-glibc/non-android options on linux ( musl ) ++constexpr unsigned jscMaxPerThreadStack = 2 * MB; ++constexpr unsigned jscSoftReservedZoneSize = 64 * KB; ++constexpr unsigned jscReservedZoneSize = 32 * KB; ++#else ++// default +constexpr unsigned jscMaxPerThreadStack = 5 * MB; +constexpr unsigned jscSoftReservedZoneSize = 128 * KB; +constexpr unsigned jscReservedZoneSize = 64 * KB; -+#else -+constexpr unsigned jscMaxPerThreadStack = 80 * KB; -+constexpr unsigned jscSoftReservedZoneSize = 32 * KB; -+constexpr unsigned jscReservedZoneSize = 16 * KB; +#endif + - // How do JSC VM options work? - // =========================== - // The FOR_EACH_JSC_OPTION() macro below defines a list of all JSC options in use, -@@ -86,9 +96,9 @@ JS_EXPORT_PRIVATE bool canUseJITCage(); + #define FOR_EACH_JSC_OPTION(v) \ + v(Bool, useKernTCSM, defaultTCSMValue(), Normal, "Note: this needs to go before other options since they depend on this value.") \ + v(Bool, validateOptions, false, Normal, "crashes if mis-typed JSC options were passed to the VM") \ +@@ -86,9 +98,9 @@ JS_EXPORT_PRIVATE bool canUseJITCage(); \ v(Bool, reportMustSucceedExecutableAllocations, false, Normal, nullptr) \ \ @@ -87,25 +85,29 @@ index bc1cedb..f161f1c 100644 \ v(Bool, crashOnDisallowedVMEntry, ASSERT_ENABLED, Normal, "Forces a crash if we attempt to enter the VM when disallowed") \ v(Bool, crashIfCantAllocateJITMemory, false, Normal, nullptr) \ -diff --git Source/WebCore/xml/XPathGrammar.cpp Source/WebCore/xml/XPathGrammar.cpp -index 0875a5e..98d5153 100644 ---- Source/WebCore/xml/XPathGrammar.cpp -+++ Source/WebCore/xml/XPathGrammar.cpp -@@ -966,7 +966,7 @@ int yydebug; - #if YYERROR_VERBOSE +diff --git Source/WTF/wtf/PlatformHave.h Source/WTF/wtf/PlatformHave.h +index 41afbb4..ab5263c 100644 +--- Source/WTF/wtf/PlatformHave.h ++++ Source/WTF/wtf/PlatformHave.h +@@ -206,7 +206,7 @@ + #define HAVE_HOSTED_CORE_ANIMATION 1 + #endif - # ifndef yystrlen --# if defined __GLIBC__ && defined _STRING_H -+# if defined __linux__ && defined _STRING_H - # define yystrlen strlen - # else - /* Return the length of YYSTR. */ -@@ -989,7 +989,7 @@ yystrlen (yystr) - # endif +-#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || defined(__GLIBC__) || defined(__BIONIC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS))) ++#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || OS(LINUX)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS))) + #define HAVE_MACHINE_CONTEXT 1 + #endif - # ifndef yystpcpy --# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE -+# if defined __linux__ && defined _STRING_H && defined _GNU_SOURCE - # define yystpcpy stpcpy - # else - /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in +diff --git Source/WTF/wtf/Threading.cpp Source/WTF/wtf/Threading.cpp +index 99d09c0..723a8f4 100644 +--- Source/WTF/wtf/Threading.cpp ++++ Source/WTF/wtf/Threading.cpp +@@ -52,6 +52,8 @@ static Optional stackSize(ThreadType threadType) + #elif OS(DARWIN) && ASAN_ENABLED + if (threadType == ThreadType::Compiler) + return 1 * MB; // ASan needs more stack space (especially on Debug builds). ++#elif OS(LINUX) && !defined(__BIONIC__) && !defined(__GLIBC__) // MUSL default thread stack size. ++ return 2 * MB; + #else + UNUSED_PARAM(threadType); + #endif diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template index 8dd10c32be9..5a2621b6c93 100644 --- a/srcpkgs/webkit2gtk/template +++ b/srcpkgs/webkit2gtk/template @@ -2,23 +2,15 @@ # ping q66 before touching this pkgname=webkit2gtk version=2.32.0 -revision=1 +revision=2 wrksrc="webkitgtk-${version}" build_style=cmake build_helper="gir" configure_args="-DPORT=GTK -DUSE_LD_GOLD=OFF - -DCMAKE_CXX_FLAGS_RELEASE=-DNDEBUG - -DCMAKE_CXX_FLAGS_DEBUG=-DNDEBUG - -DCMAKE_CXX_FLAGS_RELWITHDEBINFO=-DNDEBUG - -DCMAKE_CXX_FLAGS_NONE=-DNDEBUG - -DCMAKE_C_FLAGS_RELEASE=-DNDEBUG - -DCMAKE_C_FLAGS_DEBUG=-DNDEBUG - -DCMAKE_C_FLAGS_RELWITHDEBINFO=-DNDEBUG - -DCMAKE_C_FLAGS_NONE=-DNDEBUG -DCMAKE_LINKER=${XBPS_CROSS_TRIPLET}-gcc -DRUBY_VERSION=2.7 - -DUSE_SYSTEMD=OFF - -DENABLE_GTKDOC=OFF -DUSE_GSTREAMER_GL=OFF -DUSE_WPE_RENDERER=OFF + -DUSE_SYSTEMD=OFF -DUSE_WOFF2=ON + -DENABLE_GTKDOC=OFF -DUSE_GSTREAMER_GL=OFF -DUSE_WPE_RENDERER=ON -DENABLE_MINIBROWSER=$(vopt_if minibrowser ON OFF) -DENABLE_JIT=$(vopt_if jit ON OFF) -DENABLE_C_LOOP=$(vopt_if jit OFF ON) @@ -37,7 +29,8 @@ makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel dbus-glib-devel libwebp-devel gtk+-devel gtk+3-devel libgudev-devel libsecret-devel ruby-devel geoclue2-devel libnotify-devel hyphen-devel woff2-devel freetype-devel libopenjpeg2-devel libatomic-devel - qt5-devel libmanette-devel $(vopt_if x11 libXt-devel) + qt5-devel libmanette-devel libwpe-devel wpebackend-fdo-devel + $(vopt_if x11 libXt-devel) $(vopt_if wayland 'MesaLib-devel libxkbcommon-devel wayland-devel wayland-protocols')" short_desc="GTK+3 port of the WebKit2 browser engine" maintainer="q66 " @@ -54,8 +47,13 @@ desc_option_jit="JavaScript JIT (Only some architectures)" desc_option_sampling_profiler="Sampling profiler support (JIT + glibc only)" desc_option_minibrowser="Build the minibrowser" -# on musl this is not defined and webkit uses it, so define it -export CFLAGS="-D__WORDSIZE=${XBPS_TARGET_WORDSIZE}" +export CFLAGS="-DNDEBUG" + +if [ "$XBPS_TARGET_LIBC" = "musl" ]; then + # this is not defined on musl and is occasionally used + export CFLAGS+=" -D__WORDSIZE=${XBPS_TARGET_WORDSIZE}" +fi + export CXXFLAGS="$CFLAGS" # WebKitCCache.cmake set this variable From a63f060fd3c838c8fa193e557f77020c47e70230 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 21 Mar 2021 20:05:16 +0700 Subject: [PATCH 029/152] New package: xcb-imdkit-1.0.3 --- common/shlibs | 1 + srcpkgs/xcb-imdkit-devel | 1 + srcpkgs/xcb-imdkit/template | 29 +++++++++++++++++++++++++++++ 3 files changed, 31 insertions(+) create mode 120000 srcpkgs/xcb-imdkit-devel create mode 100644 srcpkgs/xcb-imdkit/template diff --git a/common/shlibs b/common/shlibs index 848ea46232b..1f26086650d 100644 --- a/common/shlibs +++ b/common/shlibs @@ -256,6 +256,7 @@ libxcb-xkb.so.1 libxcb-1.10_1 libxcb-xinput.so.0 libxcb-1.10_1 libxcb-dri3.so.0 libxcb-1.10_1 libxcb-present.so.0 libxcb-1.10_1 +libxcb-imdkit.so.1 xcb-imdkit-1.0.2_1 libXdmcp.so.6 libXdmcp-1.0.2_1 libpolkit-gobject-1.so.0 polkit-0.99_1 libpolkit-agent-1.so.0 polkit-0.99_1 diff --git a/srcpkgs/xcb-imdkit-devel b/srcpkgs/xcb-imdkit-devel new file mode 120000 index 00000000000..0044a6a371b --- /dev/null +++ b/srcpkgs/xcb-imdkit-devel @@ -0,0 +1 @@ +xcb-imdkit \ No newline at end of file diff --git a/srcpkgs/xcb-imdkit/template b/srcpkgs/xcb-imdkit/template new file mode 100644 index 00000000000..49de4a769f1 --- /dev/null +++ b/srcpkgs/xcb-imdkit/template @@ -0,0 +1,29 @@ +# Template file for 'xcb-imdkit' +pkgname=xcb-imdkit +version=1.0.3 +revision=1 +build_style=cmake +hostmakedepends="pkg-config extra-cmake-modules" +makedepends="xcb-util-keysyms-devel xcb-util-devel uthash" +short_desc="Implementation of xim protocol in xcb" +maintainer="Đoàn Trần Công Danh " +license="LGPL-2.1-only" +homepage="https://github.com/fcitx/xcb-imdkit" +distfiles="https://download.fcitx-im.org/fcitx5/xcb-imdkit/xcb-imdkit-${version}.tar.xz" +checksum=09c2626ea29fbd6a8c650144ca126b7bdd6365258b7c39508028bfdca6dca8e8 + +post_install() { + sed -i '/prefix=/!s,/usr,${exec_prefix},' \ + "${DESTDIR}/usr/lib/pkgconfig"/*.pc +} + +xcb-imdkit-devel_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/cmake + vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" + } +} From 140243e88f5c4c918632f1c65f4b659aeb6ea331 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 21 Mar 2021 22:12:45 +0700 Subject: [PATCH 030/152] New package: fcitx5-5.0.7 --- common/shlibs | 3 + srcpkgs/fcitx5-icons | 1 + .../patches/cross-config-template.patch | 45 ++++ srcpkgs/fcitx5/patches/no-which.patch | 194 ++++++++++++++++++ srcpkgs/fcitx5/template | 69 +++++++ srcpkgs/libfcitx5 | 1 + srcpkgs/libfcitx5-devel | 1 + 7 files changed, 314 insertions(+) create mode 120000 srcpkgs/fcitx5-icons create mode 100644 srcpkgs/fcitx5/patches/cross-config-template.patch create mode 100644 srcpkgs/fcitx5/patches/no-which.patch create mode 100644 srcpkgs/fcitx5/template create mode 120000 srcpkgs/libfcitx5 create mode 120000 srcpkgs/libfcitx5-devel diff --git a/common/shlibs b/common/shlibs index 1f26086650d..9214a9d6d13 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2116,6 +2116,9 @@ libfcitx-config.so.4 libfcitx-4.2.8_1 libFcitxQt5DBusAddons.so.1 libfcitx-qt5-1.2.1_1 libFcitxQt5WidgetsAddons.so.1 libfcitx-qt5-1.2.1_1 libfcitx-qt5.so.0 libfcitx-qt5-0.1.3_1 +libFcitx5Utils.so.2 libfcitx5-5.0.5_1 +libFcitx5Core.so.7 libfcitx5-5.0.5_1 +libFcitx5Config.so.6 libfcitx5-5.0.5_1 libdruntime-ldc-debug-shared.so.94 ldc-runtime-1.24.0_1 libdruntime-ldc-shared.so.94 ldc-runtime-1.24.0_1 libphobos2-ldc-shared.so.94 ldc-runtime-1.24.0_1 diff --git a/srcpkgs/fcitx5-icons b/srcpkgs/fcitx5-icons new file mode 120000 index 00000000000..99ac64afc61 --- /dev/null +++ b/srcpkgs/fcitx5-icons @@ -0,0 +1 @@ +fcitx5 \ No newline at end of file diff --git a/srcpkgs/fcitx5/patches/cross-config-template.patch b/srcpkgs/fcitx5/patches/cross-config-template.patch new file mode 100644 index 00000000000..69a988f3c87 --- /dev/null +++ b/srcpkgs/fcitx5/patches/cross-config-template.patch @@ -0,0 +1,45 @@ +Index: fcitx5-5.0.6/src/lib/fcitx-utils/Fcitx5ModuleTemplate.cmake.in +=================================================================== +--- fcitx5-5.0.6.orig/src/lib/fcitx-utils/Fcitx5ModuleTemplate.cmake.in ++++ fcitx5-5.0.6/src/lib/fcitx-utils/Fcitx5ModuleTemplate.cmake.in +@@ -2,6 +2,16 @@ if (TARGET Fcitx5::Module::@FEM_EXPORTNA + return() + endif() + ++# Compute the installation prefix relative to this file. ++get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH) ++get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) ++get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) ++get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) ++if(_IMPORT_PREFIX STREQUAL "/") ++ set(_IMPORT_PREFIX "") ++endif() ++ + add_library(@FEM_TARGET@-interface INTERFACE) + add_library(Fcitx5::Module::@FEM_EXPORTNAME@ ALIAS @FEM_TARGET@-interface) +-set_target_properties(@FEM_TARGET@-interface PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "@_MODULE_HEADER_DIR@") ++set_target_properties(@FEM_TARGET@-interface PROPERTIES ++ INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/../@_MODULE_HEADER_DIR@") +Index: fcitx5-5.0.6/src/lib/fcitx-utils/Fcitx5UtilsConfig.cmake.in +=================================================================== +--- fcitx5-5.0.6.orig/src/lib/fcitx-utils/Fcitx5UtilsConfig.cmake.in ++++ fcitx5-5.0.6/src/lib/fcitx-utils/Fcitx5UtilsConfig.cmake.in +@@ -3,8 +3,17 @@ + include("${CMAKE_CURRENT_LIST_DIR}/Fcitx5UtilsTargets.cmake") + include("${CMAKE_CURRENT_LIST_DIR}/Fcitx5Macros.cmake") + ++# Compute the installation prefix relative to this file. ++get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH) ++get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) ++get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) ++get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) ++if(_IMPORT_PREFIX STREQUAL "/") ++ set(_IMPORT_PREFIX "") ++endif() ++ + set(FCITX_SYS_INSTALL_PREFIX "@FCITX_INSTALL_PREFIX@") +-set(FCITX_INSTALL_CMAKECONFIG_DIR "@FCITX_INSTALL_CMAKECONFIG_DIR@") ++set(FCITX_INSTALL_CMAKECONFIG_DIR "${_IMPORT_PREFIX}/../@FCITX_INSTALL_CMAKECONFIG_DIR@") + + set(_default_FCITX_INSTALL_USE_FCITX_SYS_PATHS Off) + if (NOT DEFINED FCITX_INSTALL_USE_FCITX_SYS_PATHS) diff --git a/srcpkgs/fcitx5/patches/no-which.patch b/srcpkgs/fcitx5/patches/no-which.patch new file mode 100644 index 00000000000..ae553dd1535 --- /dev/null +++ b/srcpkgs/fcitx5/patches/no-which.patch @@ -0,0 +1,194 @@ +Index: fcitx5-5.0.6/data/fcitx5-configtool.sh +=================================================================== +--- fcitx5-5.0.6.orig/data/fcitx5-configtool.sh ++++ fcitx5-5.0.6/data/fcitx5-configtool.sh +@@ -5,14 +5,14 @@ + + export TEXTDOMAIN=fcitx5 + +-if which kdialog > /dev/null 2>&1; then ++if command -v kdialog > /dev/null 2>&1; then + message() { + kdialog --msgbox "$1" + } + error() { + kdialog --error "$1" + } +-elif which zenity > /dev/null 2>&1; then ++elif command -v zenity > /dev/null 2>&1; then + message() { + zenity --info --text="$1" + } +@@ -28,7 +28,7 @@ else + } + fi + +-if which gettext > /dev/null 2>&1; then ++if command -v gettext > /dev/null 2>&1; then + _() { + gettext "$@" + } +@@ -101,7 +101,7 @@ detectDE() { + if [ x"$DE" = x"gnome" ]; then + # gnome-default-applications-properties is only available in GNOME 2.x + # but not in GNOME 3.x +- which gnome-default-applications-properties > /dev/null 2>&1 || DE="gnome3" ++ command -v gnome-default-applications-properties > /dev/null 2>&1 || DE="gnome3" + fi + } + +@@ -116,7 +116,7 @@ run_kde() { + } + + run_qt() { +- if which fcitx5-config-qt > /dev/null 2>&1; then ++ if command -v fcitx5-config-qt > /dev/null 2>&1; then + exec fcitx5-config-qt "$1" + fi + return 1 +@@ -132,13 +132,13 @@ run_xdg() { + ;; + esac + +- if command="$(which xdg-open 2>/dev/null)"; then ++ if command="$(command -v xdg-open 2>/dev/null)"; then + exec "$command" "$HOME/.config/fcitx5" + fi + } + + _which_cmdline() { +- cmd="$(which "$1")" || return 1 ++ cmd="$(command -v "$1")" || return 1 + shift + echo "$cmd $*" + } +Index: fcitx5-5.0.6/data/fcitx5-diagnose.sh +=================================================================== +--- fcitx5-5.0.6.orig/data/fcitx5-diagnose.sh ++++ fcitx5-5.0.6/data/fcitx5-diagnose.sh +@@ -123,7 +123,7 @@ __get_pretty_name() { + fi + } + +-fcitx_exe="$(which fcitx5 2> /dev/null)" ++fcitx_exe="$(command -v fcitx5 2> /dev/null)" + + __conf_dir_init() { + # Don't do any fancy check here, it's the user's fault, which we should detect +@@ -208,9 +208,9 @@ if type dbus-send &> /dev/null; then + "string:$1" 2> /dev/null) || return 1 + echo -n "${pid##* }" + } +-elif qdbus_exe=$(which qdbus 2> /dev/null) || \ +- qdbus_exe=$(which qdbus-qt4 2> /dev/null) || \ +- qdbus_exe=$(which qdbus-qt5 2> /dev/null); then ++elif qdbus_exe=$(command -v qdbus 2> /dev/null) || \ ++ qdbus_exe=$(command -v qdbus-qt4 2> /dev/null) || \ ++ qdbus_exe=$(command -v qdbus-qt5 2> /dev/null); then + dbus_exe=${qdbus_exe} + dbus_get_name_owner() { + "${qdbus_exe}" org.freedesktop.DBus /org/freedesktop/DBus \ +@@ -324,15 +324,15 @@ detectDE() { + if [ x"$DE" = x"gnome" ]; then + # gnome-default-applications-properties is only available in GNOME 2.x + # but not in GNOME 3.x +- which gnome-default-applications-properties > /dev/null 2>&1 || \ ++ command -v gnome-default-applications-properties > /dev/null 2>&1 || \ + DE="gnome3" +- which gnome-shell &> /dev/null && DE="gnome3" ++ command -v gnome-shell &> /dev/null && DE="gnome3" + fi + } + + maybe_gnome3() { + [[ $DE = gnome3 ]] && return 0 +- [[ $DE = generic ]] && which gnome-shell &> /dev/null && return 0 ++ [[ $DE = generic ]] && command -v gnome-shell &> /dev/null && return 0 + return 1 + } + +@@ -341,7 +341,7 @@ detectDE + # user and uid + + detect_user() { +- if which id &> /dev/null; then ++ if command -v id &> /dev/null; then + cur_user=$(id -un) + cur_uid=$(id -u) + else +@@ -352,7 +352,7 @@ detect_user() { + else + cur_uid="" + fi +- if which whoami &> /dev/null; then ++ if command -v whoami &> /dev/null; then + cur_user=$(whoami) + elif [[ -d /proc/$$/ ]]; then + cur_user=$(stat -c %U /proc/$$/) +@@ -374,7 +374,7 @@ _check_open_root() { + for f in /proc/1/environ /proc/1/mem /proc/kcore /proc/kmem; do + try_open "$f" && return 0 + done +- if which readlink &> /dev/null; then ++ if command -v readlink &> /dev/null; then + for f in /proc/1/exe /proc/1/cwd /proc/1/root; do + readlink "$f" &> /dev/null && return 0 + done +@@ -966,7 +966,7 @@ _find_config_gtk() { + return 0 + } + local config_gtk +- config_gtk="$(which "fcitx5-config-gtk" 2> /dev/null)" || return 1 ++ config_gtk="$(command -v "fcitx5-config-gtk" 2> /dev/null)" || return 1 + echo "${config_gtk}" + _config_tool_gtk_exe="${config_gtk}" + } +@@ -993,7 +993,7 @@ _check_config_gtk() { + local version=$1 + local config_gtk config_gtk_name + write_order_list_eval "$(_ 'Config GUI for gtk${1}:')" "${version}" +- if ! config_gtk="$(which "fcitx5-config-gtk${version}" 2> /dev/null)"; then ++ if ! config_gtk="$(command -v "fcitx5-config-gtk${version}" 2> /dev/null)"; then + if ! _check_config_gtk_version "${version}"; then + write_error_eval \ + "$(_ 'Config GUI for gtk${1} not found.')" "${version}" +@@ -1014,7 +1014,7 @@ _check_config_qt() { + local config_qt config_qt_name + config_qt_name="fcitx5-config-qt" + write_order_list_eval "$(_ 'Config GUI for qt:')" "${version}" +- if ! config_qt="$(which "${config_qt_name}" 2> /dev/null)"; then ++ if ! config_qt="$(command -v "${config_qt_name}" 2> /dev/null)"; then + write_error "$(_ 'Config GUI for qt not found.')" + return 1 + fi +@@ -1027,7 +1027,7 @@ _check_config_kcm() { + local version=$1 + local kcm_shell config_kcm + write_order_list "$(_ 'Config GUI for kde:')" +- if ! kcm_shell="$(which "kcmshell${version}" 2> /dev/null)"; then ++ if ! kcm_shell="$(command -v "kcmshell${version}" 2> /dev/null)"; then + write_error "$(print_not_found "kcmshell${version}")" + return 1 + fi +@@ -1043,7 +1043,7 @@ check_config_ui() { + local IFS=$'\n' + write_title 1 "$(_ 'Fcitx Configure UI:')" + write_order_list "$(_ 'Config Tool Wrapper:')" +- if ! fcitx_configtool="$(which fcitx5-configtool 2> /dev/null)"; then ++ if ! fcitx_configtool="$(command -v fcitx5-configtool 2> /dev/null)"; then + write_error_eval "$(_ 'Cannot find ${1} executable!')" fcitx5-configtool + else + write_eval "$(_ 'Found ${1} at ${2}.')" \ +Index: fcitx5-5.0.6/test/xvfb_wrapper.sh +=================================================================== +--- fcitx5-5.0.6.orig/test/xvfb_wrapper.sh ++++ fcitx5-5.0.6/test/xvfb_wrapper.sh +@@ -20,7 +20,7 @@ finish() + + trap finish EXIT + +-if which xprop >/dev/null 2>&1; then ++if command -v xprop >/dev/null 2>&1; then + i=1 + while [ "$i" -lt 5 ]; do + if xprop -root >/dev/null 2>&1; then diff --git a/srcpkgs/fcitx5/template b/srcpkgs/fcitx5/template new file mode 100644 index 00000000000..260c4bd8163 --- /dev/null +++ b/srcpkgs/fcitx5/template @@ -0,0 +1,69 @@ +# Template file for 'fcitx5' +pkgname=fcitx5 +version=5.0.7 +revision=1 +build_style=cmake +build_helper=qemu +configure_args=" + -DCMAKE_INSTALL_LIBDATADIR=/usr/lib${XBPS_TARGET_WORDSIZE} + -DUSE_SYSTEMD=OFF" +hostmakedepends="cldr-emoji-annotation pkg-config gettext doxygen + extra-cmake-modules xkeyboard-config wayland-devel" +makedepends="fmt-devel expat-devel iso-codes enchant2-devel libxkbfile-devel + dbus-devel pango-devel glib-devel libevent-devel xcb-util-wm-devel + xcb-util-keysyms-devel xcb-util-devel xcb-imdkit-devel libxkbcommon-devel + wayland-devel wayland-protocols gdk-pixbuf-devel json-c-devel" +depends="fcitx5-icons" +short_desc="Flexible Context-aware Input Tool with eXtension - v5" +maintainer="Đoàn Trần Công Danh " +license="LGPL-2.1-or-later" +homepage="https://fcitx-im.org/wiki/Fcitx" +_en_dict_ver=20121020 +distfiles="https://download.fcitx-im.org/fcitx5/fcitx5/fcitx5-${version}.tar.xz + https://download.fcitx-im.org/data/en_dict-${_en_dict_ver}.tar.gz" +checksum="c66781c4f774cb82794004877d94f1e68deaf9fd6312c649b438fb479ffe4588 + c44a5d7847925eea9e4d2d04748d442cd28dd9299a0b572ef7d91eac4f5a6ceb" +patch_args=-Np1 +skip_extraction=en_dict-${_en_dict_ver}.tar.gz +lib32disabled=yes + +# Warning: do NOT enable backtrace for musl, do NOT add libexecinfo-devel + +post_extract() { + local _distdir=${XBPS_SRCDISTDIR}/${pkgname}-${version} + cp ${_distdir}/en_dict-${_en_dict_ver}.tar.gz src/modules/spell/dict +} + +post_install() { + sed -i '/prefix=/!s,/usr,${exec_prefix},' \ + "${DESTDIR}/usr/lib/pkgconfig"/*.pc + sed -i '/INTERFACE_INCLUDE_DIRECTORIES/s,"/usr,"${_IMPORT_PREFIX},' \ + "${DESTDIR}/usr/lib/cmake"/*/*Targets.cmake +} + +fcitx5-icons_package() { + short_desc+=" - icons" + conflicts="fcitx<=4.2.9.8_3" + pkg_install() { + vmove usr/share/icons + } +} + +libfcitx5_package() { + short_desc+=" - libraries" + lib32disabled=yes + pkg_install() { + vmove "usr/lib/*.so.*" + } +} + +libfcitx5-devel_package() { + depends="libfcitx5>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/cmake + vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" + } +} diff --git a/srcpkgs/libfcitx5 b/srcpkgs/libfcitx5 new file mode 120000 index 00000000000..99ac64afc61 --- /dev/null +++ b/srcpkgs/libfcitx5 @@ -0,0 +1 @@ +fcitx5 \ No newline at end of file diff --git a/srcpkgs/libfcitx5-devel b/srcpkgs/libfcitx5-devel new file mode 120000 index 00000000000..99ac64afc61 --- /dev/null +++ b/srcpkgs/libfcitx5-devel @@ -0,0 +1 @@ +fcitx5 \ No newline at end of file From 995f38c7024ce46f20d766d7efa8f3be52d7a86b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 22 Mar 2021 00:21:37 +0700 Subject: [PATCH 031/152] New package: fcitx5-gtk-5.0.6 --- common/shlibs | 1 + srcpkgs/fcitx5-gtk+2 | 1 + srcpkgs/fcitx5-gtk+3 | 1 + srcpkgs/fcitx5-gtk-devel | 1 + srcpkgs/fcitx5-gtk/template | 71 +++++++++++++++++++++++++++++++++++++ srcpkgs/fcitx5-gtk4 | 1 + 6 files changed, 76 insertions(+) create mode 120000 srcpkgs/fcitx5-gtk+2 create mode 120000 srcpkgs/fcitx5-gtk+3 create mode 120000 srcpkgs/fcitx5-gtk-devel create mode 100644 srcpkgs/fcitx5-gtk/template create mode 120000 srcpkgs/fcitx5-gtk4 diff --git a/common/shlibs b/common/shlibs index 9214a9d6d13..b4efbfee340 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2119,6 +2119,7 @@ libfcitx-qt5.so.0 libfcitx-qt5-0.1.3_1 libFcitx5Utils.so.2 libfcitx5-5.0.5_1 libFcitx5Core.so.7 libfcitx5-5.0.5_1 libFcitx5Config.so.6 libfcitx5-5.0.5_1 +libFcitx5GClient.so.2 fcitx5-gtk-5.0.4_1 libdruntime-ldc-debug-shared.so.94 ldc-runtime-1.24.0_1 libdruntime-ldc-shared.so.94 ldc-runtime-1.24.0_1 libphobos2-ldc-shared.so.94 ldc-runtime-1.24.0_1 diff --git a/srcpkgs/fcitx5-gtk+2 b/srcpkgs/fcitx5-gtk+2 new file mode 120000 index 00000000000..de83ca58080 --- /dev/null +++ b/srcpkgs/fcitx5-gtk+2 @@ -0,0 +1 @@ +fcitx5-gtk \ No newline at end of file diff --git a/srcpkgs/fcitx5-gtk+3 b/srcpkgs/fcitx5-gtk+3 new file mode 120000 index 00000000000..de83ca58080 --- /dev/null +++ b/srcpkgs/fcitx5-gtk+3 @@ -0,0 +1 @@ +fcitx5-gtk \ No newline at end of file diff --git a/srcpkgs/fcitx5-gtk-devel b/srcpkgs/fcitx5-gtk-devel new file mode 120000 index 00000000000..de83ca58080 --- /dev/null +++ b/srcpkgs/fcitx5-gtk-devel @@ -0,0 +1 @@ +fcitx5-gtk \ No newline at end of file diff --git a/srcpkgs/fcitx5-gtk/template b/srcpkgs/fcitx5-gtk/template new file mode 100644 index 00000000000..07d19a9ce46 --- /dev/null +++ b/srcpkgs/fcitx5-gtk/template @@ -0,0 +1,71 @@ +# Template file for 'fcitx5-gtk' +pkgname=fcitx5-gtk +version=5.0.6 +revision=1 +build_style=cmake +build_helper=gir +configure_args="$(vopt_bool gir ENABLE_GIR)" +hostmakedepends="cldr-emoji-annotation pkg-config gettext doxygen + extra-cmake-modules glib-devel" +makedepends="libfcitx5-devel libglib-devel fmt-devel + gtk+-devel gtk+3-devel gtk4-devel" +short_desc="Fcitx v5 - GTK common" +maintainer="Đoàn Trần Công Danh " +license="LGPL-2.1-or-later" +homepage="https://fcitx-im.org/wiki/Fcitx" +distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-gtk/fcitx5-gtk-${version}.tar.xz" +checksum=01e4a8c571a53af830a0e9e7436b4edb6a87a8f92efb0c423f1142ccae4e991f +lib32disabled=yes + +build_options="gir" +build_options_default="gir" + +post_configure() { + find build -name cmake_install.cmake -exec \ + sed -i -e 's,"//\+usr,"/usr,' {} + +} + +post_install() { + sed -i '/prefix=/!s,/usr,${exec_prefix},' \ + "${DESTDIR}/usr/lib/pkgconfig"/*.pc + sed -i '/INTERFACE_INCLUDE_DIRECTORIES/s,/usr,${_IMPORT_PREFIX},g' \ + "${DESTDIR}/usr/lib/cmake"/*/*Targets.cmake +} + +fcitx5-gtk+2_package() { + short_desc="${short_desc/common/+2 IM Modules}" + lib32disabled=yes + pkg_install() { + vmove usr/lib/gtk-2.0 + } +} + +fcitx5-gtk+3_package() { + short_desc="${short_desc/common/+3 IM Modules}" + lib32disabled=yes + pkg_install() { + vmove usr/lib/gtk-3.0 + } +} + +fcitx5-gtk4_package() { + short_desc="${short_desc/common/4 IM Modules}" + lib32disabled=yes + pkg_install() { + vmove usr/lib/gtk-4.0 + } +} + +fcitx5-gtk-devel_package() { + short_desc+=" - development files" + depends="fcitx5-gtk>=${version}_${revision} libglib-devel" + pkg_install() { + vmove usr/include + vmove usr/lib/cmake + vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" + if [ "$build_option_gir" ]; then + vmove usr/share/gir-1.0 + fi + } +} diff --git a/srcpkgs/fcitx5-gtk4 b/srcpkgs/fcitx5-gtk4 new file mode 120000 index 00000000000..de83ca58080 --- /dev/null +++ b/srcpkgs/fcitx5-gtk4 @@ -0,0 +1 @@ +fcitx5-gtk \ No newline at end of file From d7d9c796175b60c2bc78f217bbe894303a976fb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 22 Mar 2021 01:00:18 +0700 Subject: [PATCH 032/152] New package: fcitx5-qt5-5.0.5 --- common/shlibs | 2 ++ srcpkgs/fcitx5-qt5-devel | 1 + srcpkgs/fcitx5-qt5/template | 33 +++++++++++++++++++++++++++++++++ srcpkgs/fcitx5-qt5/update | 1 + 4 files changed, 37 insertions(+) create mode 120000 srcpkgs/fcitx5-qt5-devel create mode 100644 srcpkgs/fcitx5-qt5/template create mode 100644 srcpkgs/fcitx5-qt5/update diff --git a/common/shlibs b/common/shlibs index b4efbfee340..b2cca724df7 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2120,6 +2120,8 @@ libFcitx5Utils.so.2 libfcitx5-5.0.5_1 libFcitx5Core.so.7 libfcitx5-5.0.5_1 libFcitx5Config.so.6 libfcitx5-5.0.5_1 libFcitx5GClient.so.2 fcitx5-gtk-5.0.4_1 +libFcitx5Qt5DBusAddons.so.1 fcitx5-qt5-5.0.3_1 +libFcitx5Qt5WidgetsAddons.so.2 fcitx5-qt5-5.0.3_1 libdruntime-ldc-debug-shared.so.94 ldc-runtime-1.24.0_1 libdruntime-ldc-shared.so.94 ldc-runtime-1.24.0_1 libphobos2-ldc-shared.so.94 ldc-runtime-1.24.0_1 diff --git a/srcpkgs/fcitx5-qt5-devel b/srcpkgs/fcitx5-qt5-devel new file mode 120000 index 00000000000..b06bf33725d --- /dev/null +++ b/srcpkgs/fcitx5-qt5-devel @@ -0,0 +1 @@ +fcitx5-qt5 \ No newline at end of file diff --git a/srcpkgs/fcitx5-qt5/template b/srcpkgs/fcitx5-qt5/template new file mode 100644 index 00000000000..ced97810285 --- /dev/null +++ b/srcpkgs/fcitx5-qt5/template @@ -0,0 +1,33 @@ +# Template file for 'fcitx5-qt5' +pkgname=fcitx5-qt5 +version=5.0.5 +revision=1 +wrksrc=fcitx5-qt-$version +build_style=cmake +configure_args="-DENABLE_QT4=OFF -DENABLE_QT5=ON -DENABLE_QT6=OFF" +hostmakedepends="cldr-emoji-annotation pkg-config gettext doxygen + extra-cmake-modules qt5-qmake qt5-host-tools" +makedepends="libfcitx5-devel fmt-devel qt5-devel libxkbcommon-devel" +short_desc="Flexible Context-aware Input Tool with eXtension v5 - Qt5" +maintainer="Đoàn Trần Công Danh " +license="LGPL-2.1-or-later, BSD-3-Clause" +homepage="https://fcitx-im.org/wiki/Fcitx" +distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-qt/fcitx5-qt-${version}.tar.xz" +checksum=4b3b79abd2daae70255c098252e79928bb8d0ab966035b7e76378805b6cb5b6f +lib32disabled=yes + +post_install() { + sed -e 's//2012-2021 CSSlayer /' \ + LICENSES/BSD-3-Clause.txt >LICENSE + vlicense LICENSE +} + +fcitx5-qt5-devel_package() { + depends="${sourcepkg}>=${version}_${revision} qt5-devel" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/cmake + vmove "usr/lib/*.so" + } +} diff --git a/srcpkgs/fcitx5-qt5/update b/srcpkgs/fcitx5-qt5/update new file mode 100644 index 00000000000..92b65ebc90e --- /dev/null +++ b/srcpkgs/fcitx5-qt5/update @@ -0,0 +1 @@ +pkgname=fcitx5-qt From 8df45ae7adb7af34500492755cf8f6ed1d11a1ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 22 Mar 2021 09:18:21 +0700 Subject: [PATCH 033/152] New package: fcitx5-rime-5.0.5 --- srcpkgs/fcitx5-rime-icons | 1 + srcpkgs/fcitx5-rime/template | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 120000 srcpkgs/fcitx5-rime-icons create mode 100644 srcpkgs/fcitx5-rime/template diff --git a/srcpkgs/fcitx5-rime-icons b/srcpkgs/fcitx5-rime-icons new file mode 120000 index 00000000000..2de077b5f2e --- /dev/null +++ b/srcpkgs/fcitx5-rime-icons @@ -0,0 +1 @@ +fcitx5-rime \ No newline at end of file diff --git a/srcpkgs/fcitx5-rime/template b/srcpkgs/fcitx5-rime/template new file mode 100644 index 00000000000..216df93b017 --- /dev/null +++ b/srcpkgs/fcitx5-rime/template @@ -0,0 +1,24 @@ +# Template file for 'fcitx5-rime' +pkgname=fcitx5-rime +version=5.0.5 +revision=1 +build_style=cmake +configure_args="-DRIME_DATA_DIR=/usr/share/rime-data" +hostmakedepends="cldr-emoji-annotation pkg-config gettext doxygen + extra-cmake-modules" +makedepends="libfcitx5-devel fmt-devel librime-devel" +depends="brise fcitx5-rime-icons" +short_desc="Fcitx v5 - RIME engine" +maintainer="Đoàn Trần Công Danh " +license="GPL-3.0-or-later" +homepage="https://fcitx-im.org/wiki/Fcitx" +distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-rime/fcitx5-rime-${version}.tar.xz" +checksum=7845893c572bfe0e3f19df91a8f25cfcc733990e6da7609850f89bc02907220a +lib32disabled=yes + +fcitx5-rime-icons_package() { + short_desc+=" - icons" + pkg_install() { + vmove usr/share/icons + } +} From c99e40c9f98504b7fb9e8240de13189c985a9e13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 22 Mar 2021 09:31:33 +0700 Subject: [PATCH 034/152] New package: fcitx5-lua-5.0.4 --- srcpkgs/fcitx5-lua-devel | 1 + srcpkgs/fcitx5-lua/template | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 120000 srcpkgs/fcitx5-lua-devel create mode 100644 srcpkgs/fcitx5-lua/template diff --git a/srcpkgs/fcitx5-lua-devel b/srcpkgs/fcitx5-lua-devel new file mode 120000 index 00000000000..afec5c01e1e --- /dev/null +++ b/srcpkgs/fcitx5-lua-devel @@ -0,0 +1 @@ +fcitx5-lua \ No newline at end of file diff --git a/srcpkgs/fcitx5-lua/template b/srcpkgs/fcitx5-lua/template new file mode 100644 index 00000000000..30f51aa1c42 --- /dev/null +++ b/srcpkgs/fcitx5-lua/template @@ -0,0 +1,33 @@ +# Template file for 'fcitx5-lua' +pkgname=fcitx5-lua +version=5.0.4 +revision=1 +build_style=cmake +hostmakedepends="cldr-emoji-annotation pkg-config gettext doxygen + extra-cmake-modules" +makedepends="libfcitx5-devel fmt-devel lua53-devel" +depends="fcitx5" +checkdepends="fcitx5" +short_desc="Lua scripting support for fcitx5" +maintainer="Đoàn Trần Công Danh " +license="LGPL-2.1-or-later" +homepage="https://github.com/fcitx/fcitx5-lua" +distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-lua/fcitx5-lua-${version}.tar.xz" +checksum=7c8899cb6f05074263e66b95a8717594f9d5c5c1e693bfe9cf4660bbba1f9336 +lib32disabled=yes + +pre_build() { + mkdir -p native + $CXX_FOR_BUILD $CXXFLAGS_FOR_BUILD $LDFLAGS_FOR_BUILD \ + -o native/file2cstring src/file2cstring/file2cstring.cpp + PATH="${wrksrc}/native:$PATH" +} + +fcitx5-lua-devel_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/cmake + } +} From 761f04544c86a4ce9a77a99b50fc0553b2809448 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 22 Mar 2021 22:02:20 +0700 Subject: [PATCH 035/152] New package: fcitx5-configtool-5.0.4 --- srcpkgs/fcitx5-configtool/template | 30 ++++++++++++++++++++++++++++++ srcpkgs/fcitx5-migrator | 1 + 2 files changed, 31 insertions(+) create mode 100644 srcpkgs/fcitx5-configtool/template create mode 120000 srcpkgs/fcitx5-migrator diff --git a/srcpkgs/fcitx5-configtool/template b/srcpkgs/fcitx5-configtool/template new file mode 100644 index 00000000000..15507872e60 --- /dev/null +++ b/srcpkgs/fcitx5-configtool/template @@ -0,0 +1,30 @@ +# Template file for 'fcitx5-configtool' +pkgname=fcitx5-configtool +version=5.0.4 +revision=1 +build_style=cmake +hostmakedepends="cldr-emoji-annotation pkg-config gettext doxygen + extra-cmake-modules glib-devel qt5-qmake qt5-host-tools xkeyboard-config + AppStream kcoreaddons" +makedepends="libfcitx5-devel fcitx5-gtk-devel fcitx5-qt5-devel + libglib-devel qt5-devel qt5-x11extras-devel kitemviews-devel + qt5-quickcontrols2-devel qt5-declarative-devel kcoreaddons-devel + ki18n-devel kpackage-devel kdeclarative-devel kirigami2-devel + libxkbcommon-devel iso-codes libX11-devel libxkbfile-devel" +short_desc="Fcitx v5 - config tool" +maintainer="Đoàn Trần Công Danh " +license="GPL-2.0-or-later" +homepage="https://fcitx-im.org/wiki/Fcitx" +distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-configtool/fcitx5-configtool-${version}.tar.xz" +checksum=1c835e236d013e84c88ff442332003fc69531191d4b3cbf54e85e29fc57d9d11 +lib32disabled=yes + +fcitx5-migrator_package() { + short_desc="${short_desc/config/migration}" + lib32disabled=yes + pkg_install() { + vmove usr/bin/fcitx5-migrator + vmove "usr/lib/libFcitx5Migrator.so*" + vmove usr/share/applications/org.fcitx.fcitx5-migrator.desktop + } +} diff --git a/srcpkgs/fcitx5-migrator b/srcpkgs/fcitx5-migrator new file mode 120000 index 00000000000..e54fa5c6210 --- /dev/null +++ b/srcpkgs/fcitx5-migrator @@ -0,0 +1 @@ +fcitx5-configtool \ No newline at end of file From bb5cd3d8bfc9eda0096f032a4afdcbac483256ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 22 Mar 2021 22:25:14 +0700 Subject: [PATCH 036/152] New package: fcitx5-m17n-5.0.4 --- srcpkgs/fcitx5-m17n/template | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 srcpkgs/fcitx5-m17n/template diff --git a/srcpkgs/fcitx5-m17n/template b/srcpkgs/fcitx5-m17n/template new file mode 100644 index 00000000000..597d193e3e0 --- /dev/null +++ b/srcpkgs/fcitx5-m17n/template @@ -0,0 +1,16 @@ +# Template file for 'fcitx5-m17n' +pkgname=fcitx5-m17n +version=5.0.4 +revision=1 +build_style=cmake +hostmakedepends="pkg-config gettext doxygen extra-cmake-modules" +makedepends="libfcitx5-devel fmt-devel m17n-lib-devel" +depends="m17n-db fcitx5" +checkdepends="$depends" +short_desc="Fcitx v5 - m17n engine" +maintainer="Đoàn Trần Công Danh " +license="LGPL-2.1-or-later" +homepage="https://fcitx-im.org/wiki/Fcitx" +distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-m17n/fcitx5-m17n-${version}.tar.xz" +checksum=f687f3f398e5d4be34e3ec70962f009ad6b9eb9b1dc33f7c2a868aca6ba3c3c2 +lib32disabled=yes From 06ca740827cf5225562e4d77a06b7aa7abe73ec5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Tue, 23 Mar 2021 18:02:57 +0700 Subject: [PATCH 037/152] New package: fcitx5-chewing-5.0.5 --- srcpkgs/fcitx5-chewing-icons | 1 + srcpkgs/fcitx5-chewing/template | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 120000 srcpkgs/fcitx5-chewing-icons create mode 100644 srcpkgs/fcitx5-chewing/template diff --git a/srcpkgs/fcitx5-chewing-icons b/srcpkgs/fcitx5-chewing-icons new file mode 120000 index 00000000000..88c258a7ebb --- /dev/null +++ b/srcpkgs/fcitx5-chewing-icons @@ -0,0 +1 @@ +fcitx5-chewing \ No newline at end of file diff --git a/srcpkgs/fcitx5-chewing/template b/srcpkgs/fcitx5-chewing/template new file mode 100644 index 00000000000..83dadccc2b3 --- /dev/null +++ b/srcpkgs/fcitx5-chewing/template @@ -0,0 +1,22 @@ +# Template file for 'fcitx5-chewing' +pkgname=fcitx5-chewing +version=5.0.5 +revision=1 +build_style=cmake +hostmakedepends="pkg-config gettext doxygen extra-cmake-modules" +makedepends="libfcitx5-devel fmt-devel libchewing-devel" +short_desc="Fcitx5 - chewing engine" +maintainer="Đoàn Trần Công Danh " +license="GPL-3.0-or-later" +homepage="https://fcitx-im.org/wiki/Fcitx" +distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-chewing/fcitx5-chewing-${version}.tar.xz" +checksum=9c2f208796198daa6c37d9918929f0301792c1611afbc14155ef4dd69d699163 +lib32disabled=yes + +fcitx5-chewing-icons_package() { + short_desc+=" - icons" + conflicts="fcitx-chewing<=0.2.3_1" + pkg_install() { + vmove usr/share/icons + } +} From d51804060a87b2865c59685a26be064afabe6094 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Tue, 23 Mar 2021 22:46:14 +0700 Subject: [PATCH 038/152] New package: libime-1.0.6 --- common/shlibs | 3 ++ srcpkgs/libime-devel | 1 + srcpkgs/libime-migration | 1 + srcpkgs/libime-utils | 1 + srcpkgs/libime/template | 64 ++++++++++++++++++++++++++++++++++++++++ 5 files changed, 70 insertions(+) create mode 120000 srcpkgs/libime-devel create mode 120000 srcpkgs/libime-migration create mode 120000 srcpkgs/libime-utils create mode 100644 srcpkgs/libime/template diff --git a/common/shlibs b/common/shlibs index b2cca724df7..5ad8100d0e4 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3105,6 +3105,9 @@ libi2c.so.0 i2c-tools-4.0_1 libmarisa.so.0 marisa-0.2.5_1 libopencc.so.1.1 opencc-1.1.1_1 librime.so.1 librime-1.2.9_1 +libIMECore.so.0 libime-1.0.5_1 +libIMEPinyin.so.0 libime-1.0.5_1 +libIMETable.so.0 libime-1.0.5_1 libairspy.so.0 libairspy-1.0.9_1 libKF5KDcraw.so.5 libkdcraw5-17.04.3_1 libKF5Kipi.so.32.0.0 libkipi5-17.04.3_1 diff --git a/srcpkgs/libime-devel b/srcpkgs/libime-devel new file mode 120000 index 00000000000..0e6317ec164 --- /dev/null +++ b/srcpkgs/libime-devel @@ -0,0 +1 @@ +libime \ No newline at end of file diff --git a/srcpkgs/libime-migration b/srcpkgs/libime-migration new file mode 120000 index 00000000000..0e6317ec164 --- /dev/null +++ b/srcpkgs/libime-migration @@ -0,0 +1 @@ +libime \ No newline at end of file diff --git a/srcpkgs/libime-utils b/srcpkgs/libime-utils new file mode 120000 index 00000000000..0e6317ec164 --- /dev/null +++ b/srcpkgs/libime-utils @@ -0,0 +1 @@ +libime \ No newline at end of file diff --git a/srcpkgs/libime/template b/srcpkgs/libime/template new file mode 100644 index 00000000000..4935ab5ff67 --- /dev/null +++ b/srcpkgs/libime/template @@ -0,0 +1,64 @@ +# Template file for 'libime' +pkgname=libime +version=1.0.6 +revision=1 +build_style=cmake +build_helper=qemu +hostmakedepends="pkg-config gettext extra-cmake-modules python3" +makedepends="libfcitx5-devel boost-devel" +short_desc="Library to support generic input method implementation" +maintainer="Đoàn Trần Công Danh " +license="LGPL-2.1-or-later" +homepage="https://fcitx-im.org/wiki/Fcitx" +_lm_sc_version=20140820 +_dict_version=20210302 +distfiles="https://download.fcitx-im.org/fcitx5/libime/libime-${version}.tar.xz + https://download.fcitx-im.org/data/lm_sc.3gm.arpa-${_lm_sc_version}.tar.bz2 + https://download.fcitx-im.org/data/dict.utf8-${_dict_version}.tar.xz + https://download.fcitx-im.org/data/table.tar.gz" +checksum="f024e2602be83a79c733955166fd9f757e24f466cf96ce8d66c880c132d92dd6 + 751bab7c55ea93a2cedfb0fbb7eb09f67d4da9c2c55496e5f31eb8580f1d1e2f + cd43f97749f38e65fc1f706b981a3c1991599770268932dbb11b2ab90c087646 + 6196053c724125e3ae3d8bd6b2f9172d0c83b65b0d410d3cde63b7a8d6ab87b7" +skip_extraction=" + lm_sc.3gm.arpa-${_lm_sc_version}.tar.bz2 + dict.utf8-${_dict_version}.tar.xz + table.tar.gz" + +post_extract() { + local _srcdistdir=${XBPS_SRCDISTDIR}/${pkgname}-${version} + local _file + for _file in ${skip_extraction}; do + cp ${_srcdistdir}/${_file} data + done +} + +post_install() { + sed -i '/INTERFACE_INCLUDE_DIRECTORIES/s,"/usr,"${_IMPORT_PREFIX},' \ + "${DESTDIR}/usr/lib/cmake"/*/*Targets.cmake +} + +libime-migration_package() { + short_desc+=" - migration tools" + pkg_install() { + vmove "usr/bin/libime_migrate_*" + } +} + +libime-utils_package() { + short_desc+=" - utilities" + pkg_install() { + vmove usr/bin + } +} + +libime-devel_package() { + short_desc+=" - development files" + depends="boost-devel libime-utils>=${version}_${revision} + libime>=${version}_${revision}" + pkg_install() { + vmove usr/include + vmove usr/lib/cmake + vmove "usr/lib/*.so" + } +} From 6061ac542b04f615df03b452da1638750ab5d9ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 25 Mar 2021 18:17:34 +0700 Subject: [PATCH 039/152] fcitx-chewing: use shared icons with fcitx5 --- srcpkgs/fcitx-chewing/template | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/srcpkgs/fcitx-chewing/template b/srcpkgs/fcitx-chewing/template index 65c99624edf..8f2c9c4ce43 100644 --- a/srcpkgs/fcitx-chewing/template +++ b/srcpkgs/fcitx-chewing/template @@ -1,13 +1,18 @@ # Template file for 'fcitx-chewing' pkgname=fcitx-chewing version=0.2.3 -revision=1 +revision=2 build_style=cmake hostmakedepends="pkg-config" makedepends="fcitx-devel libchewing-devel" +depends="fcitx5-chewing-icons" short_desc="Fcitx wrapper for Chewing IM engine" maintainer="Robert Stancil " license="GPL-2.0-only" homepage="https://www.fcitx-im.org/wiki/Chewing" distfiles="https://github.com/fcitx/fcitx-chewing/archive/${version}.tar.gz" checksum=ad20eb7b4911cdfb88224f4883d1778253e30180a84898dfcbf8ece36b1182fc + +post_install() { + rm -rf ${DESTDIR}/usr/share/icons +} From b8c33996993b4fb0af63aa66e95d60ae6ee02955 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 25 Mar 2021 18:32:12 +0700 Subject: [PATCH 040/152] New package: fcitx5-chinese-addons-5.0.5 --- srcpkgs/fcitx5-chinese-addons-devel | 1 + srcpkgs/fcitx5-chinese-addons-icons | 1 + .../fcitx5-chinese-addons-pinyin-dict-manager | 1 + srcpkgs/fcitx5-chinese-addons/template | 58 +++++++++++++++++++ 4 files changed, 61 insertions(+) create mode 120000 srcpkgs/fcitx5-chinese-addons-devel create mode 120000 srcpkgs/fcitx5-chinese-addons-icons create mode 120000 srcpkgs/fcitx5-chinese-addons-pinyin-dict-manager create mode 100644 srcpkgs/fcitx5-chinese-addons/template diff --git a/srcpkgs/fcitx5-chinese-addons-devel b/srcpkgs/fcitx5-chinese-addons-devel new file mode 120000 index 00000000000..20d63bef802 --- /dev/null +++ b/srcpkgs/fcitx5-chinese-addons-devel @@ -0,0 +1 @@ +fcitx5-chinese-addons \ No newline at end of file diff --git a/srcpkgs/fcitx5-chinese-addons-icons b/srcpkgs/fcitx5-chinese-addons-icons new file mode 120000 index 00000000000..20d63bef802 --- /dev/null +++ b/srcpkgs/fcitx5-chinese-addons-icons @@ -0,0 +1 @@ +fcitx5-chinese-addons \ No newline at end of file diff --git a/srcpkgs/fcitx5-chinese-addons-pinyin-dict-manager b/srcpkgs/fcitx5-chinese-addons-pinyin-dict-manager new file mode 120000 index 00000000000..20d63bef802 --- /dev/null +++ b/srcpkgs/fcitx5-chinese-addons-pinyin-dict-manager @@ -0,0 +1 @@ +fcitx5-chinese-addons \ No newline at end of file diff --git a/srcpkgs/fcitx5-chinese-addons/template b/srcpkgs/fcitx5-chinese-addons/template new file mode 100644 index 00000000000..a37a025d7af --- /dev/null +++ b/srcpkgs/fcitx5-chinese-addons/template @@ -0,0 +1,58 @@ +# Template file for 'fcitx5-chinese-addons' +pkgname=fcitx5-chinese-addons +version=5.0.5 +revision=1 +build_style=cmake +hostmakedepends="pkg-config gettext doxygen extra-cmake-modules qt5-qmake + qt5-host-tools libime-utils" +makedepends="libfcitx5-devel fmt-devel opencc-devel fcitx5-lua-devel + libcurl-devel qt5-webkit-devel boost-devel libime-devel fcitx5-qt5-devel" +depends="fcitx5-chinese-addons-icons" +short_desc="Fcitx5 - Chinese related addon" +maintainer="Đoàn Trần Công Danh " +license="GPL-2.0-or-later, LGPL-2.1-or-later" +homepage="https://fcitx-im.org/wiki/Fcitx" +_pytable_version=20121124 +_pystroke_version=20121124 +distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-chinese-addons/fcitx5-chinese-addons-${version}.tar.xz + http://download.fcitx-im.org/data/py_table-${_pytable_version}.tar.gz + http://download.fcitx-im.org/data/py_stroke-${_pystroke_version}.tar.gz" +checksum="7917c29643d0bfe489cda2f75201059b8e52cc3c06f86b3059ee0844b33a2048 + 42146ac97de6c13d55f9e99ed873915f4c66739e9c11532a34556badf9792c04 + 8eb128a9bfa43952e67cf2fcee1fd134c6f4cfd317bc2f6c38a615f5eb64e248" +skip_extraction=" + py_table-${_pytable_version}.tar.gz + py_stroke-${_pystroke_version}.tar.gz" +lib32disabled=yes + +post_extract() { + local _srcdistdir=${XBPS_SRCDISTDIR}/${pkgname}-${version} + local _file + for _file in ${skip_extraction}; do + cp ${_srcdistdir}/$_file modules/pinyinhelper + done +} + +fcitx5-chinese-addons-icons_package() { + short_desc+=" - icons" + pkg_install() { + vmove usr/share/icons + } +} + +fcitx5-chinese-addons-pinyin-dict-manager_package() { + short_desc+=" - Pinyin Dictionaries Manager" + depends="fcitx5-chinese-addons>=${version}_${revision}" + pkg_install() { + vmove usr/lib/fcitx5/qt5 + } +} + +fcitx5-chinese-addons-devel_package() { + short_desc+=" - development files" + depends="fcitx5-chinese-addons>=${version}_${revision}" + pkg_install() { + vmove usr/include + vmove usr/lib/cmake + } +} From dfa8397a59d753f3f4a432ca3f4505b0866c643e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 25 Mar 2021 18:21:50 +0700 Subject: [PATCH 041/152] fcitx: use shared icons with fcitx5 --- srcpkgs/fcitx/template | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fcitx/template b/srcpkgs/fcitx/template index 8163dee0ca5..00675b1fedc 100644 --- a/srcpkgs/fcitx/template +++ b/srcpkgs/fcitx/template @@ -1,7 +1,7 @@ # Template file for 'fcitx' pkgname=fcitx version=4.2.9.8 -revision=3 +revision=4 build_style=cmake build_helper=gir short_desc="Flexible Context-aware Input Tool with eXtension" @@ -15,6 +15,7 @@ hostmakedepends="pkg-config doxygen extra-cmake-modules glib-devel" makedepends="iso-codes gettext-devel enchant-devel libxml2-devel json-c-devel opencc-devel libxkbfile-devel icu-devel dbus-devel gtk+-devel gtk+3-devel" +depends="fcitx5-icons fcitx5-chinese-addons-icons" lib32disabled=yes configure_args="-DCMAKE_BUILD_TYPE=None -DSYSCONFDIR=/etc -DFORCE_OPENCC=OFF -DFORCE_PRESAGE=OFF @@ -54,6 +55,14 @@ pre_build() { LDFLAGS+=" -Wl,--rpath-link=$wrksrc/build/src/lib/fcitx-utils" } +post_install() { + find $DESTDIR/usr/share/icons -depth \ + -name 'fcitx-kbd.*' -prune -o \ + -name 'fcitx-vk-active.*' -prune -o \ + -name 'fcitx-vk-inactive.*' -prune -o \ + -type f -delete +} + libfcitx_package() { short_desc+=" - shared libraries" pkg_install() { @@ -68,7 +77,7 @@ libfcitx_package() { } } fcitx-devel_package() { - depends="libfcitx-${version}_${revision} glib-devel" + depends="libfcitx>=${version}_${revision} glib-devel" short_desc+=" - development files" pkg_install() { vmove usr/bin/fcitx4-config From 47b573af07b08245c62a39ee95d10041fc0ede06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 25 Mar 2021 19:41:51 +0700 Subject: [PATCH 042/152] New package: libime-jyutping-1.0.2 --- common/shlibs | 1 + srcpkgs/libime-jyutping-devel | 1 + srcpkgs/libime-jyutping-tools | 1 + srcpkgs/libime-jyutping/template | 47 ++++++++++++++++++++++++++++++++ 4 files changed, 50 insertions(+) create mode 120000 srcpkgs/libime-jyutping-devel create mode 120000 srcpkgs/libime-jyutping-tools create mode 100644 srcpkgs/libime-jyutping/template diff --git a/common/shlibs b/common/shlibs index 5ad8100d0e4..508ff0e7f0a 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3108,6 +3108,7 @@ librime.so.1 librime-1.2.9_1 libIMECore.so.0 libime-1.0.5_1 libIMEPinyin.so.0 libime-1.0.5_1 libIMETable.so.0 libime-1.0.5_1 +libIMEJyutping.so.1 libime-jyutping-1.0.2_1 libairspy.so.0 libairspy-1.0.9_1 libKF5KDcraw.so.5 libkdcraw5-17.04.3_1 libKF5Kipi.so.32.0.0 libkipi5-17.04.3_1 diff --git a/srcpkgs/libime-jyutping-devel b/srcpkgs/libime-jyutping-devel new file mode 120000 index 00000000000..6f00a5aa546 --- /dev/null +++ b/srcpkgs/libime-jyutping-devel @@ -0,0 +1 @@ +libime-jyutping \ No newline at end of file diff --git a/srcpkgs/libime-jyutping-tools b/srcpkgs/libime-jyutping-tools new file mode 120000 index 00000000000..6f00a5aa546 --- /dev/null +++ b/srcpkgs/libime-jyutping-tools @@ -0,0 +1 @@ +libime-jyutping \ No newline at end of file diff --git a/srcpkgs/libime-jyutping/template b/srcpkgs/libime-jyutping/template new file mode 100644 index 00000000000..46a5ad944e8 --- /dev/null +++ b/srcpkgs/libime-jyutping/template @@ -0,0 +1,47 @@ +# Template file for 'libime-jyutping' +pkgname=libime-jyutping +version=1.0.2 +revision=1 +build_style=cmake +build_helper=qemu +hostmakedepends="pkg-config gettext extra-cmake-modules python3 libime-utils" +makedepends="libfcitx5-devel boost-devel libime-devel + fcitx5-chinese-addons-devel fmt-devel" +short_desc="Libraries for jyutping 粵拼 by libime" +maintainer="Đoàn Trần Công Danh " +license="LGPL-2.1-or-later" +homepage="https://fcitx-im.org/wiki/Fcitx" +_dict_version=20180104 +_model_version=20180103 +distfiles="https://download.fcitx-im.org/fcitx5/libime-jyutping/libime-jyutping-${version}.tar.xz + https://download.fcitx-im.org/data/jyutping-dict-${_dict_version}.tar.xz + https://download.fcitx-im.org/data/jyutping-model-${_model_version}.tar.xz" +checksum="8e948b4d1a1c1586c7e7c2b61e2d4d3d4e83996a791ef685388bed6f681433b3 + e3a5b13edb8efa2f764245a3232f99ba7e7670e22b8cbe666a4fffa84b35f35b + 4f07229e2080f0ee30ce51b016409f260af82a58dd406a01ea5981b59ca87071" +skip_extraction="jyutping-dict-${_dict_version}.tar.xz + jyutping-model-${_model_version}.tar.xz" + +post_extract() { + local _srcdistdir=${XBPS_SRCDISTDIR}/${pkgname}-${version} + local _file + for _file in ${skip_extraction}; do + cp ${_srcdistdir}/$_file data + done +} + +libime-jyutping-tools_package() { + short_desc+=" - tools" + pkg_install() { + vmove usr/bin + } +} + +libime-jyutping-devel_package() { + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove "usr/lib/*.so" + vmove usr/lib/cmake + } +} From c6cffb9de6a3ad4cc6de452f66c4ca9ccd18eeae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 25 Mar 2021 20:18:25 +0700 Subject: [PATCH 043/152] libpinyin: split libzhuyin --- common/shlibs | 1 + srcpkgs/libpinyin-common | 1 + srcpkgs/libpinyin-common-devel | 1 + srcpkgs/libpinyin-utils | 1 + srcpkgs/libpinyin/template | 62 +++++++++++++++++++++++++++++----- srcpkgs/libzhuyin | 1 + srcpkgs/libzhuyin-devel | 1 + 7 files changed, 59 insertions(+), 9 deletions(-) create mode 120000 srcpkgs/libpinyin-common create mode 120000 srcpkgs/libpinyin-common-devel create mode 120000 srcpkgs/libpinyin-utils create mode 120000 srcpkgs/libzhuyin create mode 120000 srcpkgs/libzhuyin-devel diff --git a/common/shlibs b/common/shlibs index 508ff0e7f0a..39ea163292e 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3536,6 +3536,7 @@ libcaf_openssl.so.0.18.0 zeek-4.0.0_1 libbinpac.so.0 zeek-3.2.4_2 libllhttp.so.1 llhttp-1.0.1_1 libpinyin.so.13 libpinyin-2.2.1_1 +libzhuyin.so.13 libzhuyin-2.6.0_3 libuhd.so.4.0.0 uhd-4.0.0.0_1 libeditline.so.1 editline-1.16.0_1 libgnuradio-rds.so.1 gnuradio-rds-3.8.0_1 diff --git a/srcpkgs/libpinyin-common b/srcpkgs/libpinyin-common new file mode 120000 index 00000000000..b9910dce3c1 --- /dev/null +++ b/srcpkgs/libpinyin-common @@ -0,0 +1 @@ +libpinyin \ No newline at end of file diff --git a/srcpkgs/libpinyin-common-devel b/srcpkgs/libpinyin-common-devel new file mode 120000 index 00000000000..b9910dce3c1 --- /dev/null +++ b/srcpkgs/libpinyin-common-devel @@ -0,0 +1 @@ +libpinyin \ No newline at end of file diff --git a/srcpkgs/libpinyin-utils b/srcpkgs/libpinyin-utils new file mode 120000 index 00000000000..b9910dce3c1 --- /dev/null +++ b/srcpkgs/libpinyin-utils @@ -0,0 +1 @@ +libpinyin \ No newline at end of file diff --git a/srcpkgs/libpinyin/template b/srcpkgs/libpinyin/template index 7d141b6a086..31811cac10f 100644 --- a/srcpkgs/libpinyin/template +++ b/srcpkgs/libpinyin/template @@ -1,12 +1,13 @@ # Template file for 'libpinyin' pkgname=libpinyin version=2.6.0 -revision=2 +revision=3 build_style=gnu-configure configure_args="--enable-libzhuyin" hostmakedepends="intltool libtool pkg-config autoconf-archive autoconf automake" makedepends="db-devel libglib-devel" -short_desc="Support library for PinYin and ZhuYin (Bopofomo)" +depends="libpinyin-common>=${version}_${revision}" +short_desc="Support library for PinYin" maintainer="Ben Sung Hsu " license="GPL-3.0-or-later" homepage="https://github.com/libpinyin/libpinyin" @@ -26,13 +27,56 @@ pre_configure() { NOCONFIGURE=1 ./autogen.sh } -libpinyin-devel_package() { - depends="libglib-devel libpinyin-${version}_${revision}" - short_desc+=" - development files" +libpinyin-common_package() { + short_desc="Common files for libpinyin and libzhuyin" pkg_install() { - vmove usr/include - vmove usr/lib/pkgconfig - vmove "usr/lib/*.so" - vmove "usr/lib/*.a" + vmove usr/lib/libpinyin + } +} + +libzhuyin_package() { + short_desc="${short_desc/PinYin/ZhuYin}" + depends="libpinyin-common>=${version}_${revision}" + pkg_install() { + vmove "usr/lib/libzhuyin.so.*" + } +} + +libpinyin-utils_package() { + short_desc="Support utilities for libpinyin and libzhuyin" + pkg_install() { + vmove usr/bin + vmove usr/share/man/man1 + } +} + +libpinyin-common-devel_package() { + short_desc="Common files for libpinyin and libzhuyin" + pkg_install() { + vmove "usr/include/libpinyin-2.6.0/novel*" + } +} + +libpinyin-devel_package() { + depends="libglib-devel libpinyin-${version}_${revision} + libpinyin-common-devel-${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove "usr/include/libpinyin-2.6.0/pinyin*" + vmove usr/lib/pkgconfig/libpinyin.pc + vmove "usr/lib/libpinyin.so" + vmove "usr/lib/libpinyin.a" + } +} + +libzhuyin-devel_package() { + depends="libglib-devel libzhuyin-${version}_${revision} + libpinyin-devel-${version}_${revision}" + short_desc="${short_desc/PinYin/ZhuYin} - development files" + pkg_install() { + vmove "usr/include/libpinyin-2.6.0/zhuyin*" + vmove usr/lib/pkgconfig/libzhuyin.pc + vmove usr/lib/libzhuyin.a + vmove usr/lib/libzhuyin.so } } diff --git a/srcpkgs/libzhuyin b/srcpkgs/libzhuyin new file mode 120000 index 00000000000..b9910dce3c1 --- /dev/null +++ b/srcpkgs/libzhuyin @@ -0,0 +1 @@ +libpinyin \ No newline at end of file diff --git a/srcpkgs/libzhuyin-devel b/srcpkgs/libzhuyin-devel new file mode 120000 index 00000000000..b9910dce3c1 --- /dev/null +++ b/srcpkgs/libzhuyin-devel @@ -0,0 +1 @@ +libpinyin \ No newline at end of file From acde958aa0c6865dae3128374ed1b7e7b09474d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 25 Mar 2021 22:34:18 +0700 Subject: [PATCH 044/152] New package: fcitx5-zhuyin-5.0.4 --- srcpkgs/fcitx5-zhuyin/template | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 srcpkgs/fcitx5-zhuyin/template diff --git a/srcpkgs/fcitx5-zhuyin/template b/srcpkgs/fcitx5-zhuyin/template new file mode 100644 index 00000000000..4e55fb1bec5 --- /dev/null +++ b/srcpkgs/fcitx5-zhuyin/template @@ -0,0 +1,24 @@ +# Template file for 'fcitx5-zhuyin' +pkgname=fcitx5-zhuyin +version=5.0.4 +revision=1 +build_style=cmake +hostmakedepends="pkg-config gettext doxygen extra-cmake-modules libzhuyin" +makedepends="libfcitx5-devel fmt-devel opencc-devel fcitx5-lua-devel + libzhuyin-devel libpinyin-utils" +short_desc="Fcitx5 - zhuyin IME" +maintainer="Đoàn Trần Công Danh " +license="GPL-3.0-or-later" +homepage="https://fcitx-im.org/wiki/Fcitx" +_model_version=20161206 +distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-zhuyin/fcitx5-zhuyin-${version}.tar.xz + https://download.fcitx-im.org/data/model.text.${_model_version}.tar.gz" +checksum="3b692408bcbd816fec84c7ad73ec4e4816b686a072eb9d671aaa8be079fc3728 + 5c7024e5735389c471f54b867eda0d98c5a40a5e5e75333a9febac107508f704" +skip_extraction="model.text.${_model_version}.tar.gz" +lib32disabled=yes + +post_extract() { + local _srcdistdir=${XBPS_SRCDISTDIR}/${pkgname}-${version} + cp ${_srcdistdir}/$skip_extraction data +} From c31a05190b9d03a9bef65d2a2acee17e49781ff0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 26 Mar 2021 18:19:17 +0700 Subject: [PATCH 045/152] New package: fcitx5-table-extra-5.0.3 --- srcpkgs/fcitx5-table-extra/template | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 srcpkgs/fcitx5-table-extra/template diff --git a/srcpkgs/fcitx5-table-extra/template b/srcpkgs/fcitx5-table-extra/template new file mode 100644 index 00000000000..200b8eec5d5 --- /dev/null +++ b/srcpkgs/fcitx5-table-extra/template @@ -0,0 +1,14 @@ +# Template file for 'fcitx5-table-extra' +pkgname=fcitx5-table-extra +version=5.0.3 +revision=1 +build_style=cmake +hostmakedepends="gettext libime-utils extra-cmake-modules" +makedepends="libfcitx5-devel libime-devel" +depends="fcitx5" +short_desc="Fcitx5 - Boshiamy, Zhengma, Cangjie, and Quick table" +maintainer="Đoàn Trần Công Danh " +license="Public Domain" +homepage="https://fcitx-im.org/wiki/Fcitx" +distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-table-extra/fcitx5-table-extra-${version}.tar.xz" +checksum=2cecbd235623cb803befb3550d5b520f972f5b3ea8044c27d3786e5d59e3fb5d From 9019f616a475547f2b156483dda48756f075aadd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 26 Mar 2021 18:31:31 +0700 Subject: [PATCH 046/152] New package: fcitx5-table-other-5.0.4 --- srcpkgs/fcitx5-table-other/template | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 srcpkgs/fcitx5-table-other/template diff --git a/srcpkgs/fcitx5-table-other/template b/srcpkgs/fcitx5-table-other/template new file mode 100644 index 00000000000..6ba05d834a2 --- /dev/null +++ b/srcpkgs/fcitx5-table-other/template @@ -0,0 +1,14 @@ +# Template file for 'fcitx5-table-other' +pkgname=fcitx5-table-other +version=5.0.4 +revision=1 +build_style=cmake +hostmakedepends="gettext libime-utils extra-cmake-modules" +makedepends="libfcitx5-devel libime-devel" +depends="fcitx5" +short_desc="Fcitx5 - non-Chinese table" +maintainer="Đoàn Trần Công Danh " +license="GPL-3.0-or-later" +homepage="https://fcitx-im.org/wiki/Fcitx" +distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-table-other/fcitx5-table-other-${version}.tar.xz" +checksum=a0f6747ad78cd5d113cdcb14d56d11579ba1b425741a532a6b904042be176b41 From 11f3f1fbe844805e201a9a841114c33b25058039 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 26 Mar 2021 18:39:14 +0700 Subject: [PATCH 047/152] New package: fcitx5-hangul-5.0.3 --- srcpkgs/fcitx5-hangul-icons | 1 + srcpkgs/fcitx5-hangul/template | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 120000 srcpkgs/fcitx5-hangul-icons create mode 100644 srcpkgs/fcitx5-hangul/template diff --git a/srcpkgs/fcitx5-hangul-icons b/srcpkgs/fcitx5-hangul-icons new file mode 120000 index 00000000000..aeca5d0f662 --- /dev/null +++ b/srcpkgs/fcitx5-hangul-icons @@ -0,0 +1 @@ +fcitx5-hangul \ No newline at end of file diff --git a/srcpkgs/fcitx5-hangul/template b/srcpkgs/fcitx5-hangul/template new file mode 100644 index 00000000000..0e8116ae535 --- /dev/null +++ b/srcpkgs/fcitx5-hangul/template @@ -0,0 +1,23 @@ +# Template file for 'fcitx5-hangul' +pkgname=fcitx5-hangul +version=5.0.3 +revision=1 +build_style=cmake +hostmakedepends="pkg-config gettext extra-cmake-modules" +makedepends="libhangul-devel libfcitx5-devel" +depends="fcitx5-hangul-icons" +short_desc="Fcitx5 - Hangul support" +maintainer="Đoàn Trần Công Danh " +license="GPL-3.0-or-later" +homepage="https://fcitx-im.org/wiki/Fcitx" +distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-hangul/fcitx5-hangul-${version}.tar.xz" +checksum=e02d3d59e22a60e65099eaa0e5e394481a770a401c83b9979f754678c100f1e6 +lib32disabled=yes + +fcitx5-hangul-icons_package() { + short_desc+=" - icons" + conflicts="fcitx-hangul<=0.3.1_1" + pkg_install() { + vmove usr/share/icons + } +} From cafa7edeec63aa471b931ba52a15492ab197e66d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 26 Mar 2021 18:39:25 +0700 Subject: [PATCH 048/152] fcitx-hangul: use shared icons with fcitx5 --- srcpkgs/fcitx-hangul/template | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/srcpkgs/fcitx-hangul/template b/srcpkgs/fcitx-hangul/template index 3c65ec6a5f4..d1b50e2d623 100644 --- a/srcpkgs/fcitx-hangul/template +++ b/srcpkgs/fcitx-hangul/template @@ -1,15 +1,20 @@ # Template file for 'fcitx-hangul' pkgname=fcitx-hangul version=0.3.1 -revision=1 +revision=2 build_style=cmake hostmakedepends="intltool pkg-config libfcitx" makedepends="libhangul-devel fcitx-devel" -depends="fcitx>=4.2.9" +depends="fcitx>=4.2.9 fcitx5-hangul-icons" short_desc="Hangul (Korean) support for fcitx" -homepage="https://github.com/fcitx/fcitx-hangul" +maintainer="Orphaned " license="GPL-2.0-only" +homepage="https://github.com/fcitx/fcitx-hangul" distfiles="https://download.fcitx-im.org/fcitx-hangul/fcitx-hangul-${version}.tar.xz" checksum=6dd5fd5956924c85af92ebefaef1e113e38fa814355fbb0f07c26049c3014437 CXXFLAGS='-D_GNU_SOURCE' + +post_install() { + rm -rf ${DESTDIR}/usr/share/icons +} From f24b91c292b3b9177f27e7355d9bdb5005e6609d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 28 Mar 2021 18:42:50 +0700 Subject: [PATCH 049/152] New package: anthy-unicode-1.0.0.20201109 --- common/shlibs | 3 +++ srcpkgs/anthy-unicode-devel | 1 + srcpkgs/anthy-unicode/template | 37 ++++++++++++++++++++++++++++++++++ srcpkgs/libanthy-unicode | 1 + 4 files changed, 42 insertions(+) create mode 120000 srcpkgs/anthy-unicode-devel create mode 100644 srcpkgs/anthy-unicode/template create mode 120000 srcpkgs/libanthy-unicode diff --git a/common/shlibs b/common/shlibs index 39ea163292e..966f665424f 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2330,6 +2330,9 @@ liboath.so.0 oath-toolkit-2.6.0_2 libanthy.so.1 libanthy-0.4_1 libanthydic.so.1 libanthy-0.4_1 libanthyinput.so.0 libanthy-0.4_1 +libanthy-unicode.so.0 libanthy-unicode-1.0.0.20201109_1 +libanthydic-unicode.so.0 libanthy-unicode-1.0.0.20201109_1 +libanthyinput-unicode.so.0 libanthy-unicode-1.0.0.20201109_1 libanthygobject-1.0.so.5 ibus-anthy-1.5.6_1 libtbbmalloc_proxy_debug.so.2 tbb-4.3_1 libtbbmalloc_proxy.so.2 tbb-4.3_1 diff --git a/srcpkgs/anthy-unicode-devel b/srcpkgs/anthy-unicode-devel new file mode 120000 index 00000000000..db3b5137210 --- /dev/null +++ b/srcpkgs/anthy-unicode-devel @@ -0,0 +1 @@ +anthy-unicode \ No newline at end of file diff --git a/srcpkgs/anthy-unicode/template b/srcpkgs/anthy-unicode/template new file mode 100644 index 00000000000..f7c4ae32a5b --- /dev/null +++ b/srcpkgs/anthy-unicode/template @@ -0,0 +1,37 @@ +# Template file for 'anthy-unicode' +pkgname=anthy-unicode +version=1.0.0.20201109 +revision=1 +build_style=gnu-configure +configure_args="--disable-static" +short_desc="Japanese character set input library for Unicode" +maintainer="Đoàn Trần Công Danh " +license="LGPL-2.0-or-later, GPL-2.0-only, Public Domain" +homepage="https://github.com/fujiwarat/anthy-unicode/wiki" +distfiles="https://github.com/fujiwarat/anthy-unicode/releases/download/${version}/${pkgname}-${version}.tar.gz" +checksum=7d595bd422222bd67d7944f0c29f7d739fe677e4b885de3d4f0dae417b674381 +nocross='execute lt-mkdepgraph' + +post_install() { + rm ${DESTDIR}/usr/lib/*.la +} + +libanthy-unicode_package() { + short_desc+=" - libraries" + conf_files="/etc/anthy-unicode.conf" + pkg_install() { + vmove etc/anthy-unicode.conf + vmove "usr/lib/*.so.*" + vmove usr/share + } +} + +anthy-unicode-devel_package() { + short_desc+=" - development files" + depends="libanthy-unicode-${version}_${revision}" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" + } +} diff --git a/srcpkgs/libanthy-unicode b/srcpkgs/libanthy-unicode new file mode 120000 index 00000000000..db3b5137210 --- /dev/null +++ b/srcpkgs/libanthy-unicode @@ -0,0 +1 @@ +anthy-unicode \ No newline at end of file From 1bb28d0d416e679b1b25a314463fa7792af6315d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 28 Mar 2021 20:03:38 +0700 Subject: [PATCH 050/152] New package: fcitx5-anthy-5.0.5 --- srcpkgs/fcitx5-anthy-icons | 1 + .../fcitx5-anthy/patches/fix-build-musl.patch | 18 +++++++++++++++ srcpkgs/fcitx5-anthy/template | 23 +++++++++++++++++++ 3 files changed, 42 insertions(+) create mode 120000 srcpkgs/fcitx5-anthy-icons create mode 100644 srcpkgs/fcitx5-anthy/patches/fix-build-musl.patch create mode 100644 srcpkgs/fcitx5-anthy/template diff --git a/srcpkgs/fcitx5-anthy-icons b/srcpkgs/fcitx5-anthy-icons new file mode 120000 index 00000000000..6fee45a4d39 --- /dev/null +++ b/srcpkgs/fcitx5-anthy-icons @@ -0,0 +1 @@ +fcitx5-anthy \ No newline at end of file diff --git a/srcpkgs/fcitx5-anthy/patches/fix-build-musl.patch b/srcpkgs/fcitx5-anthy/patches/fix-build-musl.patch new file mode 100644 index 00000000000..bc19b7c5c40 --- /dev/null +++ b/srcpkgs/fcitx5-anthy/patches/fix-build-musl.patch @@ -0,0 +1,18 @@ +Index: fcitx5-anthy-5.0.4/src/utils.h +=================================================================== +--- fcitx5-anthy-5.0.4.orig/src/utils.h ++++ fcitx5-anthy-5.0.4/src/utils.h +@@ -28,11 +28,11 @@ bool key_is_keypad(const fcitx::Key &key + std::string keypad_to_string(const fcitx::KeyEvent &key); + void launch_program(std::string command); + +-bool surrounding_get_safe_delta(uint from, uint to, int32_t *delta); ++bool surrounding_get_safe_delta(unsigned from, unsigned to, int32_t *delta); + + bool surrounding_get_anchor_pos_from_selection( + const std::string &surrounding_text, const std::string &selected_text, +- uint cursor_pos, uint *anchor_pos); ++ unsigned cursor_pos, unsigned *anchor_pos); + + inline char get_ascii_code(const fcitx::Key &key) { + auto chr = fcitx::Key::keySymToUnicode(key.sym()); diff --git a/srcpkgs/fcitx5-anthy/template b/srcpkgs/fcitx5-anthy/template new file mode 100644 index 00000000000..d0f9ab1d735 --- /dev/null +++ b/srcpkgs/fcitx5-anthy/template @@ -0,0 +1,23 @@ +# Template file for 'fcitx5-anthy' +pkgname=fcitx5-anthy +version=5.0.5 +revision=1 +build_style=cmake +hostmakedepends="pkg-config gettext extra-cmake-modules" +makedepends="anthy-unicode-devel libfcitx5-devel" +depends="fcitx5" +short_desc="Fcitx5 - Anthy engine" +maintainer="Đoàn Trần Công Danh " +license="GPL-2.0-or-later" +homepage="https://fcitx-im.org/wiki/Fcitx" +distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-anthy/fcitx5-anthy-${version}.tar.xz" +checksum=22364003e737cbe4ea6eaa83d9d274a8df8e38dea61d8f4576560ee7d5eaf44d +patch_args=-Np1 + +fcitx5-anthy-icons_package() { + short_desc+=" - icons" + conflicts="fcitx-anthy<=0.2.3_2" + pkg_install() { + vmove usr/share/icons + } +} From 023dc7cb3892b23dd18970a866cb26cad617f0c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 28 Mar 2021 20:03:31 +0700 Subject: [PATCH 051/152] fcitx-anthy: update to 0.2.4. --- srcpkgs/fcitx-anthy/template | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/srcpkgs/fcitx-anthy/template b/srcpkgs/fcitx-anthy/template index d03499e83c3..02150ea5ca5 100644 --- a/srcpkgs/fcitx-anthy/template +++ b/srcpkgs/fcitx-anthy/template @@ -1,15 +1,20 @@ # Template file for 'fcitx-anthy' pkgname=fcitx-anthy -version=0.2.3 -revision=2 +version=0.2.4 +revision=1 build_style=cmake +hostmakedepends="pkg-config" makedepends="anthy-devel fcitx-devel" -depends="fcitx>=4.2.9" +depends="fcitx>=4.2.9 fcitx5-anthy-icons" short_desc="Fcitx wrapper for Anthy IM engine" maintainer="Matthias von Faber " license="GPL-2.0-or-later" homepage="https://fcitx-im.org/" distfiles="https://github.com/fcitx/fcitx-anthy/archive/${version}.tar.gz" -checksum=31826a49a7ff743f830e1279527301abce9e669bc176934c76775999299421a8 +checksum=dcb561138508757f37da8a85bdf296368b592649b15ab76e8706db47cc25402a CXXFLAGS='-D_GNU_SOURCE' + +post_install() { + rm -rf ${DESTDIR}/usr/share/icons +} From d6f96dfd57b0bc5431fc90d019488d112aa33062 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 21 Apr 2021 11:45:43 +0200 Subject: [PATCH 052/152] python3-pyinfra: update to 1.3.11. --- srcpkgs/python3-pyinfra/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-pyinfra/template b/srcpkgs/python3-pyinfra/template index 4365f04a388..e14fcad29d7 100644 --- a/srcpkgs/python3-pyinfra/template +++ b/srcpkgs/python3-pyinfra/template @@ -1,6 +1,6 @@ # Template file for 'python3-pyinfra' pkgname=python3-pyinfra -version=1.3.10 +version=1.3.11 revision=1 wrksrc="pyinfra-${version}" build_style=python3-module @@ -13,7 +13,7 @@ maintainer="Leah Neukirchen " license="MIT" homepage="https://pyinfra.com/" distfiles="https://github.com/Fizzadar/pyinfra/archive/v${version}.tar.gz" -checksum=2369ba8298c31882b36475376732e4e978f866eff7b018cbe5357084e32450a7 +checksum=415977585103aa42bfb1aeb9f627bd19d270d5deb4cb4a516b1d5cc445631388 post_extract() { vsed -i -e '/configparser/d' setup.py # is in Python 3.8 From 7600cf7b30627c727034f50a766171ef0c023bf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 17 Apr 2021 19:22:17 +0700 Subject: [PATCH 053/152] tmux: update to 3.2. --- srcpkgs/tmux/patches/reallocarray.patch | 25 +++++++++++++++++++++++++ srcpkgs/tmux/template | 13 +++++++++---- 2 files changed, 34 insertions(+), 4 deletions(-) create mode 100644 srcpkgs/tmux/patches/reallocarray.patch diff --git a/srcpkgs/tmux/patches/reallocarray.patch b/srcpkgs/tmux/patches/reallocarray.patch new file mode 100644 index 00000000000..ca96defd308 --- /dev/null +++ b/srcpkgs/tmux/patches/reallocarray.patch @@ -0,0 +1,25 @@ +Index: tmux-3.2/configure.ac +=================================================================== +--- tmux-3.2.orig/configure.ac ++++ tmux-3.2/configure.ac +@@ -158,18 +158,12 @@ AC_FUNC_STRNLEN + # system. When compiled it always returns NULL and crashes the program. To + # detect this we need a more complicated test. + AC_MSG_CHECKING([for working reallocarray]) +-AC_RUN_IFELSE([AC_LANG_PROGRAM( +- [#include ], +- [return (reallocarray(NULL, 1, 1) == NULL);] +- )], ++AC_CHECK_FUNC(reallocarray, + AC_MSG_RESULT(yes), + [AC_LIBOBJ(reallocarray) AC_MSG_RESULT([no])] + ) + AC_MSG_CHECKING([for working recallocarray]) +-AC_RUN_IFELSE([AC_LANG_PROGRAM( +- [#include ], +- [return (recallocarray(NULL, 1, 1, 1) == NULL);] +- )], ++AC_CHECK_FUNC(recallocarray, + AC_MSG_RESULT(yes), + [AC_LIBOBJ(recallocarray) AC_MSG_RESULT([no])] + ) diff --git a/srcpkgs/tmux/template b/srcpkgs/tmux/template index df8e84bb4ab..b0f2178d49e 100644 --- a/srcpkgs/tmux/template +++ b/srcpkgs/tmux/template @@ -1,9 +1,9 @@ # Template file for 'tmux' pkgname=tmux -version=3.1c -revision=2 +version=3.2 +revision=1 build_style=gnu-configure -hostmakedepends="byacc" +hostmakedepends="byacc automake pkg-config" makedepends="libevent-devel ncurses-devel" depends="ncurses-base" short_desc="Terminal Multiplexer" @@ -12,7 +12,12 @@ license="ISC" homepage="https://tmux.github.io" changelog="https://raw.githubusercontent.com/tmux/tmux/master/CHANGES" distfiles="https://github.com/tmux/tmux/releases/download/${version}/tmux-${version}.tar.gz" -checksum=918f7220447bef33a1902d4faff05317afd9db4ae1c9971bef5c787ac6c88386 +checksum=664d345338c11cbe429d7ff939b92a5191e231a7c1ef42f381cebacb1e08a399 +patch_args=-Np1 + +pre_configure() { + autoreconf -fi +} post_install() { vlicense COPYING From f21066a1c3b7dcc8869eebddad4829fed7be523b Mon Sep 17 00:00:00 2001 From: Gadzhi Kharkharov Date: Tue, 20 Apr 2021 19:18:50 +0300 Subject: [PATCH 054/152] kitty: update to 0.20.1. Close: #30393 --- ...ui_text-use-uint8_t-instead-of-u_int.patch | 28 +++++++++++++++++++ srcpkgs/kitty/template | 4 +-- 2 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/kitty/patches/0001-freetype_render_ui_text-use-uint8_t-instead-of-u_int.patch diff --git a/srcpkgs/kitty/patches/0001-freetype_render_ui_text-use-uint8_t-instead-of-u_int.patch b/srcpkgs/kitty/patches/0001-freetype_render_ui_text-use-uint8_t-instead-of-u_int.patch new file mode 100644 index 00000000000..7771e8857cb --- /dev/null +++ b/srcpkgs/kitty/patches/0001-freetype_render_ui_text-use-uint8_t-instead-of-u_int.patch @@ -0,0 +1,28 @@ +From 1b760b6c5393b2137410f539d068a84bae1c31ff Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= + +Date: Wed, 21 Apr 2021 19:23:43 +0700 +Subject: [PATCH] freetype_render_ui_text: use uint8_t instead of u_int8_t + +uint8_t is a standard type, while u_int8_t isn't. And we're assigning to +an uint8_t anyway. +--- + kitty/freetype_render_ui_text.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/kitty/freetype_render_ui_text.c b/kitty/freetype_render_ui_text.c +index 8c8743b8..f22284f4 100644 +--- a/kitty/freetype_render_ui_text.c ++++ b/kitty/freetype_render_ui_text.c +@@ -504,7 +504,7 @@ render_line(PyObject *self UNUSED, PyObject *args, PyObject *kw) { + if (!PyArg_ParseTupleAndKeywords(args, kw, "|sIIzppkkffI", (char**)kwlist, &text, &width, &height, &family, &bold, &italic, &fg, &bg, &x_offset, &y_offset, &right_margin)) return NULL; + PyObject *ans = PyBytes_FromStringAndSize(NULL, (Py_ssize_t)width * height * 4); + if (!ans) return NULL; +- uint8_t *buffer = (u_int8_t*) PyBytes_AS_STRING(ans); ++ uint8_t *buffer = (uint8_t*) PyBytes_AS_STRING(ans); + RenderCtx *ctx = (RenderCtx*)create_freetype_render_context(family, bold, italic); + if (!ctx) return NULL; + if (!render_single_line((FreeTypeRenderCtx)ctx, text, 3 * height / 4, 0, 0xffffffff, buffer, width, height, x_offset, y_offset, right_margin)) { +-- +2.31.1.500.gbc6bbdd36b + diff --git a/srcpkgs/kitty/template b/srcpkgs/kitty/template index 0b1d93b3911..5a8dcc8b4fb 100644 --- a/srcpkgs/kitty/template +++ b/srcpkgs/kitty/template @@ -1,6 +1,6 @@ # Template file for 'kitty' pkgname=kitty -version=0.19.3 +version=0.20.1 revision=1 pycompile_dirs="usr/lib/kitty" hostmakedepends="pkg-config python3 wayland-devel wayland-protocols" @@ -13,7 +13,7 @@ license="GPL-3.0-or-later" homepage="https://sw.kovidgoyal.net/kitty/" changelog="https://sw.kovidgoyal.net/kitty/changelog.html" distfiles="https://github.com/kovidgoyal/kitty/releases/download/v${version}/kitty-${version}.tar.xz" -checksum=16d843356b0697db2b71754b4afd8d43166a0f0561e606107f6a4b9519624e4f +checksum=43596a1c5645fe476e96e748bb3b44afd680d84b4af409cd36b33de19b31933d patch_args="-Np1" python_version=3 LDFLAGS+=" -Wl,-z,stack-size=2097152" From 20da30503ea3158efa4a8daf730f107c2415e1c2 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Wed, 21 Apr 2021 08:23:08 -0500 Subject: [PATCH 055/152] libxlsxwriter: update to 1.0.3. --- srcpkgs/libxlsxwriter/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libxlsxwriter/template b/srcpkgs/libxlsxwriter/template index 64f63ec1778..9aba68731ef 100644 --- a/srcpkgs/libxlsxwriter/template +++ b/srcpkgs/libxlsxwriter/template @@ -1,6 +1,6 @@ # Template file for 'libxlsxwriter' pkgname=libxlsxwriter -version=1.0.2 +version=1.0.3 revision=1 wrksrc="${pkgname}-RELEASE_${version}" build_style=cmake @@ -11,7 +11,7 @@ maintainer="Andrew Benson " license="BSD-2-Clause" homepage="https://libxlsxwriter.github.io/" distfiles="https://github.com/jmcnamara/libxlsxwriter/archive/RELEASE_${version}.tar.gz" -checksum=94a99e5d3121a9591bbbe966c581d0c30bf30e4e5be762b6e3066c25fd066092 +checksum=ff373664af1fc3821f934a05275d668f3f0e20663fddebeaa89fcb9a9d52b80d pre_configure() { sed -i "/^add_library/a set_target_properties(\${PROJECT_NAME} \ From a9f5e48b5c899b59bd6959e49939fc229fa679cd Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 21 Apr 2021 15:37:45 +0200 Subject: [PATCH 056/152] linux5.10: update to 5.10.32. --- srcpkgs/linux5.10/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template index b6ff312d238..3e9bffd4691 100644 --- a/srcpkgs/linux5.10/template +++ b/srcpkgs/linux5.10/template @@ -1,6 +1,6 @@ # Template file for 'linux5.10' pkgname=linux5.10 -version=5.10.31 +version=5.10.32 revision=1 wrksrc="linux-${version}" short_desc="Linux kernel and modules (${version%.*} series)" @@ -8,7 +8,7 @@ maintainer="Leah Neukirchen " license="GPL-2.0-only" homepage="https://www.kernel.org" distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz" -checksum=54eef1a4d29a2582281375e028ac73c2c5d90dfa21500fa8c3b00e529a2b510d +checksum=644f8e326e4cb8eac65f0874774c09ccf91cbe0b55eb8438c1e8711d3d07d7ba python_version=3 patch_args="-Np1" From e560f99586efa54432769d060e0dfc32b44d9aa9 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 21 Apr 2021 17:48:44 +0200 Subject: [PATCH 057/152] virt-viewer: update to 10.0. --- srcpkgs/virt-viewer/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/virt-viewer/template b/srcpkgs/virt-viewer/template index 87e8e69c032..c7227bfc8cb 100644 --- a/srcpkgs/virt-viewer/template +++ b/srcpkgs/virt-viewer/template @@ -1,14 +1,14 @@ # Template file for 'virt-viewer' pkgname=virt-viewer -version=9.0 +version=10.0 revision=1 -build_style=gnu-configure -configure_args="--disable-update-mimedb" +build_style=meson hostmakedepends="glib-devel intltool pkg-config" makedepends="gtk-vnc-devel libvirt-glib-devel spice-gtk-devel vte3-devel" short_desc="Tool for displaying the graphical console of a virtual machine" maintainer="Duncaen " license="GPL-2.0-or-later" homepage="http://virt-manager.org/" -distfiles="http://virt-manager.org/download/sources/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=91b43383a0bd4cf3173269e674d65fd205f7c34bc5a8cb4fb3640deb7f1d4825 +changelog="https://gitlab.com/virt-viewer/virt-viewer/-/raw/master/NEWS" +distfiles="http://virt-manager.org/download/sources/${pkgname}/${pkgname}-${version}.tar.xz" +checksum=d23bc0a06e4027c37b8386cfd0286ef37bd738977153740ab1b6b331192389c5 From d8b1ab8b7fb39770d53f7c9dcdd99d5057780cfd Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 21 Apr 2021 17:55:24 +0200 Subject: [PATCH 058/152] poke: update to 1.2. --- srcpkgs/poke/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/poke/template b/srcpkgs/poke/template index 19d0e01b41d..37aadeeb51e 100644 --- a/srcpkgs/poke/template +++ b/srcpkgs/poke/template @@ -1,6 +1,6 @@ # Template file for 'poke' pkgname=poke -version=1.1 +version=1.2 revision=1 build_style=gnu-configure hostmakedepends="pkg-config" @@ -10,8 +10,9 @@ short_desc="Extensible editor for structured binary data" maintainer="Duncaen " license="GPL-3.0-or-later" homepage="http://www.jemarch.net/poke.html" +changelog="http://www.jemarch.net/poke-${version}-relnotes.html" distfiles="${GNU_SITE}/poke/poke-${version}.tar.gz" -checksum=cd68df63c741b4160b12cbea02f27c47158279466e3443930d2535a452c06ad6 +checksum=f61cf8da5b64c01a1359373725aad1ca257f35c1c9269e4d50dd0664183ddf62 poke-devel_package() { depends="${sourcepkg}>=${version}_${revision}" From 95f75d0cdc6905d7281e3b8ea5cbcb15a9e5b518 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 21 Apr 2021 17:59:01 +0200 Subject: [PATCH 059/152] openradtool: update to 0.12.7. --- srcpkgs/openradtool/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/openradtool/template b/srcpkgs/openradtool/template index a04b3e7ec1a..3ded299505d 100644 --- a/srcpkgs/openradtool/template +++ b/srcpkgs/openradtool/template @@ -1,6 +1,6 @@ # Template file for 'openradtool' pkgname=openradtool -version=0.12.6 +version=0.12.7 revision=1 build_style=configure configure_args="PREFIX=/usr MANDIR=/usr/share/man" @@ -15,7 +15,7 @@ license="ISC" homepage="https://kristaps.bsd.lv/openradtool/" changelog="https://kristaps.bsd.lv/openradtool/archive.html" distfiles="https://kristaps.bsd.lv/openradtool/snapshots/openradtool-${version}.tar.gz" -checksum=fec033245ad9371292f92eb87fce77e3e1d6b67ca131dcd181d36dc8df201023 +checksum=366657ecd0b417ba1293a946ec05f7372d561aac7d2566504809608fdf5f6baa post_install() { sed -n '2,16p' main.c >LICENSE From d6253e62037c98f0dd11a995bcd6b757c17c4e41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= Date: Wed, 21 Apr 2021 17:22:33 +0200 Subject: [PATCH 060/152] croc: update to 9.1.0. --- srcpkgs/croc/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/croc/template b/srcpkgs/croc/template index 47e8934f081..41a1fae5b32 100644 --- a/srcpkgs/croc/template +++ b/srcpkgs/croc/template @@ -1,6 +1,6 @@ # Template file for 'croc' pkgname=croc -version=8.6.12 +version=9.1.0 revision=1 build_style=go go_import_path=github.com/schollz/croc/v${version%%.*} @@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana " license="MIT" homepage="https://github.com/schollz/croc" distfiles="https://github.com/schollz/croc/archive/v${version}.tar.gz" -checksum=8596a70226437178cd87f271d6ad275d6ba391917b1a09c429bc9dc65f446ed4 +checksum=7a126933258f197edde16adfa2bfb6623021b6007bc9803cd7128830048fff90 post_install() { vlicense LICENSE From 09d2d14da51d3b6e6e17dabab266736788e954bb Mon Sep 17 00:00:00 2001 From: Isaac Freund Date: Wed, 21 Apr 2021 13:20:15 +0200 Subject: [PATCH 061/152] fuzzel: update to 1.5.3. --- srcpkgs/fuzzel/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fuzzel/template b/srcpkgs/fuzzel/template index 84ea6b87c33..879bead182b 100644 --- a/srcpkgs/fuzzel/template +++ b/srcpkgs/fuzzel/template @@ -1,6 +1,6 @@ # Template file for 'fuzzel' pkgname=fuzzel -version=1.5.1 +version=1.5.3 revision=1 wrksrc="$pkgname" build_style=meson @@ -12,7 +12,7 @@ maintainer="Isaac Freund " license="MIT" homepage="https://codeberg.org/dnkl/fuzzel" distfiles="${homepage}/archive/${version}.tar.gz" -checksum=8a7394a32664638c91e865d63cf5d5a34d8caf4594854ed4867afae1a6f38eb7 +checksum=55ae113d278196241dc699fb6fc558ff20d7b6323048b53dbf343fd3b2be8a49 post_install() { rm "${PKGDESTDIR}/usr/share/doc/${pkgname}/LICENSE" From 7f5639b29e4fecb0d7f7918e45d836bd0d37faae Mon Sep 17 00:00:00 2001 From: Yuriy Chumak Date: Wed, 21 Apr 2021 10:02:17 +0300 Subject: [PATCH 062/152] ol: update to 2.2. --- srcpkgs/ol/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ol/template b/srcpkgs/ol/template index 1b158b6953b..82a12e4db0a 100644 --- a/srcpkgs/ol/template +++ b/srcpkgs/ol/template @@ -1,6 +1,6 @@ # Template file for 'ol' pkgname=ol -version=2.1.1 +version=2.2 revision=1 build_style=gnu-makefile hostmakedepends="xxd" @@ -9,7 +9,7 @@ maintainer="rc-05 " license="LGPL-3.0-or-later, MIT" homepage="https://yuriy-chumak.github.io/ol/" distfiles="https://github.com/yuriy-chumak/ol/archive/${version}.tar.gz" -checksum=ac3fa5e1d7f0fb5ad236c293915000ecfaaadbf1fb0812cbe60609112993b718 +checksum=a16447849508bf39c24611b35277399531e4ceedb5ee5d4e31828d569fca8e04 CFLAGS="-lm" From 5cfc114c2c6edf63011f12293721e520c735a20e Mon Sep 17 00:00:00 2001 From: Alex Lohr Date: Wed, 21 Apr 2021 11:08:52 +0200 Subject: [PATCH 063/152] volta: update to 1.0.4 --- srcpkgs/volta/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/volta/template b/srcpkgs/volta/template index 7f82c979afa..7d176b47ade 100644 --- a/srcpkgs/volta/template +++ b/srcpkgs/volta/template @@ -1,7 +1,7 @@ # Template file for 'volta' pkgname=volta -version=1.0.3 -revision=2 +version=1.0.4 +revision=1 archs="x86_64" # Due to volta pulling pre-built binaries later. Evil. build_style="cargo" hostmakedepends="pkg-config" @@ -11,7 +11,7 @@ maintainer="Alex Lohr " license="BSD-2-Clause" homepage="https://volta.sh/" distfiles="https://github.com/volta-cli/volta/archive/v${version}.tar.gz" -checksum=19edec309676d5d345e0686cc3ea2cd0a5815f01a12e88e5b7c63a7ce961c6d1 +checksum=e61cdb81e7cd776b1285b34dd715e246de5072c1a50f65b2394b6b605f044f4c post_install() { vlicense LICENSE From e6a0f67fcde0c706c8e49eb6c42f675267ceb783 Mon Sep 17 00:00:00 2001 From: Alex Lohr Date: Wed, 21 Apr 2021 10:04:42 +0200 Subject: [PATCH 064/152] google-chrome: update to 90.0.4430.85 --- srcpkgs/google-chrome/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/google-chrome/template b/srcpkgs/google-chrome/template index fce43ada5c6..9705611f5cb 100644 --- a/srcpkgs/google-chrome/template +++ b/srcpkgs/google-chrome/template @@ -1,5 +1,5 @@ # Template file for 'google-chrome' -_chromeVersion=90.0.4430.72 +_chromeVersion=90.0.4430.85 _chromeRevision=1 _channel=stable @@ -22,7 +22,7 @@ _chromeUrl="${_baseUrl}/${_filename}" _licenseUrl="https://www.google.com/intl/en/chrome/terms/" distfiles="$_chromeUrl" -checksum=43f141970ab61d9c5a993dcf094625d9a7a1d24212a3c2443e7092b40c3a354c +checksum=39de976ede3d759fd696e59bd7ac3447093ab67b65972a41caa557edbee12952 do_extract() { mkdir -p ${DESTDIR} From 9a28cd74565ce4333a660f1bbaff00736acbc93d Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Mon, 19 Apr 2021 11:37:21 +0200 Subject: [PATCH 065/152] openssh: update to 8.6p1. --- srcpkgs/openssh/patches/libressl.patch | 26 -------------------------- srcpkgs/openssh/template | 4 ++-- 2 files changed, 2 insertions(+), 28 deletions(-) delete mode 100644 srcpkgs/openssh/patches/libressl.patch diff --git a/srcpkgs/openssh/patches/libressl.patch b/srcpkgs/openssh/patches/libressl.patch deleted file mode 100644 index a114d7bb31d..00000000000 --- a/srcpkgs/openssh/patches/libressl.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- openbsd-compat/openbsd-compat.h.orig -+++ openbsd-compat/openbsd-compat.h -@@ -201,22 +201,18 @@ - int getpeereid(int , uid_t *, gid_t *); - #endif - -+unsigned int arc4random(void); - #ifdef HAVE_ARC4RANDOM - # ifndef HAVE_ARC4RANDOM_STIR - # define arc4random_stir() - # endif - #else --unsigned int arc4random(void); - void arc4random_stir(void); - #endif /* !HAVE_ARC4RANDOM */ - --#ifndef HAVE_ARC4RANDOM_BUF - void arc4random_buf(void *, size_t); --#endif - --#ifndef HAVE_ARC4RANDOM_UNIFORM - u_int32_t arc4random_uniform(u_int32_t); --#endif - - #ifndef HAVE_ASPRINTF - int asprintf(char **, const char *, ...); diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template index 49b94930409..95c8b31073b 100644 --- a/srcpkgs/openssh/template +++ b/srcpkgs/openssh/template @@ -1,6 +1,6 @@ # Template file for 'openssh' pkgname=openssh -version=8.5p1 +version=8.6p1 revision=1 build_style=gnu-configure configure_args="--datadir=/usr/share/openssh @@ -23,7 +23,7 @@ maintainer="Leah Neukirchen " license="BSD-2-Clause, ISC" homepage="https://www.openssh.com" distfiles="https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${version}.tar.gz" -checksum=f52f3f41d429aa9918e38cf200af225ccdd8e66f052da572870c89737646ec25 +checksum=c3e6e4da1621762c850d03b47eed1e48dff4cc9608ddeb547202a234df8ed7ae conf_files="/etc/ssh/moduli /etc/ssh/ssh_config /etc/ssh/sshd_config /etc/pam.d/sshd" make_dirs="/var/chroot/ssh 0755 root root" From 2dda81eaa4e535f72d3e9ad58e0bcd759936e13b Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Mon, 19 Apr 2021 11:39:31 +0200 Subject: [PATCH 066/152] gnome-ssh-askpass: update to 8.6p1. --- srcpkgs/gnome-ssh-askpass/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-ssh-askpass/template b/srcpkgs/gnome-ssh-askpass/template index 43764cc5152..b12f91338bf 100644 --- a/srcpkgs/gnome-ssh-askpass/template +++ b/srcpkgs/gnome-ssh-askpass/template @@ -1,6 +1,6 @@ # Template file for 'gnome-ssh-askpass' pkgname=gnome-ssh-askpass -version=8.5p1 +version=8.6p1 revision=1 wrksrc="openssh-${version}" hostmakedepends="pkg-config" @@ -10,7 +10,7 @@ maintainer="Leah Neukirchen " license="BSD-3-Clause, BSD-2-Clause" homepage="http://www.openssh.org" distfiles="https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${version}.tar.gz" -checksum=f52f3f41d429aa9918e38cf200af225ccdd8e66f052da572870c89737646ec25 +checksum=c3e6e4da1621762c850d03b47eed1e48dff4cc9608ddeb547202a234df8ed7ae alternatives=" ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/gnome-ssh-askpass From 23ed1979b0ef504a69f56cc4c1abaac1dd9ed321 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Wed, 21 Apr 2021 07:09:59 +0200 Subject: [PATCH 067/152] nushell: update to 0.30.0. --- srcpkgs/nushell/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/nushell/template b/srcpkgs/nushell/template index 49a1ea9527f..a3bca1ba445 100644 --- a/srcpkgs/nushell/template +++ b/srcpkgs/nushell/template @@ -1,6 +1,6 @@ # Template file for 'nushell' pkgname=nushell -version=0.29.0 +version=0.30.0 revision=1 build_style=cargo configure_args="--features=extra" @@ -12,7 +12,7 @@ license="MIT" homepage="https://www.nushell.sh/" changelog="https://www.nushell.sh/blog/" distfiles="https://github.com/nushell/nushell/archive/${version}.tar.gz" -checksum=1572c5e48c7b460e1693eb4dd153902cfff9b5069abd05297b79563e6ffbf9f1 +checksum=a36cd3d93c69aab83c874fe0c8b653ce9fe188da9f527d3bb28492ba213e579a register_shell="/usr/bin/nu" # all tests fail with argument --target make_check=no From 66871099ee819d49c9ad33477eafb984fc2f68b2 Mon Sep 17 00:00:00 2001 From: Paper Date: Sun, 18 Apr 2021 19:55:56 +0200 Subject: [PATCH 068/152] revive: update to 1.0.6. --- srcpkgs/revive/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/revive/template b/srcpkgs/revive/template index faffa9f252d..95f294945fe 100644 --- a/srcpkgs/revive/template +++ b/srcpkgs/revive/template @@ -1,15 +1,16 @@ # Template file for 'revive' pkgname=revive -version=1.0.5 +version=1.0.6 revision=1 build_style=go +go_ldflags="-X main.version=$version -X main.builtBy=xbps" go_import_path="github.com/mgechev/revive" short_desc="Drop-in replacement for golint" maintainer="Paper " license="MIT" homepage="https://revive.run/" distfiles="https://github.com/mgechev/revive/archive/v$version.tar.gz" -checksum=9569e25a889dc546bead5ee8616002799ae13fd50860f51388ad2e3d3e55ceaa +checksum=6b504886cf3577329beb7a593b8037601350eed011d64da269ad476f6bfdb35b do_check() { go test -v ./... From 380fafd410d6292c7e09dfd79ff84e234b3643a2 Mon Sep 17 00:00:00 2001 From: Paper Date: Sun, 18 Apr 2021 19:55:53 +0200 Subject: [PATCH 069/152] libhandy1: update to 1.2.1, build docs --- srcpkgs/libhandy1/template | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/srcpkgs/libhandy1/template b/srcpkgs/libhandy1/template index 1d8f409f5ff..c8298f8f629 100644 --- a/srcpkgs/libhandy1/template +++ b/srcpkgs/libhandy1/template @@ -1,14 +1,14 @@ # Template file for 'libhandy1' pkgname=libhandy1 -version=1.2.0 +version=1.2.1 revision=1 wrksrc="libhandy-${version}" build_style=meson build_helper="gir" -configure_args="-Dexamples=true -Dtests=true +configure_args="-Dexamples=true -Dtests=true $(vopt_bool gtk_doc gtk_doc) $(vopt_bool gir vapi) -Dglade_catalog=$(vopt_if glade enabled disabled) -Dintrospection=$(vopt_if gir enabled disabled)" -hostmakedepends="glib-devel pkg-config $(vopt_if gir vala-devel)" +hostmakedepends="glib-devel pkg-config $(vopt_if gtk_doc gtk-doc) $(vopt_if gir vala-devel)" makedepends="gtk+3-devel libglib-devel $(vopt_if glade glade3-devel)" checkdepends="xvfb-run" short_desc="GTK+3 building blocks for modern adaptive applications" @@ -16,12 +16,16 @@ maintainer="Paper " license="LGPL-2.1-or-later" homepage="https://gitlab.gnome.org/GNOME/libhandy/" distfiles="${GNOME_SITE}/libhandy/${version%.*}/libhandy-${version}.tar.xz" -checksum=39f590ae20910e76fe1c0607b2ebe589750f45610d6aeec5c30e2ee602a20b25 +checksum=411b4c6a4d5f9ed5e46594b4abb04c54af294e3242cf364942029f5e0b6f510b -build_options="gir glade" +build_options="gir glade gtk_doc" desc_option_glade="Generate glade modules and catalog files" build_options_default="gir glade" +if [ -z "$CROSS_BUILD" ]; then + build_options_default+=" gtk_doc" +fi + do_check() { xvfb-run ninja -C build test } @@ -41,6 +45,9 @@ libhandy1-devel_package() { vmove usr/share/gir-1.0 vmove usr/share/vala fi + if [ "$build_option_gtk_doc" ]; then + vmove usr/share/gtk-doc + fi } } From 4736b270f9d425eb5eb158a1abf9da3d4fc7642c Mon Sep 17 00:00:00 2001 From: FollieHiyuki Date: Wed, 21 Apr 2021 00:52:47 +0300 Subject: [PATCH 070/152] github-cli: update to 1.9.2 --- srcpkgs/github-cli/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/github-cli/template b/srcpkgs/github-cli/template index 4367b10b573..e693c09d01d 100644 --- a/srcpkgs/github-cli/template +++ b/srcpkgs/github-cli/template @@ -1,6 +1,6 @@ # Template file for 'github-cli' pkgname=github-cli -version=1.9.1 +version=1.9.2 revision=1 wrksrc="cli-${version}" build_style=go @@ -13,7 +13,7 @@ license="MIT" homepage="https://cli.github.com" changelog="https://github.com/cli/cli/releases" distfiles="https://github.com/cli/cli/archive/v${version}.tar.gz" -checksum=5fd35b156a0528ad4e8b68c7058fccf340cca08b0cabd36d872ab855476fb02e +checksum=a1d5a326c9311f8d208a0e5b5ba47023c3982494063e34ea10da916f9b8ba5c3 pre_build() { local _date From bd98b62d8620d6396ee4bc23f34f521b111c9262 Mon Sep 17 00:00:00 2001 From: Paper Date: Sun, 18 Apr 2021 19:56:02 +0200 Subject: [PATCH 071/152] lagrange: update to 1.3.3. --- srcpkgs/lagrange/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/lagrange/template b/srcpkgs/lagrange/template index 8cd5cf54408..cb74a353bfe 100644 --- a/srcpkgs/lagrange/template +++ b/srcpkgs/lagrange/template @@ -1,6 +1,6 @@ # Template file for 'lagrange' pkgname=lagrange -version=1.3.0 +version=1.3.3 revision=1 build_style=cmake hostmakedepends="pkg-config" @@ -11,7 +11,7 @@ license="BSD-2-Clause" homepage="https://gmi.skyjake.fi/lagrange/" changelog="https://git.skyjake.fi/skyjake/lagrange/raw/branch/dev/res/about/version.gmi" distfiles="https://git.skyjake.fi/skyjake/lagrange/releases/download/v$version/lagrange-$version.tar.gz" -checksum=5737ae2d16779e8a0f1cb27b18a22ebba7dffb5e11f1d189c27441bed11b08e0 +checksum=c471c8bbf57aa242c5d23be727f846b87bca42b1eab977862deb9b5f9172eaa5 post_install() { vlicense LICENSE.md From b19d5f629f9fff6651a52e55879e71c77010f5d2 Mon Sep 17 00:00:00 2001 From: mobinmob Date: Tue, 20 Apr 2021 23:16:51 +0300 Subject: [PATCH 072/152] notcurses: update to 2.2.8. --- .../patches/restore-lost-symbol.patch | 66 ------------------- srcpkgs/notcurses/template | 6 +- 2 files changed, 3 insertions(+), 69 deletions(-) delete mode 100644 srcpkgs/notcurses/patches/restore-lost-symbol.patch diff --git a/srcpkgs/notcurses/patches/restore-lost-symbol.patch b/srcpkgs/notcurses/patches/restore-lost-symbol.patch deleted file mode 100644 index b938a35ed30..00000000000 --- a/srcpkgs/notcurses/patches/restore-lost-symbol.patch +++ /dev/null @@ -1,66 +0,0 @@ -From da2a897544b9d239515b85ed31c8db4d90d23883 Mon Sep 17 00:00:00 2001 -From: nick black -Date: Wed, 14 Apr 2021 10:04:28 -0400 -Subject: [PATCH] fix unintended cell abi breakage #1532 - -cell_release() and cell_duplicate() were deprecated in 2.2.6, -but replaced with static inlines. this breaks the abi, forcing -recompiles from client programs. restore them as exported -functions. ---- - include/notcurses/notcurses.h | 10 ++-------- - src/lib/render.c | 9 +++++++++ - 2 files changed, 11 insertions(+), 8 deletions(-) - -diff --git a/include/notcurses/notcurses.h b/include/notcurses/notcurses.h -index aece8cb6d..9d98ea19f 100644 ---- a/include/notcurses/notcurses.h -+++ b/include/notcurses/notcurses.h -@@ -677,18 +677,12 @@ cell_prime(struct ncplane* n, nccell* c, const char* gcluster, - // failure, and 0 on success. - API int nccell_duplicate(struct ncplane* n, nccell* targ, const nccell* c); - --__attribute__ ((deprecated)) static inline int --cell_duplicate(struct ncplane* n, nccell* targ, const nccell* c){ -- return nccell_duplicate(n, targ, c); --} -+__attribute__ ((deprecated)) API int cell_duplicate(struct ncplane* n, nccell* targ, const nccell* c); - - // Release resources held by the nccell 'c'. - API void nccell_release(struct ncplane* n, nccell* c); - --__attribute__ ((deprecated)) static inline void --cell_release(struct ncplane* n, nccell* c){ -- nccell_release(n, c); --} -+__attribute__ ((deprecated)) API void cell_release(struct ncplane* n, nccell* c); - - #define NCSTYLE_MASK 0x03ffu - #define NCSTYLE_STANDOUT 0x0080u -diff --git a/src/lib/render.c b/src/lib/render.c -index ad95cd878..e1334416f 100644 ---- a/src/lib/render.c -+++ b/src/lib/render.c -@@ -175,6 +175,11 @@ void nccell_release(ncplane* n, nccell* c){ - pool_release(&n->pool, c); - } - -+// FIXME deprecated, goes away in abi3 -+void cell_release(ncplane* n, nccell* c){ -+ nccell_release(n, c); -+} -+ - // Duplicate one cell onto another when they share a plane. Convenience wrapper. - int nccell_duplicate(ncplane* n, nccell* targ, const nccell* c){ - if(cell_duplicate_far(&n->pool, targ, n, c) < 0){ -@@ -184,6 +189,10 @@ int nccell_duplicate(ncplane* n, nccell* targ, const nccell* c){ - return 0; - } - -+int cell_duplicate(struct ncplane* n, nccell* targ, const nccell* c){ -+ return nccell_duplicate(n, targ, c); -+} -+ - // Emit fchannel with RGB changed to contrast effectively against bchannel. - static uint32_t - highcontrast(uint32_t bchannel){ diff --git a/srcpkgs/notcurses/template b/srcpkgs/notcurses/template index f2bc3e9ae1b..eaa93ff2c60 100644 --- a/srcpkgs/notcurses/template +++ b/srcpkgs/notcurses/template @@ -1,7 +1,7 @@ # Template file for 'notcurses' pkgname=notcurses -version=2.2.6 -revision=2 +version=2.2.8 +revision=1 build_style=cmake configure_args="-DUSE_STATIC=ON $(vopt_bool man USE_PANDOC)" hostmakedepends="pkg-config $(vopt_if man pandoc)" @@ -14,7 +14,7 @@ license="Apache-2.0" homepage="https://nick-black.com/dankwiki/index.php/Notcurses" changelog="https://raw.githubusercontent.com/dankamongmen/notcurses/master/NEWS.md" distfiles="https://github.com/dankamongmen/notcurses/archive/v${version}.tar.gz" -checksum=0507e507f9843a494aa66f31e419add5fbdbceb8fbc9345f3e6d4b55ed8a89d9 +checksum=dc744f6a11bf8ca81dc8a73f56c4d9021cf4d56ef89a9a658974dff7984df376 patch_args=-Np1 build_options="man" From 53405518a7b5bea5d23e7836f3b8ad06320dccb6 Mon Sep 17 00:00:00 2001 From: travankor Date: Wed, 21 Apr 2021 08:07:28 -0700 Subject: [PATCH 073/152] badwolf: update to 1.1.0. --- srcpkgs/badwolf/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/badwolf/template b/srcpkgs/badwolf/template index 287f02f45b4..83fb0325e9d 100644 --- a/srcpkgs/badwolf/template +++ b/srcpkgs/badwolf/template @@ -1,6 +1,6 @@ # Template file for 'badwolf' pkgname=badwolf -version=1.0.3 +version=1.1.0 revision=1 build_style=gnu-makefile make_check_target=test @@ -10,8 +10,9 @@ short_desc="Minimalist and privacy-oriented WebKitGTK+ browser" maintainer="Lorem " license="BSD-3-Clause" homepage="https://hacktivis.me/projects/badwolf" +changelog="https://hacktivis.me/releases/badwolf-${version}.txt" distfiles="https://hacktivis.me/releases/badwolf-${version}.tar.gz" -checksum=db275d3d42c4f58e662f04c7c85c5763b70396ea7f750e3f0dd0510ea162fe6d +checksum=57410d2be36ad40c92ce5c73ee87277dd2697f573d5ad112e5bcae73ae7f227d post_install() { vlicense COPYING From e0790f19b4940118c10a56cee29ff34d18c00343 Mon Sep 17 00:00:00 2001 From: Isaac Freund Date: Wed, 21 Apr 2021 22:08:49 +0200 Subject: [PATCH 074/152] libxkbcommon: update to 1.2.1. --- srcpkgs/libxkbcommon/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/libxkbcommon/template b/srcpkgs/libxkbcommon/template index aa45eb16360..9e2fa45bb47 100644 --- a/srcpkgs/libxkbcommon/template +++ b/srcpkgs/libxkbcommon/template @@ -1,6 +1,6 @@ # Template file for 'libxkbcommon' pkgname=libxkbcommon -version=1.0.3 +version=1.2.1 revision=1 wrksrc="${pkgname}-${pkgname#lib}-${version}" build_style=meson @@ -10,11 +10,11 @@ hostmakedepends="pkg-config bison wayland-protocols wayland-devel" makedepends="xkeyboard-config libxcb-devel wayland-devel wayland-protocols" depends="xkeyboard-config" short_desc="Library to handle keyboard descriptions" -maintainer="Orphaned " +maintainer="Isaac Freund " license="MIT" homepage="https://xkbcommon.org/" distfiles="https://github.com/xkbcommon/libxkbcommon/archive/xkbcommon-${version}.tar.gz" -checksum=5d10a57ab65daad7d975926166770eca1d2c899131ab96c23845df1c42da5c31 +checksum=50684541c11686203650f6ac8fe9b4b0343158fb7c54fbb0c86147f1ff5a5dbc post_install() { vlicense LICENSE From 63f49c193bbfab510bcc2e4a85187e591da0fe3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= Date: Wed, 21 Apr 2021 18:36:24 -0300 Subject: [PATCH 075/152] pulseaudio: remove INSTALL and move INSTALL.msg. INSTALL script installed a /usr/lib32 symlink to /usr/lib on x86 machines (added in 5bb3a0cf7bd39c5de60cf272bb1fe069a001af7f), which has been unnecessary for a long time, given that base-files contains the symlink already. It was also the wrong solution: libdir being special cased to /usr/lib32 on i686 (to provide the multilib repo) should have led to the symlink being part of some base package, not a workaround in a specific package. Furthermore, ever since 488edb2a9ce9bb81a137c5932b9ddbe3d4fd6d44, the package follows Void's policy of always using /usr/lib$wordsize as libdir, instead of /usr/lib, and most things dealing with library paths shouldn't be package specific. --- Since we are here: INSTALL.msg doesn't need to be printed every time the package is updated, so move to README.voidlinux. Don't use -f in rm commands. --- srcpkgs/pulseaudio/INSTALL | 7 ------- srcpkgs/pulseaudio/{INSTALL.msg => files/README.voidlinux} | 0 srcpkgs/pulseaudio/template | 5 +++-- 3 files changed, 3 insertions(+), 9 deletions(-) delete mode 100644 srcpkgs/pulseaudio/INSTALL rename srcpkgs/pulseaudio/{INSTALL.msg => files/README.voidlinux} (100%) diff --git a/srcpkgs/pulseaudio/INSTALL b/srcpkgs/pulseaudio/INSTALL deleted file mode 100644 index b4647d5e671..00000000000 --- a/srcpkgs/pulseaudio/INSTALL +++ /dev/null @@ -1,7 +0,0 @@ -case "${ACTION}" in -post) - if [ "$ARCH" = "i686" ]; then - ln -sf lib usr/lib32 - fi - ;; -esac diff --git a/srcpkgs/pulseaudio/INSTALL.msg b/srcpkgs/pulseaudio/files/README.voidlinux similarity index 100% rename from srcpkgs/pulseaudio/INSTALL.msg rename to srcpkgs/pulseaudio/files/README.voidlinux diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template index 01ddc8ed732..554e241e73a 100644 --- a/srcpkgs/pulseaudio/template +++ b/srcpkgs/pulseaudio/template @@ -1,7 +1,7 @@ # Template file for 'pulseaudio' pkgname=pulseaudio version=14.2 -revision=2 +revision=3 build_style=meson # XXX: new version should be able to enable systemd functionality using elogind configure_args="-Djack=enabled -Dlirc=disabled -Dhal-compat=false -Dorc=enabled @@ -47,8 +47,9 @@ pre_configure() { } post_install() { - rm -f ${DESTDIR}/etc/dbus-1/system.d/pulseaudio-system.conf + rm ${DESTDIR}/etc/dbus-1/system.d/pulseaudio-system.conf vsv pulseaudio + vdoc $FILESDIR/README.voidlinux } libpulseaudio_package() { From 3c9cffe17d8bf53f1211ca9e0691f9ea731a95df Mon Sep 17 00:00:00 2001 From: yopito Date: Mon, 12 Apr 2021 08:46:26 +0200 Subject: [PATCH 076/152] nextcloud-client: update to 3.2.0 --- ...ariadic-macro-warning-only-for-clang.patch | 36 +++++++++++++++++++ .../patches/test-check_vio.patch | 15 -------- srcpkgs/nextcloud-client/template | 9 +++-- 3 files changed, 40 insertions(+), 20 deletions(-) create mode 100644 srcpkgs/nextcloud-client/patches/fix-clang-variadic-macro-warning-only-for-clang.patch delete mode 100644 srcpkgs/nextcloud-client/patches/test-check_vio.patch diff --git a/srcpkgs/nextcloud-client/patches/fix-clang-variadic-macro-warning-only-for-clang.patch b/srcpkgs/nextcloud-client/patches/fix-clang-variadic-macro-warning-only-for-clang.patch new file mode 100644 index 00000000000..58d43431868 --- /dev/null +++ b/srcpkgs/nextcloud-client/patches/fix-clang-variadic-macro-warning-only-for-clang.patch @@ -0,0 +1,36 @@ +source: https://github.com/nextcloud/desktop/pull/3132 + +From 52951820b2c094bcff0ec1a36c3c89d1c08c9618 Mon Sep 17 00:00:00 2001 +From: yopito +Date: Wed, 14 Apr 2021 22:07:19 +0200 +Subject: [PATCH] clang's variadic macro warnings: only for clang + +following settings of cmake/modules/Warnings.cmake +--- + src/CMakeLists.txt | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git src/CMakeLists.txt src/CMakeLists.txt +index f29349582..6f3145331 100644 +--- src/CMakeLists.txt ++++ src/CMakeLists.txt +@@ -30,10 +30,12 @@ if(NOT MSVC) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_FORTIFY_SOURCE=2") + endif() + +- # Calling Qt's qCWarning(category, ...) with no params for "..." is a GNU +- # extension (C++11 §16.3/4 forbids them). Silence clang's warnings. +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-gnu-zero-variadic-macro-arguments") +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-gnu-zero-variadic-macro-arguments") ++ if (CMAKE_CXX_COMPILER MATCHES "Clang") ++ # Calling Qt's qCWarning(category, ...) with no params for "..." is a GNU ++ # extension (C++11 §16.3/4 forbids them). Silence clang's warnings. ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-gnu-zero-variadic-macro-arguments") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-gnu-zero-variadic-macro-arguments") ++ endif() + endif() + + if(WIN32) +-- +2.31.1 + diff --git a/srcpkgs/nextcloud-client/patches/test-check_vio.patch b/srcpkgs/nextcloud-client/patches/test-check_vio.patch deleted file mode 100644 index 82d78843b96..00000000000 --- a/srcpkgs/nextcloud-client/patches/test-check_vio.patch +++ /dev/null @@ -1,15 +0,0 @@ -fails if runned from within a github actions, so disable it. -NB: works fine on regular personnal xbps-src usage. - ---- test/csync/vio_tests/check_vio.cpp.ORIG 2020-12-22 10:54:32.000000000 +0100 -+++ test/csync/vio_tests/check_vio.cpp 2020-12-26 15:16:07.118993372 +0100 -@@ -122,9 +122,6 @@ - rc = _tmkdir(dir, (S_IWUSR|S_IXUSR)); - assert_int_equal(rc, 0); - -- dh = csync_vio_opendir(csync, CSYNC_TEST_DIR); -- assert_null(dh); -- assert_int_equal(errno, EACCES); - - _tchmod(dir, MKDIR_MASK); - c_free_locale_string(dir); diff --git a/srcpkgs/nextcloud-client/template b/srcpkgs/nextcloud-client/template index 2382d7d337f..cd130c14be8 100644 --- a/srcpkgs/nextcloud-client/template +++ b/srcpkgs/nextcloud-client/template @@ -1,10 +1,10 @@ # Template file for 'nextcloud-client' pkgname=nextcloud-client -version=3.1.2 -revision=2 +version=3.2.0 +revision=1 wrksrc="desktop-${version}" build_style=cmake -configure_args="-Wno-dev -DNO_SHIBBOLETH=True" +configure_args="-Wno-dev" hostmakedepends="pkg-config" makedepends="qt5-tools-devel qt5-declarative-devel qt5-webchannel-devel qt5-location-devel qtkeychain-qt5-devel sqlite-devel libcloudproviders-devel @@ -19,7 +19,7 @@ maintainer="yopito " license="GPL-2.0-or-later" homepage="https://nextcloud.com/clients/" distfiles="https://github.com/nextcloud/desktop/archive/v${version}.tar.gz" -checksum=2fb2c18f479be2a04cf999f037def705c4be0087816af727038f0c71cb2c6189 +checksum=da1195b31fec0970121c1567f3cdaf3b9083d46727277116a98e5cd27f57aa60 build_options="dolphin" desc_option_dolphin="Build KDE dolphin support" @@ -77,6 +77,5 @@ nextcloud-client-devel_package() { pkg_install() { vmove usr/include vmove usr/lib/libnextcloudsync.so - vmove "usr/lib/nextcloud/*.so" } } From c436c6bb1e4b10e0079614c452f62a54b5e069f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= Date: Wed, 21 Apr 2021 19:43:44 -0300 Subject: [PATCH 077/152] linux5.11: update to 5.11.16. --- srcpkgs/linux5.11/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/linux5.11/template b/srcpkgs/linux5.11/template index 763098e4957..aa98468325f 100644 --- a/srcpkgs/linux5.11/template +++ b/srcpkgs/linux5.11/template @@ -1,6 +1,6 @@ # Template file for 'linux5.11' pkgname=linux5.11 -version=5.11.15 +version=5.11.16 revision=1 wrksrc="linux-${version%.*}" short_desc="Linux kernel and modules (${version%.*} series)" @@ -10,7 +10,7 @@ homepage="https://www.kernel.org" distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz" checksum="04f07b54f0d40adfab02ee6cbd2a942c96728d87c1ef9e120d0cb9ba3fe067b4 - c6e3d81d5c3e70a2fcc2dd2e622761d3b12b36fdc7d168d47831ac215eed142b" + 5c3f42864b2c28393289560376c686a2d75bc8bdac6a9d7f2d00c7bd1441264e" skip_extraction="patch-${version}.xz" python_version=3 patch_args="-Np1" From c9d2f51020e2b7d5653c308533506424714fa6f5 Mon Sep 17 00:00:00 2001 From: Imran Khan Date: Tue, 20 Apr 2021 20:01:37 +0600 Subject: [PATCH 078/152] fselect: update to 0.7.4. --- srcpkgs/fselect/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fselect/template b/srcpkgs/fselect/template index a1f78875f89..9bc1fe21865 100644 --- a/srcpkgs/fselect/template +++ b/srcpkgs/fselect/template @@ -1,6 +1,6 @@ # Template file for 'fselect' pkgname=fselect -version=0.7.2 +version=0.7.4 revision=1 build_style=cargo short_desc="Find files with SQL-like queries" @@ -8,7 +8,7 @@ maintainer="SolitudeSF " license="Apache-2.0, MIT" homepage="https://github.com/jhspetersson/fselect" distfiles="${homepage}/archive/${version}.tar.gz" -checksum=8b2cbf8aff709ffcab49ed59330655669ab185a524e89a101141d80cc025063b +checksum=c3bf4096419ae8ff5390b6f0d064cfd2917169d41841071c61e6f265ebf11d7a post_install() { vlicense LICENSE-MIT From da7c4aa72d4d85d6d3f2ebc113536019e7d668d8 Mon Sep 17 00:00:00 2001 From: FollieHiyuki Date: Tue, 20 Apr 2021 16:17:29 +0300 Subject: [PATCH 079/152] hugo: update to 0.82.1 --- srcpkgs/hugo/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template index 531c1e3d609..ee37134f268 100644 --- a/srcpkgs/hugo/template +++ b/srcpkgs/hugo/template @@ -1,6 +1,6 @@ # Template file for 'hugo' pkgname=hugo -version=0.82.0 +version=0.82.1 revision=1 build_style=go go_import_path="github.com/gohugoio/hugo" @@ -12,7 +12,7 @@ maintainer="Andrea Brancaleoni " license="Apache-2.0" homepage="https://gohugo.io" distfiles="https://github.com/gohugoio/hugo/archive/v${version}.tar.gz" -checksum=f156c31034f013b11ff19aec09ab4d47fd8689befaa6f58222b48ed970722b4b +checksum=3190ae848fdb1a04339c233faab5934c422d85cf85ea3b0c0b5a842239c84e75 build_options="pygments extended" desc_option_pygments="Alternative syntax highlighter" From 189cfa7e293b60f11ca167e5b9485767f4d5a9d3 Mon Sep 17 00:00:00 2001 From: travankor Date: Wed, 21 Apr 2021 16:22:19 -0700 Subject: [PATCH 080/152] mesa: update to 21.0.3. --- srcpkgs/mesa/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template index 0dbe36205d7..18384766c74 100644 --- a/srcpkgs/mesa/template +++ b/srcpkgs/mesa/template @@ -1,6 +1,6 @@ # Template file for 'mesa' pkgname=mesa -version=21.0.2 +version=21.0.3 revision=1 wrksrc="mesa-${version}" build_style=meson @@ -23,7 +23,7 @@ license="MIT, LGPL-2.1-or-later" homepage="https://www.mesa3d.org/" changelog="https://docs.mesa3d.org/relnotes/${version}.html" distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz" -checksum=46c1dc5bb54a372dee43ec3c067229c299187d5bdadf1402756bbf66a6df5b88 +checksum=565c6f4bd2d5747b919454fc1d439963024fc78ca56fd05158c3b2cde2f6912b if [ "$XBPS_TARGET_LIBC" = "musl" ]; then configure_args+=" -Duse-elf-tls=false" From b82956b3cb23bbb0c2cd83620fd152085f536dad Mon Sep 17 00:00:00 2001 From: q66 Date: Thu, 22 Apr 2021 03:45:39 +0200 Subject: [PATCH 081/152] libwpe: switch to build_style=meson --- srcpkgs/libwpe/template | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/srcpkgs/libwpe/template b/srcpkgs/libwpe/template index e09c714fbfe..99e1859ca63 100644 --- a/srcpkgs/libwpe/template +++ b/srcpkgs/libwpe/template @@ -1,8 +1,8 @@ # Template file for 'libwpe' pkgname=libwpe version=1.10.0 -revision=1 -build_style=cmake +revision=2 +build_style=meson hostmakedepends="pkg-config" makedepends="MesaLib-devel libxkbcommon-devel" short_desc="General-purpose library for WPE WebKit" @@ -12,10 +12,6 @@ homepage="https://wpewebkit.org" distfiles="https://wpewebkit.org/releases/${pkgname}-${version}.tar.xz" checksum=2415e270d45e3595ed4052bc105f733744dc2d3677e12ff4a831e5029841084d -do_check() { - : # no tests -} - post_install() { vlicense COPYING } From 3f151932539950a2eb3ec47cae79f163781747c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 16 Apr 2021 21:24:59 +0700 Subject: [PATCH 082/152] nss: update to 3.64. Closes https://github.com/void-linux/void-packages/pull/30264 --- srcpkgs/nss/template | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template index 5c766a79dd8..fde4f42ded0 100644 --- a/srcpkgs/nss/template +++ b/srcpkgs/nss/template @@ -3,7 +3,7 @@ _nsprver=4.29 pkgname=nss -version=3.63 +version=3.64 revision=1 hostmakedepends="perl" makedepends="nspr-devel sqlite-devel zlib-devel" @@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh " license="MPL-2.0" homepage="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS" distfiles="${MOZILLA_SITE}/security/nss/releases/NSS_${version//\./_}_RTM/src/nss-${version}.tar.gz" -checksum=182d2fef629102ae9423aabf2c192242b565cf5098e82c5a26cf70c5e4ea2221 +checksum=d3175427172e9c3a6f1ebc74452cb791590f28191c6a1a443dbc0d87c9df1126 export NS_USE_GCC=1 export LIBRUNPATH= @@ -44,10 +44,13 @@ do_build() { *) export NSS_DISABLE_AVX2=1 ;; esac - # it's actually VSX, so disable on all BE ppc case "$XBPS_TARGET_MACHINE" in ppc64le*) ;; - ppc*) export NSS_DISABLE_ALTIVEC=1 ;; + ppc64*) export NSS_DISABLE_CRYPTO_VSX=1 ;; + ppc*) + export NSS_DISABLE_CRYPTO_VSX=1 + export NSS_DISABLE_ALTIVEC=1 + ;; esac cd nss From 74f709768c6be3dfc57150c42470e187d82d6755 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= Date: Thu, 22 Apr 2021 02:44:15 -0300 Subject: [PATCH 083/152] mesa: revbump to build multilib packages properly. Something went wrong with the last run in builders: => Registering new packages to /host/binpkgs/multilib (x86_64) index: failed to read props.plist metadata for `/host/binpkgs/multilib/libglapi-32bit-21.0.3_1.x86_64.xbps', skipping! index: failed to read props.plist metadata for `/host/binpkgs/multilib/libgbm-32bit-21.0.3_1.x86_64.xbps', skipping! index: failed to read props.plist metadata for `/host/binpkgs/multilib/libOSMesa-32bit-21.0.3_1.x86_64.xbps', skipping! index: failed to read props.plist metadata for `/host/binpkgs/multilib/mesa-vulkan-radeon-32bit-21.0.3_1.x86_64.xbps', skipping! index: failed to read props.plist metadata for `/host/binpkgs/multilib/mesa-ati-dri-32bit-21.0.3_1.x86_64.xbps', skipping! index: failed to read props.plist metadata for `/host/binpkgs/multilib/mesa-vulkan-intel-32bit-21.0.3_1.x86_64.xbps', skipping! index: failed to read props.plist metadata for `/host/binpkgs/multilib/mesa-intel-dri-32bit-21.0.3_1.x86_64.xbps', skipping! index: failed to read props.plist metadata for `/host/binpkgs/multilib/mesa-nouveau-dri-32bit-21.0.3_1.x86_64.xbps', skipping! index: failed to read props.plist metadata for `/host/binpkgs/multilib/libxatracker-32bit-21.0.3_1.x86_64.xbps', skipping! index: added `MesaLib-devel-32bit-21.0.3_1' (x86_64). index: added `mesa-32bit-21.0.3_1' (x86_64). index: added `mesa-XvMC-32bit-21.0.3_1' (x86_64). index: added `mesa-dri-32bit-21.0.3_1' (x86_64). index: added `mesa-opencl-32bit-21.0.3_1' (x86_64). index: added `mesa-vaapi-32bit-21.0.3_1' (x86_64). index: added `mesa-vdpau-32bit-21.0.3_1' (x86_64). index: added `mesa-vmwgfx-dri-32bit-21.0.3_1' (x86_64). index: added `mesa-vulkan-overlay-layer-32bit-21.0.3_1' (x86_64). Since this didn't happen during local testing or on CI, a revbump should hopefully be enough. --- srcpkgs/mesa/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template index 18384766c74..267419298ba 100644 --- a/srcpkgs/mesa/template +++ b/srcpkgs/mesa/template @@ -1,7 +1,7 @@ # Template file for 'mesa' pkgname=mesa version=21.0.3 -revision=1 +revision=2 wrksrc="mesa-${version}" build_style=meson configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled From 96a0646436e4e63ee3eed078c348513222ba51af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= Date: Thu, 22 Apr 2021 12:51:27 -0300 Subject: [PATCH 084/152] .mailmap: add entry for howtologinquickwiththirtyninecharacters Original entry "broke" column view for software like tig, so use the username and email from other contributions from same user. --- .mailmap | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.mailmap b/.mailmap index 8a874ff3a39..b0305c467b9 100644 --- a/.mailmap +++ b/.mailmap @@ -53,3 +53,5 @@ Daniel Kolesa q66 teldra Teldra teldra xor Andrew J. Hesford Andrew J. Hesford + +howtologinquickwiththirtyninecharacters It looks like the profile name is limited to 256 characters, just like most error messages here it says 255 characters but we know better, do we? As usual, let's try to fill it with meaningless words about nothing at all. Maybe I can reach its limit. End <61999526+howtologinquickwiththirtyninecharacters@users.noreply.github.com> From ba62d1ce5d9eba24fbe55a96210c14321a52165d Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Thu, 22 Apr 2021 17:36:51 +0200 Subject: [PATCH 085/152] stress-ng: update to 0.12.07. --- srcpkgs/stress-ng/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/stress-ng/template b/srcpkgs/stress-ng/template index 15199b9aecf..c278479af58 100644 --- a/srcpkgs/stress-ng/template +++ b/srcpkgs/stress-ng/template @@ -1,6 +1,6 @@ # Template file for 'stress-ng' pkgname=stress-ng -version=0.12.06 +version=0.12.07 revision=1 build_style=gnu-makefile make_use_env=1 @@ -9,4 +9,4 @@ maintainer="Leah Neukirchen " license="GPL-2.0-or-later" homepage="http://kernel.ubuntu.com/~cking/stress-ng/" distfiles="http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${pkgname}-${version}.tar.xz" -checksum=75eb340266b1bbae944d8f9281af978bd5bc2c8085df97a098d5500d6f177296 +checksum=cf73e3a4c7d95afa46aa27fb9283a8a988f3971de4ce6ffe9f651ca341731ead From 6fc86e7d022550f8e785c9a09266c54909dd7e5c Mon Sep 17 00:00:00 2001 From: Johannes Date: Wed, 21 Apr 2021 21:30:44 +0200 Subject: [PATCH 086/152] firefox: update to 88.0. --- srcpkgs/firefox/patches/disable-minidump.patch | 2 +- srcpkgs/firefox/template | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/srcpkgs/firefox/patches/disable-minidump.patch b/srcpkgs/firefox/patches/disable-minidump.patch index 55f67c5d39b..5c440076474 100644 --- a/srcpkgs/firefox/patches/disable-minidump.patch +++ b/srcpkgs/firefox/patches/disable-minidump.patch @@ -17,7 +17,7 @@ index 4076a60577..945f26f638 100644 # failure's backtrace feature might break our builds, see bug 1608157. failure = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" } failure_derive = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" } --minidump_writer_linux = { git = "https://github.com/msirringhaus/minidump_writer_linux.git", rev = "9191af36343846b2c7ada65b9602b481b717c4d8" } +-minidump_writer_linux = { git = "https://github.com/msirringhaus/minidump_writer_linux.git", rev = "01c7a0da8d34059f7dae8ab9e7512529ff16347a" } [patch.crates-io.cranelift-codegen] git = "https://github.com/mozilla-spidermonkey/wasmtime" diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template index a8ba08719eb..fdc688c6089 100644 --- a/srcpkgs/firefox/template +++ b/srcpkgs/firefox/template @@ -3,7 +3,7 @@ # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n". # pkgname=firefox -version=87.0 +version=88.0 revision=1 build_helper="rust" short_desc="Mozilla Firefox web browser" @@ -11,7 +11,7 @@ maintainer="Johannes " license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://www.mozilla.org/firefox/" distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz" -checksum=ce98be0522f971b6950f22c738c4b2caf19cf7f48ab2ae2e6d46694af7fd58ab +checksum=6b50dbfb393f843e4401e23965a1d8f7fd44b5a7628d95138294094094eee297 lib32disabled=yes @@ -64,10 +64,6 @@ post_extract() { ;; esac - # Google API key (see http://www.chromium.org/developers/how-tos/api-keys) - # Note: This is for Void Linux use ONLY. - echo -n "AIzaSyCIFdBA7eQP43R6kXRwTq7j6Mvj1ITze90" > google-api-key - # Mozilla API keys (see https://location.services.mozilla.com/api) # Note: This is for Void Linux use ONLY. echo -n "cd894504-7a2a-4263-abff-ff73ee89ffca" > mozilla-api-key @@ -166,8 +162,6 @@ do_build() { export AS=$CC cat <>.mozconfig -ac_add_options --with-google-location-service-api-keyfile="${wrksrc}/google-api-key" -ac_add_options --with-google-safebrowsing-api-keyfile="${wrksrc}/google-api-key" ac_add_options --with-mozilla-api-keyfile="${wrksrc}/mozilla-api-key" ac_add_options $(vopt_enable alsa) ac_add_options $(vopt_enable jack) From 6b3cebca7b18c2ed9fcb86d0d9148cb9e19d3d37 Mon Sep 17 00:00:00 2001 From: Johannes Date: Wed, 21 Apr 2021 21:31:04 +0200 Subject: [PATCH 087/152] firefox-i18n: update to 88.0. --- srcpkgs/firefox-i18n/template | 194 +++++++++++++++++----------------- 1 file changed, 97 insertions(+), 97 deletions(-) diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template index 8d9361cc775..a73c83f152e 100644 --- a/srcpkgs/firefox-i18n/template +++ b/srcpkgs/firefox-i18n/template @@ -1,6 +1,6 @@ # Template file for 'firefox-i18n' pkgname=firefox-i18n -version=87.0 +version=88.0 revision=1 build_style=meta short_desc="Firefox language packs" @@ -140,99 +140,99 @@ _pkgtmpl() { } } -checksum="d1e2d105de95506ac492db9227c9bbbcda5a4e7bfd4fcdc5e9e00581022409e4 - 01351f2e6cc1b29d708b3c28fdca5a1eed281cebf74ec20047ad391d2dab50f6 - c6687681eaea5f67ecd32e0fb472eba0bc309d70dd29f804bc4b9554b6382ea7 - 1832c1cd9d1f5ce9275f606177ee0b360f22021982e119034bb5e010dc6504a9 - b0cb337a77b787cf098bdec66f3ab39b1bc1020357d022e4e1206b73ce78390e - 51ce59eb5fe02a4900f1d9a58f7fb452b7b28dcb8fcf8f4336cc1ab5a641c03f - d3cae593077f7117017bb18ff43d1d5f2ea085c883d8d1d5c1cc86637ad54ffd - cde7feb0cd0cc97d2bc158e31c7fe51e802eda14198e74ad79c66f04e6d6442a - 7430babdb570d4c164ec52fdacc365587251980d36173105a789c3306f48c357 - f42637799eede7d54d26edc27ee764db6a27b14d8cd0dc831a156c764a5d5161 - 891a057e0b89dfaef33049c4b89ba2f022b993e1b20574a875fba136a7705089 - 42bf7a18097db270f0d3c39ad4e36f639eadaf8da4d12b727d89d11fe5023bcd - 5cdc24dd5717215719b080cfbfb315311c713a88f99d05a20e137e42a076197b - 2552db539ff62848e8ab00470d04326cced80931fb9ff85f4d1fe42dbf037259 - 36d841e3bf1bf796ecb35b002fe7ad8df1fa7f6afc6ad1495aa5aa23384ac5c6 - c599bce4cfba87803772d42beec9dfca82c5526bbb84ffca0d43619ba6b1850b - 26fde9b15e4f86a69db0293c00e091dd3be7dd625d145b0398912ea781845a9e - 8352abf54e5b2c4df588d649060ebca2e4981495ed5750c5594b19583df49a02 - b86448909258199ea18718ba955ed8b77c0b0f5de27b3d693aaa04e1aa8fa7a6 - 8eb8d30143ee79a2004fcfb480c612e265165072319a6d29fb9e8450e8bc0c81 - fe3f3fb58b2df9183069fa15b6655af1ddbfba84d1ee73f92d50131f321a5e29 - dbe6ea63212798aeb1417b4e6cf2dcc30db5e8c959075a7a0f1cdbf83b525dfe - e8f93991aca36a7eb3ce8bf8a398ce53df9f65e0349dc1e11e74d7409a060744 - b5099e0caad7826be0f9b47d09438b54e22394475663a9ae3a3e1654ef58b434 - a9b122c66d07330fac0b14c5baba29459454244c49acf71324c77ae62b3cb9c2 - cf4947982416075e54b475c5be5d5ea88e34e0613dc7edbffa392f47b546f806 - 1195bbfbea0018b92467183deaedf0746451ebe6d2daef4aa7a06abe5a1f3e73 - 4fdc0caa3a0bb610133bcf2ba4c7733e44d7b4a020871565b58d7d728db27423 - 3ffbeb5af967630ce17999e501ad9ef14c7b3ffa50815e0057b1a82d11645cba - 91097777de3a4574566911c03d025f2580a487d7bd577b2ce410b6e01590247f - 2353f0cbb0ca615e09696a310267fd8f2143ef6ce9fa538a57391c92bcab5a8a - c9cc8018d00df57061049aa162756d5d63e6426c568da23c9e98d3626c75273e - 8c7bffac08f163700b0b04037fbc3e94d25e4b10569dbca67303b01ae099b95a - 1c3fd925c05df5df0e6c31eee73f8f994226da3fb51048e06b455d91252a3d69 - 75803f71e173075adee196d17c7ad8f6fb9583ce5dbe2c95fa5507f0bd06f2e8 - d55a4f76300bf6c65271c009a22d2014c860c7498c77efce0e5b25e863ee56ee - 2c71ba0c37d6b4009105131720f8654b49a596c0b5a82cb946090ab08d3b4633 - a38707ce837b2951426541eacbdb8d54fe1fb571aa688e17ae37fe68eda1558a - 50e864c2092ef011ef9468cc942e5558ada194d2cdffebe08aafee1cf828cc72 - da0518cfd6b7c17fd648c30b48eae6f8fa6d25c94974a779e248e74eaf663a54 - c052b291eab3c8886f9e6004a6fbac1cd72cba47386dad1ee9c35a4c2f6028ae - 5e754ae4bd1e62dc7fbfd86b17224b4e53e07839b459c1c9eedc01ae7d0eea4c - 074e6b9500005a2e784c3be9ac02cbb174c3eb6d3a3806142f9552f58fe83f48 - 889ade43266b67293eb4944daf2d8cf5ad4cef9df68b831628552a83e4ac725a - 2b9b7236d30b987a82931a576e7b419ba9814b5b40933ab4bab1ca40402717ae - 0aebebb6597b49a49a53d2193043801b3fba3bc2745065268a0d9ebd20d11a33 - d27030e36e8857ba7fca384df21079dcdb1e3cc4b753e69462e3f1cb171e4e4f - 141c74d88cd41efd49cfd4f010c66cee03a355e1174c26399903f763b16e22f0 - 75ed089e5b417174a621d7100d7701fdf646c19019b006df43b62c45c11471f4 - c38f03d1b2e3ebc70571daba4a6eadb50d5f99a28de44a863d04ac8b005f9d4b - 0cc12225c2aca9a4ef3603026f7b1977cb4234f49c3605fd42b814bd53753f23 - 6c387b966dc66152f886163d524e4b6e410a9a22a532be44884c4685edf9b749 - 9130b034b4f7f33e61fb3e318395a2a3807126a1d711adfb16a9966b2f5d902b - ee2db2900e36ba1f823d38a8e39497215b0652b0e2184f1ea5942812e59def01 - adf75fc6ea23372e473aa8e5c91a6054d1c435c4029c2d5a7741c3894942aeda - 7c25085b1c6654ca2ee928fb6b70e98606f06762c09a438c1e6d774030b3ea7b - 24bf2101e4c27bcef803759ad32903b6b0389e4ff0db7ae4df62ed28ba18bec8 - e0b6ce49420ad06705cd186406f0e3a41799edf730d2241672d03ce77267e00f - 9bda2429e3d92184eb70740e730ec361af021a48080fca1eaa3004e2e438022e - 8a894503fbf68203911463def3adb3c3ac7853c8f4640ddc6dfa5695d5ba9522 - e4bad7f42efd58a9c3b8ee131f3e689460602a2862f06a5ad11652d3e3a1438c - e38516ff3902c3f82e6a92d2cc7fe385cc912ed543c6c5957625a254633705fc - 2f925f382d45f8d6d6d287a1444aab5136373214f88ca48e2c079393fa613fc1 - 15a472eb1cc5f7e72d2d205b6830c78ac61d3e9a85420ea9ba13bc8c3134d418 - bc824e2da09ff8da71dc0cac0a4da3547be3b0ad4635380438fcd371ef7caa3f - 4f4d6cf74ffee459bfe5a842f29eee70c3c04409ed4deb0f34c957ce22d4906c - 90837cb76ec549e90e16afc015bd0110622c9681f126377b71698cc29aa0d451 - d761b47ccd1d45546f4035e5c06d46ca511aa79bd2dd560cb65c27bdc533b261 - a0cb14552be607fb610e4196c0f0ff20c6fd9fb2225808b6fbfb4516f38e9a8f - d445bba51216686a580793e6f47588833a9c2a8d88c8133c1cfa266fb70d1b6a - 829621f483c2ee700c289159b6a6f9185b25f79a4f3d376c3a95bab9eb4bc771 - e65581605ef2940d2e300a09d388dcb3869e3333ba77ef9de5f5610106598e7d - 6a4712d433ea85eca4e2cd32cfc467a8717f8280610e155ba481d99f16c6d3ca - b9ce23f90bfb5ba95e4515074233128b6d61896bfd33cee22cbed4c7c4147dcd - 8f2474ee7b737fd22ea86084c533567125f9504bb98c1fdb5898d05a6cad613a - 0123e7b8d8cf0f4f0474dc62b93428d63d0dc423a9a53adb3e7b28d40bb4fbb8 - 28ff00508f9c8b0911c808a606edb536efb523b0f361367ad85f9326de4e7734 - 9fa20f7025663bdbb4adf699da123352995cdd4ead088eca3b0c54a827d7bcb0 - 81e5b0fe991b1d16fb443c08ec8500d57d5ae61b2eae892e6da418d6dad4f54e - ce26e656580fed093f352c8de05f176831e109af78533c26f1bfa9fa79da8f83 - 63db0a0572443d73f5229b39e1335bf72206a0822787c5eff1aef539d72e0db0 - b78c790d0a192578d4423d5ff7b6766bc0d201e915d9fb8b06f4732a05df384b - cc6195820338da2ea15e06cd394dc083ede55a7089568ba08eea6ca40eb3cbc7 - 9d38f83e3aa09163daf6577708d308629f36e7f0c4391fae91e8cb9b0e381fdb - 73003f8f885ec53f44d3d3437a2ff7d4a57d4502092f0c8823df0f186068c126 - 34839ece9535f009b34a98c9f876513897f193dcd88a99503b6f0a36200c065f - d563ba32adef055e837c4b61833bbc9942f713585d35affd135f5743afb3a49e - 0c29382fe9c0471d560925deec08e01ef36cb008a8f53fe0be0c7dd34fe74cde - e9dc7379d6e579109bafa395ee2d5c9030d3d61b03257b6dcfbef29d837eaf94 - 935bcce0802ffb08e689e7bfb4012a6690c891d8302484837e57bb16922dfd00 - 7910d0bb95b6c42339bd99fb664c14dd94f8b2931cdc7f7dd4a717f812016054 - 01597f20969a2df14e8e2b2f99e718a9092d33f042b85214971dbdef592f5144 - 13eef9c82846f83f2d9913d0b7214de81725a2cc9468aa3e819f454e3f625bf1 - fcdd0082180be53895b344bca7dfa129547979452c82d6230a622989aea2a1cf - d407395855fb18403c1271cb5cebe0b6e2dc6cc0b5c9fa8a49ce14b0d660e304 - 9ca2d545df37e07ea30852dc4928bd2cd1afa25b60e702316ba1b412a1f30c84" +checksum="da88ccf14094a5de19526b4650b4f718db67f3d81f26c0ce1af25ede1a2a42e1 + ce0ae11d1629fd4f691f6033c948ffa89e50e26adb4390bd7645239067615548 + 9c8c18bb150a9c9969e4f0d3969c476ac353fb6d118162b3e1836a3679a42bef + ed8f29b245f2b9f1cf3bb1e45eaccbd9acb875dd60c042b06f5d24d545abadfe + e4f18d5762c3bc66ee973a956aeb88e636c16bb7f665c4d9a240b6419a3b12f1 + d5e24820837ea08f890fe2a9d47f95b704c6f43138d712d238c83e61bfa70f63 + 4eead79524a8f3569928e221d398adde6ea9cb556ac6e8ec5b0e35014e164829 + d09fc47244541f92f4ea8845edbcdb36334e03499dd7c53bc8424b46ab9c0763 + 7bf0fe548926a255266697f23a055f187fbc8d9dabaeb525b599ea606413e7e6 + 9ded5446658221a32cbbfcddcfd1b4a50ec0db9b79574a8910953e0c5b1ee5ec + f2f9b7df0b814cd43a10b8141af9a967426f5b807605e708330173b3ec3ba88a + 4ec43f292136acecad40db971feda1bf628b1a77dc42879c29e4b206dbca5c3f + c3e461c83cd4f1e4ed1c73de3def0b346b41ba9f9a938ac1ceca20b34411d1e6 + 105b7b26c13640eb140b0b122fe4c03a10cdf53288a163d5f8e3b0dc5209c41e + 686dce89d291b34d13aab3c036ac5dd03f9f4c015a4a81056a0a87c878efb20d + 4144b4fafab32651ce7ead86996ce0e0b148d3ad9bd079d8f373fcf9be0d3633 + bc01bafdec35e8d03c9b225556cbe84f649c439f47e73588c07b364dd172ce0a + ad9b46502ef92b0c1aff78fc13b2f097b46316fa145cc370d2e62158e529d304 + e6bc9507d6006620ed9a068a4f0237d0eba62cadd53b9960038ba83680a7d155 + d37421d461f698707a25118694c9a55a4e590802fd4ce919a4e3ddf5f2c17652 + a790bed70e3be94cf6bfe45f07e11a09c57b095af6372bdf01351eb6c0933c4b + 551dcf4bc5ffba65c9bf92d28393778c2907332342bccdaf5fa0e9137b566451 + cc266c2e5f608bd59978218792def6bf361760d4c0c33fc626509dca7faeaa0b + 2c7a7980e0026b2f11596ae723f75f06fbae1e6149a1b482eddfcc7e1ac711d3 + 788750358c49c996811a567740ddc72327f83315f7032cafb9953c139e1adec8 + 3e4dfce301488a300b05dad0b226f0b1fe3d9920d612babdaddac622758fdfdb + d3d445ffe10f4924cb0fcdabf00066f9bcb55fe0ff04add79576f01ecd884dc3 + 9cd056a11a21ac3adbf9ceb3a91d99446b8efdc02549b4237743f8dc0d5cadc9 + edf8641d591d56bc0a087a3d35321ba7ac177cc46cfc2310398dd1337f13644a + 9419aaa55db02a05dfeb00695cfcb4fddbd44784364c9e0273eb55b040bdf6fe + de89528f19d0fe72e528d0b3b2671040a5f60c0a16427ed989e5c8995227e998 + 248b5c1968be6d470312faa4f018674f6956dffcf9e6abb05cc46d7668da7c7d + 171d659668a17bb8998acba23b57818adb9be1c7b6ff028ad378ba812a9d5a8c + 0c2782fa1b1b21cd12bc6848d9567c916f46f829a2ad91b7f5313234cc9f53f1 + fab7d9994dfb13673f1c377e161e4f60780d4193e7af2eec5debc0c69a486e17 + 3938d5510206e2416449e232a14c7b2dcb1455ac33bb8e746a4db6d6855827a9 + f111b803819713db455fba0027f36af9a09da3b591cea19f7e8d342b684aaf6a + b2ede6f0c2e77cd9a20e2947615c001e772462d2716723e4c8566470134e3827 + 8b08ed35173326af40fbc920a7383bffbd2f35f59dfcff9de81bab358f0c7fe4 + 1f8dc9c566c0f7dc08ed232016c5b7109c8d8eeb65c03d6f17be76dcaf81a18d + 8a88f5b1e45653743bc13a94dc2556f4bf8cdd923facee4ea643885e13ccb08c + e1913629be2f7fad964d0b9407e43763521e0e8b6e90963401c55bcb2b7c356f + be67cc96c25afe87784d1601ec59267fc2e521d1181f4334bf8aefc532ea5f3a + 6a6542c847527f5f3894d83aeca2ef7b9b1f0332e1f60b00dc15a4664c009599 + 449c8ba115feacd21315b5042f056189e315a3bd736388a7f0f7fd92c5953c26 + ca409a4060572ba8239721196aaf6ff53307236a64854d776bed1862cebca18c + f857da462c7e5de1bacfd48a6faa4239e7e5ada1e5e3137bbffb09925537f371 + 2fab91fdbdf81798323e82a7321dc04a7b5b53a4ffdaeb073ed9590d804c34bc + 422083d6e3b40cf6b6a60f6207944534115d9f6ea7813b9caaaacb9238b9d7b8 + 1eda0dc20f95e2a4d3cfdcea7806473be0d44549ee91015b3037d3c5a2f785c6 + df038a3715ae11bc0ae368cf23f7cdff62637fca302bb41a9a54d391cb475bc5 + c3ed921ad0c521b3b259ba2ee1181d42830f69a1a9305d8eba7d4a7f3aa75522 + 55b005da1c92309b90945f04b04cac4ea6ec56cc34f69d75590674afd68e7cf7 + 2cb0b12c3009ac920a0a9b5234d412ac5c4960c68f94a2a5124db2d1a0313531 + c596b0c5ae8540afff007de494254727e94a54b837a2503a033f2014ddc59c73 + 1cd550c95f6f166d6bcc45307057eff3d730e07a7c6280c6cf72844602a55675 + fe41ba33a31e0c5294e99c7c0d3364abcdc5b44ca006f42e9f440e57710d36ab + 588a4af16be74e94616b9ef689d1a4e066f3588e1bd1b3a637facce009ef6789 + ac399cc0d4d0779b18296cb00b846ec8799e558139127b398865ebb8ceecdd77 + 02cb1244be4d25cc0398a87c210c4741a97f66774c372bde24faad630eff448f + cc2e550f9c71c435dd101790c6f4e1f0af8e185eaa81a1e1440a69b45cd80303 + b21aac4cbdb26e2743891b637319baf6fd7b5f2ab8b52893d2b26e2448cc0dab + a6219d66630c0e9e991ae6a8afb0539b6b743e8cbd7c9ce5febff5f6b1bc2739 + 533f38e026ace1332ebd0484a4ee0a7832f11c796a5dfce9ee35a5af34ec7ee7 + 172d5969d5d9c4d0ced33153abb52c5fca52603d8fa5e2f2fbf0d2b7b68d8142 + 0d25977a21e9772d2657ca8754717e5f1abba416fdbd5866fa917209c2af560c + 604a4df1799971e5b716e638ee776f30c5558ffddd72f10ba2796a2e2c323503 + 328334d1339b406a8d9b8a9efafbe2e7bb711354a56c3876065a96e64f9c98de + a7f101d7a791b6deb6a2ae9afbf5286568069f73b33655db4323f5f94387f5d4 + 094d5ba532fbd2f2bd07afb739e99886a836cb4a93e57deb8a3e10e70feba449 + f6c97435a64e29c79388b0e40b8ba7a0d774df96e074979bf7cf7343f9a980df + 2f6ca77bf7d4d3fb0a17141918cf3468380e8b477413fa5d1e71ff0aff30f810 + 230731339bd7b96889a06083d4b28b08d942dd73cfeed2a6d247a4e8dbbe6cf8 + f7901d656ad56c1f7e3e38fe6a988f68d8cc94d6890b7f2482b62fe983df0579 + be6403f22dae93e06f04dc303f44ff7ec1f951395c329e0842b6ef84c9487137 + 6cc11c2a68fe9755f065f02558c4f8077fd53c73c7e5f8846eae5365e2873eba + 28c7a9fa809ec38812a2c840466c9403943c8ef47c9c886f4ecbc390a1668617 + 7fa2e4b43fc50f4fea5ed550679745262f27e8db75dfbe3102a4ba78b0250a8b + fb09aa3f793eec95cd97e73fe1c03af81f5e06629ed3afdce77d89d82e3565d8 + 21e5008e10af7b0008de36c6f964a40737b004bf0f49154781d472dbca1b86fa + 9eb985f4fd4f5a6a26b5abe0dead9222d02d76e57b0282a1bced57d2f194be40 + e5c2295733f5b95a3476cc177e825a06a0aa3149a331da054ab5d265cf63f036 + 746872105fa1bd9f68d683ba2d6d0bace16cb31a301dbf99b3b1087d85998629 + e66f933ebcf6c0da6c3334c7b91eee4a20a7a623fb16ca22dfcff7a9c88be9af + ec3390fdb7f96cfd434c2c4ab344b597fbe3bafb799771800f09d509f486858b + 3e9d5f326025153fdb5608be6673b4966b2cb5ffa0b7a54e08dee5f05b01e196 + 3a90521f63e68d86129f3b24814295a2d1e2dce8ff60674cbedea617d9aca969 + dccef3e20f35be84bee5892c77cb64dd2be2de453171ef998244cacd588b861b + c100aded88de30b24e469a361042e4bef94de560681e3f28f9b8d6b0d2c6fd28 + 9e1d373a84bc53f9a6809391717e5c728553ab2609c7c72314d6f1c66094e9b4 + 7fed64f1e1667c8aeb07abc4a6ece100ec8c90e424634917abc87dd1edb500f1 + af9967c67b5f68dd4360ebd0ccd711637a385ab0e42444308d5256be91531664 + ea24d3550c9915da7adc26c1ccbb4996f074e08d299894af26990517644c063b + 8d12b4b4b8129ed1192fdd7987744307c0fcf77133fc058301263525a206b134 + f19a74f2985c20e072337c455a6e62fcebdb85166b915ff1fe44f7ee957fd560 + 4eba6dc24c0dd4abab61b399dc4616f6787a3135a344a6b397c104e01f68abd0" From 9b1232d07643ec455cb605fa9c8386f39ce9f141 Mon Sep 17 00:00:00 2001 From: mobinmob Date: Thu, 22 Apr 2021 23:15:52 +0300 Subject: [PATCH 088/152] opera: update to 75.0.3969.218. --- srcpkgs/opera/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/opera/template b/srcpkgs/opera/template index 420dd20f7b8..33cfccf0d6d 100644 --- a/srcpkgs/opera/template +++ b/srcpkgs/opera/template @@ -1,6 +1,6 @@ # Template file for 'opera' pkgname=opera -version=75.0.3969.149 +version=75.0.3969.218 revision=1 archs="x86_64" depends="ffmpeg desktop-file-utils hicolor-icon-theme" @@ -9,7 +9,7 @@ maintainer="Diogo Leal " license="custom:Proprietary" homepage="https://www.opera.com/computer" distfiles="http://get.geo.opera.com/pub/opera/desktop/${version}/linux/${pkgname}-stable_${version}_amd64.deb" -checksum=cd2e68873eef290d3240283b14a184d914bf251a0177cca5c299494dba095262 +checksum=30603a39b09b1590235850424b18129b3e77bc7ea7daacceab0d80a4a8242767 repository="nonfree" nostrip=yes From a868dcafe23de2efe222b530d2381e932f3050f8 Mon Sep 17 00:00:00 2001 From: mobinmob Date: Fri, 23 Apr 2021 00:00:24 +0300 Subject: [PATCH 089/152] ffsend: update to 0.2.71. --- srcpkgs/ffsend/template | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/srcpkgs/ffsend/template b/srcpkgs/ffsend/template index ea63f719284..c17f6b6ed47 100644 --- a/srcpkgs/ffsend/template +++ b/srcpkgs/ffsend/template @@ -1,7 +1,7 @@ # Template file for 'ffsend' pkgname=ffsend -version=0.2.68 -revision=2 +version=0.2.71 +revision=1 build_style=cargo hostmakedepends="pkg-config" makedepends="openssl-devel" @@ -10,13 +10,9 @@ maintainer="Jasper Chan " license="GPL-3.0-or-later" homepage="https://github.com/timvisee/ffsend" distfiles="https://github.com/timvisee/ffsend/archive/v${version}.tar.gz" -checksum=749046507274f03a1e667cf2302b5b3ac2a977e44ae3f9594be65ce0fca40daf +checksum=c9b1fbc5190bcf83a16f01dbbc7a819ce0191ebe371769133177ca2fa5c42d31 post_extract() { # avoid ring dependency vsed -i 's,"crypto-ring","crypto-openssl",' Cargo.toml } - -pre_build() { - cargo update --package openssl-sys --precise 0.9.58 -} From 30ee15a41e381b377a0d757aeae3b77897111892 Mon Sep 17 00:00:00 2001 From: Stefano Ragni Date: Thu, 22 Apr 2021 19:10:02 +0200 Subject: [PATCH 090/152] pipewire: update to 0.3.26 --- ...07864d3a1739b8dc1a5355057f29b9a37f78.patch | 52 ------------------- srcpkgs/pipewire/template | 4 +- 2 files changed, 2 insertions(+), 54 deletions(-) delete mode 100644 srcpkgs/pipewire/patches/59ed07864d3a1739b8dc1a5355057f29b9a37f78.patch diff --git a/srcpkgs/pipewire/patches/59ed07864d3a1739b8dc1a5355057f29b9a37f78.patch b/srcpkgs/pipewire/patches/59ed07864d3a1739b8dc1a5355057f29b9a37f78.patch deleted file mode 100644 index a033bb5fee7..00000000000 --- a/srcpkgs/pipewire/patches/59ed07864d3a1739b8dc1a5355057f29b9a37f78.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 59ed07864d3a1739b8dc1a5355057f29b9a37f78 Mon Sep 17 00:00:00 2001 -From: Wim Taymans -Date: Fri, 9 Apr 2021 11:55:55 +0200 -Subject: [PATCH] media-session: log info when loading monitor fails - -Log info in all monitor plugins instead of an error. ---- - src/examples/media-session/alsa-monitor.c | 1 + - src/examples/media-session/bluez-monitor.c | 2 +- - src/examples/media-session/v4l2-monitor.c | 1 + - 3 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/examples/media-session/alsa-monitor.c b/src/examples/media-session/alsa-monitor.c -index d97a45a66..72696b772 100644 ---- src/examples/media-session/alsa-monitor.c -+++ src/examples/media-session/alsa-monitor.c -@@ -1061,6 +1061,7 @@ int sm_alsa_monitor_start(struct sm_media_session *session) - impl->handle = pw_context_load_spa_handle(context, SPA_NAME_API_ALSA_ENUM_UDEV, NULL); - if (impl->handle == NULL) { - res = -errno; -+ pw_log_info("can't load %s: %m", SPA_NAME_API_ALSA_ENUM_UDEV); - goto out_free; - } - -diff --git a/src/examples/media-session/bluez-monitor.c b/src/examples/media-session/bluez-monitor.c -index 9481d4472..5a4f30d48 100644 ---- src/examples/media-session/bluez-monitor.c -+++ src/examples/media-session/bluez-monitor.c -@@ -586,7 +586,7 @@ int sm_bluez5_monitor_start(struct sm_media_session *session) - impl->handle = pw_context_load_spa_handle(context, SPA_NAME_API_BLUEZ5_ENUM_DBUS, &impl->props->dict); - if (impl->handle == NULL) { - res = -errno; -- pw_log_error("can't load %s: %m", SPA_NAME_API_BLUEZ5_ENUM_DBUS); -+ pw_log_info("can't load %s: %m", SPA_NAME_API_BLUEZ5_ENUM_DBUS); - goto out_free; - } - if ((res = spa_handle_get_interface(impl->handle, SPA_TYPE_INTERFACE_Device, &iface)) < 0) { -diff --git a/src/examples/media-session/v4l2-monitor.c b/src/examples/media-session/v4l2-monitor.c -index ecb75d085..2b2a92ef3 100644 ---- src/examples/media-session/v4l2-monitor.c -+++ src/examples/media-session/v4l2-monitor.c -@@ -550,6 +550,7 @@ int sm_v4l2_monitor_start(struct sm_media_session *sess) - impl->handle = pw_context_load_spa_handle(context, SPA_NAME_API_V4L2_ENUM_UDEV, NULL); - if (impl->handle == NULL) { - res = -errno; -+ pw_log_info("can't load %s: %m", SPA_NAME_API_V4L2_ENUM_UDEV); - goto out_free; - } - --- -GitLab - diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template index 3536c294cb3..7ed96573fbb 100644 --- a/srcpkgs/pipewire/template +++ b/srcpkgs/pipewire/template @@ -1,6 +1,6 @@ # Template file for 'pipewire' pkgname=pipewire -version=0.3.25 +version=0.3.26 revision=1 build_style=meson configure_args="-Dman=enabled -Dgstreamer=enabled -Ddocs=enabled -Dsystemd=disabled @@ -17,7 +17,7 @@ license="MIT" homepage="https://pipewire.org/" changelog="https://gitlab.freedesktop.org/pipewire/pipewire/-/raw/master/NEWS" distfiles="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${version}/pipewire-${version}.tar.gz" -checksum=fb6d5a0cbde621659ffd67622f19744dd6c8da8745b060cb1951c3d2045e5166 +checksum=05cc9d25de45290c025da5da1b94fc705bddacd93cf3690d0b2988c1ac501ee1 conf_files="/etc/pipewire/*.conf /etc/pipewire/media-session.d/*.conf" build_options="sdl2" From c6d40a368c714e3c66e76b0fcceaf0ec6b651049 Mon Sep 17 00:00:00 2001 From: Sebastian Uharek Date: Thu, 22 Apr 2021 14:10:57 +0200 Subject: [PATCH 091/152] zoom: update to 5.6.16775.0418_1 --- srcpkgs/zoom/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/zoom/template b/srcpkgs/zoom/template index abb73eabe22..eb32d8bf565 100644 --- a/srcpkgs/zoom/template +++ b/srcpkgs/zoom/template @@ -1,6 +1,6 @@ # Template file for 'zoom' pkgname=zoom -version=5.6.13632.0328 +version=5.6.16775.0418 revision=1 archs="x86_64" wrksrc=zoom @@ -13,7 +13,7 @@ maintainer="Daniel Santana " license="custom:Proprietary" homepage="https://zoom.us/" distfiles="https://cdn.zoom.us/prod/${version}/zoom_x86_64.rpm" -checksum=afad3a1c359d36aa8ac78e44fea46abbd2f4e05dd8f54757b001cc6f3457df2b +checksum=b055c5a4255a4675a3603e7d50bb4b918efd90ba68010e27462c977e2d34973f repository=nonfree noshlibprovides=yes noverifyrdeps=yes From 6dfc884400c763b7988e8b7e493a56e2361e7cda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Mon, 19 Apr 2021 13:42:25 +0200 Subject: [PATCH 092/152] peshming: update to 0.3.0. --- srcpkgs/peshming/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/peshming/template b/srcpkgs/peshming/template index 477b3533c3e..d1a45ad0a6e 100644 --- a/srcpkgs/peshming/template +++ b/srcpkgs/peshming/template @@ -1,6 +1,6 @@ # Template file for 'peshming' pkgname=peshming -version=0.2.3 +version=0.3.0 revision=1 wrksrc="peshming" build_style=cargo @@ -10,7 +10,7 @@ maintainer="Jan Christian Grünhage " license="AGPL-3.0-only" homepage="https://git.jcg.re/jcgruenhage/peshming" distfiles="https://git.jcg.re/jcgruenhage/peshming/archive/v${version}.tar.gz" -checksum=491f9a626228d5974ed25ca1ab6fb41e4301d3ecfffde86723a5f4bf96a0d1d7 +checksum=c04b23b803ff379f6c1f691aaf0a20f2e7a9c5be6c24d0ac70e504f4dabe55e3 case "$XBPS_TARGET_MACHINE" in ppc64*) ;; From 1bad30638fb83ec9e0a8a29490ac57916532354c Mon Sep 17 00:00:00 2001 From: FollieHiyuki Date: Sun, 18 Apr 2021 14:38:24 +0300 Subject: [PATCH 093/152] grim: update to 1.3.2 --- srcpkgs/grim/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/grim/template b/srcpkgs/grim/template index 61844769456..89af643b6a7 100644 --- a/srcpkgs/grim/template +++ b/srcpkgs/grim/template @@ -1,6 +1,6 @@ # Template file for 'grim' pkgname=grim -version=1.3.1 +version=1.3.2 revision=1 build_style=meson configure_args="-Djpeg=enabled -Dwerror=false" @@ -10,8 +10,8 @@ short_desc="Grab images from a Wayland compositor" maintainer="Derriick " license="MIT" homepage="https://wayland.emersion.fr/grim/" -distfiles="https://github.com/emersion/$pkgname/archive/v$version.tar.gz" -checksum=b1ab720b5dbcd560cfa34bbd7e0cbe85330f701c471b12e2489dfec15bcf216e +distfiles="https://github.com/emersion/grim/archive/v${version}.tar.gz" +checksum=42c2952e98389506156c08e40e0c37afdc2ec5ef4d55a5a4febde6acdac4d1c8 post_install() { vlicense LICENSE From 259348f3c69b5361bfb82fa812aa57d379ce241c Mon Sep 17 00:00:00 2001 From: FollieHiyuki Date: Sun, 18 Apr 2021 14:41:08 +0300 Subject: [PATCH 094/152] slurp: update to 1.3.2 --- srcpkgs/slurp/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/slurp/template b/srcpkgs/slurp/template index 95a24b2f712..7e8f02a52a4 100644 --- a/srcpkgs/slurp/template +++ b/srcpkgs/slurp/template @@ -1,6 +1,6 @@ # Template file for 'slurp' pkgname=slurp -version=1.3.1 +version=1.3.2 revision=1 build_style=meson hostmakedepends="pkg-config wayland-devel scdoc" @@ -9,8 +9,8 @@ short_desc="Select a region in a Wayland compositor" maintainer="Derriick " license="MIT" homepage="https://wayland.emersion.fr/slurp/" -distfiles="https://github.com/emersion/${pkgname}/archive/v${version}.tar.gz" -checksum=afe8714c6782a0e548b0f539676783a922ac61e7ba3fc7c0815644e72293fa3a +distfiles="https://github.com/emersion/slurp/archive/v${version}.tar.gz" +checksum=005dd8601d4bada9728f434728c7a57c955f90f9b9f53d1ffb051abdbabb9876 post_install() { vlicense LICENSE From 84f99539b86bd72f1786556034f711ecc1d01302 Mon Sep 17 00:00:00 2001 From: travankor Date: Wed, 21 Apr 2021 06:39:55 -0700 Subject: [PATCH 095/152] wf-config: update to 0.7.1. --- srcpkgs/wf-config/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/wf-config/template b/srcpkgs/wf-config/template index 5cbf2c847e0..49271c8d772 100644 --- a/srcpkgs/wf-config/template +++ b/srcpkgs/wf-config/template @@ -1,6 +1,6 @@ # Template file for 'wf-config' pkgname=wf-config -version=0.7.0 +version=0.7.1 revision=1 build_style=meson hostmakedepends="pkg-config" @@ -10,7 +10,7 @@ maintainer="Young Jin Park " license="MIT" homepage="https://wayfire.org" distfiles="https://github.com/WayfireWM/wf-config/archive/v${version}.tar.gz" -checksum=a8712d6a10d74b2bdba3dac9e01448945a0470ce8b1cd6d5caa2a8194f889b04 +checksum=9c212f85bfb26d135610f45865b4401e0c33a0ab3577ac65042eb23ebfe91bdb post_install() { vlicense LICENSE From 1fcb6f667640f8287a8461399e38fc665ec6693a Mon Sep 17 00:00:00 2001 From: travankor Date: Wed, 21 Apr 2021 06:40:07 -0700 Subject: [PATCH 096/152] wayfire-plugins-extra: update to 0.7.0. --- .../patches/forcefullscreen-crash.patch | 50 +++++++++++++++++++ srcpkgs/wayfire-plugins-extra/template | 3 +- 2 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/wayfire-plugins-extra/patches/forcefullscreen-crash.patch diff --git a/srcpkgs/wayfire-plugins-extra/patches/forcefullscreen-crash.patch b/srcpkgs/wayfire-plugins-extra/patches/forcefullscreen-crash.patch new file mode 100644 index 00000000000..5b6bcc4c4c2 --- /dev/null +++ b/srcpkgs/wayfire-plugins-extra/patches/forcefullscreen-crash.patch @@ -0,0 +1,50 @@ +From c321dda631026485d767f7125e80e5f5d7ad5b35 Mon Sep 17 00:00:00 2001 +From: Scott Moreau +Date: Tue, 16 Feb 2021 04:49:52 -0700 +Subject: [PATCH] force-fullscreen: Fix crash when closing fullscreened + surfaces (#79) + +Introduced by a change in core, rework things to make it not crash +when closing a view. +--- + src/force-fullscreen.cpp | 16 +++++++++++++--- + 1 file changed, 13 insertions(+), 3 deletions(-) + +diff --git a/src/force-fullscreen.cpp b/src/force-fullscreen.cpp +index 364f239..894c403 100644 +--- a/src/force-fullscreen.cpp ++++ b/src/force-fullscreen.cpp +@@ -41,11 +41,23 @@ class fullscreen_subsurface : public wf::surface_interface_t, + + fullscreen_subsurface(wayfire_view view) : + wf::surface_interface_t(), wf::compositor_surface_t() +- {} ++ { ++ view->connect_signal("subsurface-removed", &on_subsurface_removed); ++ } + + ~fullscreen_subsurface() + {} + ++ wf::signal_connection_t on_subsurface_removed = [&] (auto data) ++ { ++ auto ev = static_cast(data); ++ if ((ev->subsurface.get() == this) && _mapped) ++ { ++ _mapped = false; ++ wf::emit_map_state_change(this); ++ } ++ }; ++ + void on_pointer_enter(int x, int y) override + { + wf::get_core().set_cursor("default"); +@@ -295,8 +307,6 @@ class wayfire_force_fullscreen : public wf::plugin_interface_t + + if (background->black_border) + { +- wf::emit_map_state_change(background->black_border); +- background->black_border->_mapped = false; + view->remove_subsurface(background->black_border); + background->black_border = nullptr; + } diff --git a/srcpkgs/wayfire-plugins-extra/template b/srcpkgs/wayfire-plugins-extra/template index 320429eb61d..e53f0536c99 100644 --- a/srcpkgs/wayfire-plugins-extra/template +++ b/srcpkgs/wayfire-plugins-extra/template @@ -1,7 +1,7 @@ # Template file for 'wayfire-plugins-extra' pkgname=wayfire-plugins-extra version=0.7.0 -revision=2 +revision=3 build_style=meson hostmakedepends="pkg-config wayland-devel" makedepends="wayfire-devel glibmm-devel" @@ -12,6 +12,7 @@ license="MIT" homepage="https://wayfire.org/" distfiles="https://github.com/WayfireWM/wayfire-plugins-extra/archive/v${version}.tar.gz" checksum=e6377e7f2cd6b0a19fe0a256c819f801ee1d963524ed4e4930b702474bc04287 +patch_args="-Np1" post_install() { vlicense LICENSE From 2e2158420f2d2bbde1f81062208c1d91e602c0bd Mon Sep 17 00:00:00 2001 From: travankor Date: Wed, 21 Apr 2021 06:52:46 -0700 Subject: [PATCH 097/152] wayfire: update to 0.7.1. --- srcpkgs/wayfire/patches/wlroots13.patch | 189 ------------------------ srcpkgs/wayfire/template | 8 +- 2 files changed, 4 insertions(+), 193 deletions(-) delete mode 100644 srcpkgs/wayfire/patches/wlroots13.patch diff --git a/srcpkgs/wayfire/patches/wlroots13.patch b/srcpkgs/wayfire/patches/wlroots13.patch deleted file mode 100644 index d42dbc425a3..00000000000 --- a/srcpkgs/wayfire/patches/wlroots13.patch +++ /dev/null @@ -1,189 +0,0 @@ -diff --git a/meson.build b/meson.build -index 4a8992cb..117f928c 100644 ---- a/meson.build -+++ b/meson.build -@@ -28,7 +28,7 @@ libinput = dependency('libinput', version: '>=1.7.0') - pixman = dependency('pixman-1') - threads = dependency('threads') - xkbcommon = dependency('xkbcommon') --wlroots = dependency('wlroots', version: ['>=0.12.0', '<0.13.0'], required: get_option('use_system_wlroots')) -+wlroots = dependency('wlroots', version: ['>=0.13.0', '<0.14.0'], required: get_option('use_system_wlroots')) - wfconfig = dependency('wf-config', version: ['>=0.7.0', '<0.8.0'], required: get_option('use_system_wfconfig')) - - use_system_wlroots = not get_option('use_system_wlroots').disabled() and wlroots.found() -diff --git a/plugins/single_plugins/vswipe.cpp b/plugins/single_plugins/vswipe.cpp -index da37448c..26c8f399 100644 ---- a/plugins/single_plugins/vswipe.cpp -+++ b/plugins/single_plugins/vswipe.cpp -@@ -1,3 +1,4 @@ -+#include - #include - #include - #include -diff --git a/src/api/wayfire/nonstd/wlroots-full.hpp b/src/api/wayfire/nonstd/wlroots-full.hpp -index 77a12c70..4a24f1a1 100644 ---- a/src/api/wayfire/nonstd/wlroots-full.hpp -+++ b/src/api/wayfire/nonstd/wlroots-full.hpp -@@ -112,6 +112,8 @@ extern "C" - #include - #include - #include -+#include -+#include - #include - #include - #include -diff --git a/src/api/wayfire/nonstd/wlroots.hpp b/src/api/wayfire/nonstd/wlroots.hpp -index 4686d14f..402ab3cd 100644 ---- a/src/api/wayfire/nonstd/wlroots.hpp -+++ b/src/api/wayfire/nonstd/wlroots.hpp -@@ -43,7 +43,14 @@ extern "C" - struct wlr_viewporter; - - #include -+#include -+#include -+#include - #include - #include - #include -+#include -+ -+ static constexpr uint32_t WLR_KEY_PRESSED = WL_KEYBOARD_KEY_STATE_PRESSED; -+ static constexpr uint32_t WLR_KEY_RELEASED = WL_KEYBOARD_KEY_STATE_RELEASED; - } -diff --git a/src/core/opengl.cpp b/src/core/opengl.cpp -index 09022930..aacb0800 100644 ---- a/src/core/opengl.cpp -+++ b/src/core/opengl.cpp -@@ -227,25 +227,27 @@ void render_rectangle(wf::geometry_t geometry, wf::color_t color, - - void render_begin() - { -- /* No real reason for 10, 10, 0 but it doesn't matter */ -- render_begin(10, 10, 0); -+ if (!wlr_egl_is_current(wf::get_core_impl().egl)) -+ { -+ wlr_egl_make_current(wf::get_core_impl().egl); -+ } -+ -+ GL_CALL(glEnable(GL_BLEND)); -+ GL_CALL(glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA)); - } - - void render_begin(const wf::framebuffer_base_t& fb) - { -- render_begin(fb.viewport_width, fb.viewport_height, fb.fb); -+ render_begin(); -+ fb.bind(); - } - --void render_begin(int32_t viewport_width, int32_t viewport_height, uint32_t fb) -+void render_begin(int32_t width, int32_t height, uint32_t fb) - { -- if (!wlr_egl_is_current(wf::get_core_impl().egl)) -- { -- wlr_egl_make_current(wf::get_core_impl().egl, EGL_NO_SURFACE, NULL); -- } -+ render_begin(); - -- wlr_renderer_begin(wf::get_core_impl().renderer, -- viewport_width, viewport_height); -- GL_CALL(glBindFramebuffer(GL_FRAMEBUFFER, fb)); -+ GL_CALL(glBindFramebuffer(GL_DRAW_FRAMEBUFFER, fb)); -+ GL_CALL(glViewport(0, 0, width, height)); - } - - void clear(wf::color_t col, uint32_t mask) -@@ -257,8 +259,7 @@ void clear(wf::color_t col, uint32_t mask) - void render_end() - { - GL_CALL(glBindFramebuffer(GL_FRAMEBUFFER, current_output_fb)); -- wlr_renderer_scissor(wf::get_core().renderer, NULL); -- wlr_renderer_end(wf::get_core().renderer); -+ GL_CALL(glDisable(GL_SCISSOR_TEST)); - } - } - -diff --git a/src/core/seat/cursor.cpp b/src/core/seat/cursor.cpp -index 7ba23b06..d6006f17 100644 ---- a/src/core/seat/cursor.cpp -+++ b/src/core/seat/cursor.cpp -@@ -160,7 +160,10 @@ void wf::cursor_t::set_cursor(std::string name) - name = "left_ptr"; - } - -- wlr_xcursor_manager_set_cursor_image(xcursor, name.c_str(), cursor); -+ idle_set_cursor.run_once([name, this] () -+ { -+ wlr_xcursor_manager_set_cursor_image(xcursor, name.c_str(), cursor); -+ }); - } - - void wf::cursor_t::unhide_cursor() -@@ -175,6 +178,7 @@ void wf::cursor_t::unhide_cursor() - - void wf::cursor_t::hide_cursor() - { -+ idle_set_cursor.disconnect(); - wlr_cursor_set_surface(cursor, NULL, 0, 0); - this->hide_ref_counter++; - } -diff --git a/src/core/seat/cursor.hpp b/src/core/seat/cursor.hpp -index 0c4ab8fe..aec8f1aa 100644 ---- a/src/core/seat/cursor.hpp -+++ b/src/core/seat/cursor.hpp -@@ -3,6 +3,7 @@ - - #include "seat.hpp" - #include "wayfire/plugin.hpp" -+#include "wayfire/util.hpp" - - namespace wf - { -@@ -28,6 +29,13 @@ struct cursor_t - void hide_cursor(); - int hide_ref_counter = 0; - -+ /** -+ * Delay setting the cursor, in order to avoid setting the cursor -+ * multiple times in a single frame and to avoid setting it in the middle -+ * of the repaint loop (not allowed by wlroots). -+ */ -+ wf::wl_idle_call idle_set_cursor; -+ - /** - * Start/stop touchscreen mode, which means the cursor will be hidden. - * It will be shown again once a pointer or tablet event happens. -diff --git a/src/main.cpp b/src/main.cpp -index bd07d618..0c5e97e7 100644 ---- a/src/main.cpp -+++ b/src/main.cpp -@@ -260,7 +260,7 @@ int main(int argc, char *argv[]) - /** TODO: move this to core_impl constructor */ - core.display = display; - core.ev_loop = wl_display_get_event_loop(core.display); -- core.backend = wlr_backend_autocreate(core.display, NULL); -+ core.backend = wlr_backend_autocreate(core.display); - core.renderer = wlr_backend_get_renderer(core.backend); - core.egl = wlr_gles2_renderer_get_egl(core.renderer); - assert(core.egl); -diff --git a/src/output/render-manager.cpp b/src/output/render-manager.cpp -index 2039333c..cb2a38bf 100644 ---- a/src/output/render-manager.cpp -+++ b/src/output/render-manager.cpp -@@ -1019,8 +1019,12 @@ class wf::render_manager::impl - swap_damage |= output_damage->get_wlr_damage_box(); - } - -- OpenGL::render_begin(postprocessing->get_target_framebuffer()); -- wlr_output_render_software_cursors(output->handle, swap_damage.to_pixman()); -+ OpenGL::render_begin(); -+ wlr_renderer_begin(wf::get_core().renderer, -+ output->handle->width, output->handle->height); -+ wlr_output_render_software_cursors(output->handle, -+ swap_damage.to_pixman()); -+ wlr_renderer_end(wf::get_core().renderer); - OpenGL::render_end(); - - /* Part 4: postprocessing effects */ diff --git a/srcpkgs/wayfire/template b/srcpkgs/wayfire/template index a7e80c4239e..c0fbbfd0708 100644 --- a/srcpkgs/wayfire/template +++ b/srcpkgs/wayfire/template @@ -1,10 +1,11 @@ # Template file for 'wayfire' pkgname=wayfire -version=0.7.0 -revision=3 +version=0.7.1 +revision=1 _utils_commit=f45641beef46babdc8f1b8d18a924e72beaf8ee6 _touch_commit=b1075c54a280f913edc26b9757262f4f9d6b62b0 build_style=meson +configure_args="-Dprint_trace=false" hostmakedepends="pkg-config wayland-devel" makedepends="wf-config-devel wlroots-devel cairo-devel $(vopt_if image 'libjpeg-turbo-devel libpng-devel')" @@ -16,10 +17,9 @@ homepage="https://wayfire.org" distfiles="https://github.com/WayfireWM/wayfire/archive/v${version}.tar.gz https://github.com/WayfireWM/wf-utils/archive/${_utils_commit}.tar.gz https://github.com/WayfireWM/wf-touch/archive/${_touch_commit}.tar.gz" -checksum="b1a94ad2843db19e78cbd361ceebaade4507647ad893d5b5117a9fc7724ce41c +checksum="96cb7820cddbae962ca456fd1989cdaa00cd880b109bf8e9d667b9264a20c257 d172f8c21e0bac01e4116cd957fb0159c5cb39ddfdce897beb0d9c753796d5f1 2b22e03d3a522baeff5798f630ffe5aa95899fd3233b291527503af5fd3e30be" -patch_args=-Np1 # Optimization for nested STL calls CXXFLAGS="-O3" From b687725162f09d0d774c1ab60c01aa10ff86120a Mon Sep 17 00:00:00 2001 From: Abigail G Date: Thu, 22 Apr 2021 20:09:01 -0400 Subject: [PATCH 098/152] chezmoi: update to 2.0.9. --- srcpkgs/chezmoi/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template index bebfed8d5b9..c709c8a46d0 100644 --- a/srcpkgs/chezmoi/template +++ b/srcpkgs/chezmoi/template @@ -1,6 +1,6 @@ # Template file for 'chezmoi' pkgname=chezmoi -version=2.0.7 +version=2.0.9 revision=1 build_style=go go_import_path="github.com/twpayne/chezmoi" @@ -13,7 +13,7 @@ maintainer="Abigail G " license="MIT" homepage="https://chezmoi.io/" distfiles="https://github.com/twpayne/chezmoi/archive/v${version}.tar.gz" -checksum=2c4000af2580009abc0057a2a4c6288ea1b61ff16917d6de6640c3bebb47378b +checksum=74f8510c850511cfe327adadb9796c76851349d83b2df8d3ca4a29b1ed3bc41c post_install() { vlicense LICENSE From 05da0179986b0451921ae4564afe6603eb113fa2 Mon Sep 17 00:00:00 2001 From: bugcrazy <39757967+bugcrazy@users.noreply.github.com> Date: Tue, 20 Apr 2021 22:54:21 -0300 Subject: [PATCH 099/152] devilutionX: update to 1.2.1 Applied suggested changes Removed nocross --- srcpkgs/devilutionX/template | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template index dfef90b4f40..829ff248926 100644 --- a/srcpkgs/devilutionX/template +++ b/srcpkgs/devilutionX/template @@ -1,17 +1,16 @@ # Template file for 'devilutionX' pkgname=devilutionX -version=1.1.0 +version=1.2.1 revision=1 build_style=cmake -configure_args="-DBINARY_RELEASE=ON -DTTF_FONT_PATH=\"/usr/share/fonts/truetype/CharisSILB.ttf\"" +configure_args="-DVERSION_NUM=$version -DBINARY_RELEASE=ON -DTTF_FONT_PATH=\"/usr/share/fonts/truetype/CharisSILB.ttf\"" makedepends="SDL2-devel SDL2_ttf-devel SDL2_mixer-devel libsodium-devel" short_desc="Diablo I engine for modern operating systems" maintainer="MarcoAPC " license="Unlicense" homepage="https://github.com/diasurgical/devilutionX" distfiles="https://github.com/diasurgical/devilutionX/archive/${version}.tar.gz" -checksum=395ec298df5383abe60550d45adba5e5811984589ccb1e504891b267b3c467c1 -nocross="https://build.voidlinux.org/builders/aarch64-musl_builder/builds/25453/steps/shell_3/logs/stdio" +checksum=002dcbd4d4a5bdf8db1a3ec01139e5bfbed46d6a1caa32b17c9f2df161ad3521 post_install() { vlicense LICENSE From f087830fdc5fd296f454d20580673fa3416c0d80 Mon Sep 17 00:00:00 2001 From: Nicolo Date: Tue, 20 Apr 2021 09:38:47 +0200 Subject: [PATCH 100/152] thunderbird: update to 78.10.0 --- srcpkgs/thunderbird/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template index 00195695222..d65081d6ba3 100644 --- a/srcpkgs/thunderbird/template +++ b/srcpkgs/thunderbird/template @@ -3,7 +3,7 @@ # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/thunderbird-i18n". # pkgname=thunderbird -version=78.9.1 +version=78.10.0 revision=1 build_helper="rust" short_desc="Standalone Mail/News reader" @@ -11,7 +11,7 @@ maintainer="Érico Nogueira " license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://www.thunderbird.net/" distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz" -checksum=6be0daf439ea5aeef0fd1619511cb1af4f1ba056823910475adc17e60069317d +checksum=65d79a557027a3b52cc672ab9aea8da7131e6373f94657d03f6d6b9c7b36fb45 lib32disabled=yes From f277676290b6a990f76675ff216c875537ddb5da Mon Sep 17 00:00:00 2001 From: Nicolo Date: Tue, 20 Apr 2021 09:40:06 +0200 Subject: [PATCH 101/152] thunderbird-i18n: update to 78.10.0 --- srcpkgs/thunderbird-i18n/template | 112 +++++++++++++++--------------- 1 file changed, 56 insertions(+), 56 deletions(-) diff --git a/srcpkgs/thunderbird-i18n/template b/srcpkgs/thunderbird-i18n/template index bd4fc0c38f8..936c962a167 100644 --- a/srcpkgs/thunderbird-i18n/template +++ b/srcpkgs/thunderbird-i18n/template @@ -1,6 +1,6 @@ # Template file for 'thunderbird-i18n' pkgname=thunderbird-i18n -version=78.9.1 +version=78.10.0 revision=1 build_style=meta short_desc="Thunderbird language packs" @@ -96,58 +96,58 @@ _pkgtmpl() { } } -checksum="4fddad63b7354b9c6db09428d3f73918d931768f61ae126596ae982ee00a6f9e - ea442b319837fec3bdbb80cec6ec5095f621caca9c784de70bdcf8a2523802cc - d93560c0870d361eb7088749dd88e1e61d1c68a4770b487863bb9dfaa770663a - c568bda96a224835ed6ac5acb0bfa997fa847fe2ef3d5cba8c3258b682d80019 - e1494a55fa057d58d1709275a79a56af4e018f6210159bf8fa1baa1189b5f0e8 - a6243eaaa5e06ee93f242c9d79959cee2b295fc281014de904d8baef2c27c33a - 5e2f59621dc5af683ad7f436c6838c304a6746956874b6089c25b4831c43a28c - 3855cac8661f5dc6567729418bbd398a1492b53f71e1af4ce5fa3984ad42a447 - 3f9d4b4d23272213b3ff9640cf053c788907dcd0f780c03439871eb7529d48a7 - 7e334735fce0bf7263b667a1d2003edab972aa83d2f8e7765865f01da28fd6c5 - 138ab3c032ed48178c399c610648f7a5c44579bdee4021446771ac5cab86233f - 6493bde23c0909295c1e2d784ba317f294bccd3ee9c3a679e999c59bc02899c3 - d579a1c125082e2dbe78cadbe0d0d45f12fff3ade7fe73ce652d23cc3a906dbf - 9cc6ee40f58a1f6bb8ca8cf965d4a558a2e3f8583474f06e61e34d00c5e342a7 - 3ada2f1216617809b0b3330e6d825a65e2901f9a86bdfc0f41ca0545bd088e8a - 9bd2900ec74cb8dd306df64032546255d603c9b324de9d057c840b42ee1706bf - 1b11b00f7fc9380e414af33f62519ca0da1068ad446815768e169b2494e9c8da - 68f91ed0da57e4783240c500d2a19d3b5de3b21a5dab61444d29926698ebe793 - c1033137d32c87848cdf85d4bf8acef36dfd85b20172f3bc448bed64280f9c6d - 02062b3925df8c511f313cb973f55c41e1585e6891c95013288d1715d24ddfb7 - a1365e409d1eb897317a39c7513c1703e9fb93595d43a0820a579246381f1605 - d1622c075e451eb5b87cd1ba9a19c0abc36289d99b33dfbba6831df7ce8b3f53 - 3ac54f983ae0adc2395266f6a882ac56583c87ab3f6345257c507835c0c2d14e - a86188f64f643175d760bac1086b6b466a4a657425596cd79987a76ced42a8d9 - 8a0cf55c1eff56cb5c6be354b96bab973c9852dcdb39446822c0eaa555b950ef - 4ef44068b021fd2cc15cae58bbda4ca86fdf3f7b2ffe23a86d32cc8040baead3 - 09e81eeaa1ade640d7788fc927c58a0a290fbbc84f250e2e954e594c8466b528 - dd5791a364b2bd4901d337ce58f4cacc4640acbb116d98d3b38ab13ac57bfc64 - 3073815242bab5a49d6c9412f963e7fbeff8da1bc5f7655c66a093ee0459dff6 - 5eb605f125548132cb9e9ce65682708423f31bbaf84767d87d0c743014004563 - c85771a299ed01b440d8354d7220cd52f489d0a7364c5e1769b178adc27c3d17 - adec1b156f39f7f2e0aa6a7fe19179734629077a7e7d387332bdc2cbd205ff40 - b50c4d047c042194c8150b005f5e3666bebcc22fe7785ca79874ef3ef1a66380 - 6ccecfd19cf3ba6dff2da883812bff303f0b36001d9ae2663dc3d2cb1fd87363 - 15b2744ebbcb1c6b2a935821f3059265e79678fbe34a07dba2525c7a3a160eb6 - 44069899ee9f6bf19e4b4a9cd63d83fc61c7f8a882f24ff34d5161a7dbf8ae15 - 24986599a7cc2cf57d703b6d72c2aecad593dc08b2e0184770e7a283e6f7f7b8 - 104f713c761beb7de9d7b5aa8be3dfad23f6864a5ba0f67823cd61e31979ef57 - a4d5d0cc0cdad59f66b6d9f76029059e29619c838f022e322046ac210f963ac9 - 4b1e917f5839f21a73e5595021c07573238df0212a984a5467adfd637cecd64c - f173d29ec6506635a622818b7e5cf2a11b0b7b5041daf555a930410f9d5cbf4b - 5699f89669e88c82a656488b4ad27d18beccb4db1a2293602d1e742628315a67 - 842afff69b6fcac17e603a706b1d196aa3b4b875ff5139feb4c39324c2244563 - de2499e4e04ed0bff3bc852f5e85baf60e4223d68cd323375d3df87f2828801d - 47cc9d5e63e5e99c066dba6bd1db440fbf6cd2885ed51af9bc021df892e4cdea - 89341fe50ff3655e7c41b8ad3097aaa745752f048739ac21652304e805491ac1 - fc23e405ed4711c4b184f238e58b2be8705664e22038201deba674efd2315a15 - b52ee3d71341f581b2b1b82764fb6d98e59bcd5d5564ad069b0f6220c82385dd - 29473e268c7a89302844a313f0ba1be93580a3aa5c11e78469fc1e73c6b14e50 - 3d1f7950d66db5d01b3972ccee16056bc495866eff57b8c7434121d5fb54fa14 - 59027c47928ccd0a326194dedffcffa2cdc1d73e9ee8d9e7edb87f9e0d8a4d37 - cba44dee27d9a1bccbd23fcf46080e3e2e2d8b2e2bacd5414542f10824d9a969 - de72ecf79efdd8fd97ead8af456fe02eee3725f5b41d96cb0c5c1e391a32e65a - 6f9d8cb48f7845874219c6cef403d037d52ef4f465e62494e53d43e640b7e1f7 - 8c5e997ca6a2a512d3ad72424d0bed9d6e9adddacaed5151ad153529e28cb67e" +checksum="b22803c6717d1a832bd085660b7b892fe55b604f9eb486bfa5d97e6a84b9d116 + 8641331581f4140251ba09e0dd5f680c53e61ca6b363129579631289a4dccf50 + c4f9e576072471ed7f47d3c20da24e5b4629daebb2261edb336e30a92c3d5940 + 24b37b2e6515fe9213e8f6fdfe762d02db6ec4e39a82e82df0fe8c82e5148157 + 53874515986b698b356df97538a04b58528f31b5faa5f6f7d0e65d629fa10ab0 + d85088127e958276f71496fd9efb30dd7b79393a15e6f224df2d3a8d92414196 + 7d4dd6ce20c039d8f2d2a4a15d6d5ae4819631be9ef8b56844bd33befab99cfd + 97159d84019af8aa99020acb009723f6bbef39aa8c1395c8c074370a99178a0f + 6957f539b22df2598dc0be339f329870f3430f16652486090a210b33c9591c7e + 3d9a64e42b186ec5a2d40ad6cef7174271b852878f1bba6426ebadd2d2c262f2 + 78c7df6b56b830b90cd77dc7bdeb1a3c75018166b748695eb0fa045b603477ce + f55f5aa1a75b002198b85122a7dadf60fdc7c766b53de9969d6062341ec3a13c + b143ffde6ca738614dd511381bba6153d037d25426ff9f0199b9ffb0e189a8f4 + c968c485b441bb2363c7f6f9beb2310976190fd3aedb939031f9bd14183ef911 + 2f1d94c06901d11346a5316ffffbb6f3198aff5711de5adc53b335fef6c46223 + 75fad100352d904bbeabe3c90759f2cbee1b197cb4d3ba2434879cd3fde0fcfc + 2bbbf5583014c2c895619da5b96551ef5e2b79f85200c7db0f065e3e1aa5eb2c + 1be39f436f87db7af1c487207a511c3b1033a82e7a9d956fc3cff0d618733445 + 483ce87e775982c955a2d3b4e5ef7c154bb2e41d21a1fe47c8f407cdceaea6ed + b46821be66ccde4535cb581787354aa80bd0c516c019b297ef32fdcc86b67251 + 511d277d22b9d4c81e7f62d69389ae23a1b9c166f7d04e1e5b37ca379404a1d1 + c8d5c713fbcdc040e8e72bfe11472446f9d831775ebc673264fe0186108fef2a + ecd0089f4b26be96ac1c6a34699d014bab71b8b28f2dfb2657981e917999f9ed + 5befa2011017a0fc4e8ecf1c9a3edf43c6c8c086ac803d905304ac03b908c596 + 0bac411a13f004e92dcc46470bde318bdb687a4b8563145d6575825ccc268dcf + 523fcd991a53436e77abc54fb0332246eaa515d25bf1011df5804ac1a169fe51 + b08a98ab295ee551fad1b3100387bc2dcbcee3ec086cba0538912ea4247db45a + 1940ee0c7cbdb4b4e54821d97be26a00b0dba6ca8e694341bc95ec097bf72837 + de7bd652ba9fa4de28cbce19d2075228fc2b68f0a088149b1040e77016e83246 + 4309c1f47d25fd033202c39ba35dc16f393acfc4d83e5018257271db4dc55ac7 + eeb68e89171558bdf33931550c4176a13e7b68f24036eb48fe2cfdea1b1bdae6 + 9a9ee81b50561fa4fdae9e10370fc955e50295f4870474043dde45cb45e930c3 + 0f7d20d579a61c5b2e5e8d379b93190aff6e32b0bf1120fc9cc5a31d80578353 + 7040a0c09e1565b41cce2b17a59527f7dc708a05586430608b5f6310b7d06597 + bbf3f5d233219a67b0d10a9c249ded74fec8fd68be24e89cb8f1e2b0e94c03b3 + 51f0f1668dd4fed8d9343d77492b6ea88c218e975d31e8cb92d6cfede529b9fa + fb98640ea0e1711410e6bfdcb95ba5f8314c5f821730c0f5c95edf6275440eae + 4c41f47ea1546bca94a5a2a9840679a69a1341846f463b5935fec9fec7159ed3 + e307047b9909c6c3d013d234c6914399298fd668eed2112210eae3ae9b3ac34c + b286e6c44507faa9545c064fe57536ed876cbcf2c38a578693f4de251fc3c054 + 32279bdbbe33c9a4b31da100c6f707886ccd2abec50a46ea820fb2582960d618 + 6ca81fe7b59e281ca61caf28cb2786f007be108afa1e8267f018ff12b7fe3c45 + 6a3e9e7e254efb6bfe7d3ca76f330ed21fd04b667272aca8bda1ee28499b3587 + f78d8984b15716ab42d29ca3d807f181cf613fe8c760fe39c219bce3bf1e50a4 + cab66584c10594314cdf5d48fc7af44eb361853917095d179ab58376f87ffa71 + f9755650f432d1c8223bf6b08596b70b34788c1f0e214e9a4b8a1bb160fdcd5a + d4b525ac48b5cacb695844e71d128173ab1816af8da4f97bd0c940abd954bc11 + 0597ed6be1da91983d9ccbd98c7600a810faacaaa46ea73cb377feba4c94f88d + 9f78c6dd107957101e227c496ab7b5c269f635635f23a84fc905de1bbeb32890 + af8402fb763fc4b9187c67ee555b67b4cec6dbbfe0d0be00e05513875af0451c + c15da2439ca323568a33b599baceb1d30ec5b0e6f5a6784face9042f2a146914 + 8301d24d09270a4a45f7dc775dcfc10f701ab86957fa630a0abd5257a1f40471 + b6b6a2f77efb288a0b93d0ae1429b5139614d2f58e9e1434e60dc80768fd7bcc + 9728ba07830c0654fd34df20059e712cf9944909e7b36ee676234ac66e7dbb99 + 77f570116788269af21d626b9d0eb40ab0e548bb6abcaf45a228d39c9dc7cd40" From 23f2134768a2e1d06134d26d9542ba6eafcf8c4b Mon Sep 17 00:00:00 2001 From: Anthony Iliopoulos Date: Tue, 20 Apr 2021 13:26:57 +0200 Subject: [PATCH 102/152] sshpass: update to 1.09. --- srcpkgs/sshpass/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/sshpass/template b/srcpkgs/sshpass/template index 9aa8eba43f0..38ab9c6bc5b 100644 --- a/srcpkgs/sshpass/template +++ b/srcpkgs/sshpass/template @@ -1,11 +1,11 @@ # Template file for 'sshpass' pkgname=sshpass -version=1.06 -revision=2 +version=1.09 +revision=1 build_style=gnu-configure short_desc="Non-interactive ssh password auth" maintainer="Orphaned " license="GPL-2.0-only" homepage="http://sshpass.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/$pkgname/${pkgname}-${version}.tar.gz" -checksum=c6324fcee608b99a58f9870157dfa754837f8c48be3df0f5e2f3accf145dee60 +checksum=71746e5e057ffe9b00b44ac40453bf47091930cba96bbea8dc48717dedc49fb7 From 74215f5c35954271ae3a4353b697758dc9aad581 Mon Sep 17 00:00:00 2001 From: Anthony Iliopoulos Date: Tue, 20 Apr 2021 13:29:08 +0200 Subject: [PATCH 103/152] mtools: update to 4.0.27. --- srcpkgs/mtools/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mtools/template b/srcpkgs/mtools/template index ee665664291..0fb724b9ac3 100644 --- a/srcpkgs/mtools/template +++ b/srcpkgs/mtools/template @@ -1,6 +1,6 @@ # Template file for 'mtools' pkgname=mtools -version=4.0.26 +version=4.0.27 revision=1 build_style=gnu-configure makedepends="acl-devel" @@ -9,7 +9,7 @@ maintainer="Orphaned " license="GPL-3.0-or-later" homepage="http://www.gnu.org/software/mtools" distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2" -checksum=539f1c8b476a16e198d8bcb10a5799e22e69de49d854f7dbd85b64c2a45dea1a +checksum=9c88c8d9244e54768e40b92c005e61ec4e084ea7c070df9184caf1a6408838b3 conf_files="/etc/mtools.conf" post_install() { From 398879ba75ea0623323df96dc850463cbb5e0b41 Mon Sep 17 00:00:00 2001 From: Anthony Iliopoulos Date: Tue, 20 Apr 2021 13:29:28 +0200 Subject: [PATCH 104/152] irqbalance: update to 1.8.0. --- srcpkgs/irqbalance/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/irqbalance/template b/srcpkgs/irqbalance/template index 20715382686..e0113181983 100644 --- a/srcpkgs/irqbalance/template +++ b/srcpkgs/irqbalance/template @@ -1,6 +1,6 @@ # Template file for 'irqbalance' pkgname=irqbalance -version=1.7.0 +version=1.8.0 revision=1 build_style=gnu-configure hostmakedepends="automake libtool pkg-config" @@ -10,7 +10,7 @@ maintainer="Orphaned " license="GPL-2.0-only" homepage="https://github.com/Irqbalance/irqbalance" distfiles="https://github.com/Irqbalance/irqbalance/archive/v${version}.tar.gz" -checksum=28f2ad35945b93d90f4a5bad95b4c0871a0f644375f746ec16f61045b9ec970e +checksum=2e7ddb9687a6a5cc1f41626659eac2ad9d6b5875629156b92f693bd404d8ae63 case "$XBPS_TARGET_MACHINE" in i686*|x86_64*|ppc64*) makedepends+=" libnuma-devel";; From 59b6a1167b7520f5b42735450c8daf03bde3428f Mon Sep 17 00:00:00 2001 From: Anthony Iliopoulos Date: Tue, 20 Apr 2021 13:29:59 +0200 Subject: [PATCH 105/152] lua54: update to 5.4.3. --- srcpkgs/lua54/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/lua54/template b/srcpkgs/lua54/template index 1eddc5ceb30..47d4425cd63 100644 --- a/srcpkgs/lua54/template +++ b/srcpkgs/lua54/template @@ -1,6 +1,6 @@ # Template file for 'lua54' pkgname=lua54 -version=5.4.2 +version=5.4.3 revision=1 wrksrc=lua-${version} makedepends="ncurses-devel readline-devel" @@ -9,7 +9,7 @@ maintainer="q66 " license="MIT" homepage="https://www.lua.org" distfiles="https://www.lua.org/ftp/lua-${version}.tar.gz" -checksum=11570d97e9d7303c0a59567ed1ac7c648340cd0db10d5fd594c09223ef2f524f +checksum=f8612276169e3bfcbcfb8f226195bfc6e466fe13042f1076cbde92b7ec96bbfb alternatives=" lua:lua:/usr/bin/lua5.4 From 2ac9102fe73ddffd8e2094f171af5d4ffd184f33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= Date: Thu, 22 Apr 2021 21:34:16 -0300 Subject: [PATCH 106/152] peshming: mark broken temporarily. The checksum changed between CI for the PR running and it being merged, so there isn't a previous version to compare to. --- srcpkgs/peshming/template | 2 ++ 1 file changed, 2 insertions(+) diff --git a/srcpkgs/peshming/template b/srcpkgs/peshming/template index d1a45ad0a6e..4d63e946034 100644 --- a/srcpkgs/peshming/template +++ b/srcpkgs/peshming/template @@ -1,3 +1,5 @@ +broken="checksum changed, can't compare with old one" + # Template file for 'peshming' pkgname=peshming version=0.3.0 From d846b04afd4fba513601e39907df312775981261 Mon Sep 17 00:00:00 2001 From: Abigail G Date: Thu, 22 Apr 2021 20:45:12 -0400 Subject: [PATCH 107/152] chezmoi: update to 2.0.10. --- srcpkgs/chezmoi/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template index c709c8a46d0..eaad865e0f9 100644 --- a/srcpkgs/chezmoi/template +++ b/srcpkgs/chezmoi/template @@ -1,9 +1,9 @@ # Template file for 'chezmoi' pkgname=chezmoi -version=2.0.9 +version=2.0.10 revision=1 build_style=go -go_import_path="github.com/twpayne/chezmoi" +go_import_path="github.com/twpayne/chezmoi/v2" go_build_tags="noembeddocs noupgrade" go_ldflags="-X main.version=${version} -X main.commit=v${version} -X main.builtBy=xbps -X github.com/twpayne/chezmoi/cmd.DocsDir=/usr/share/doc/chezmoi" @@ -13,7 +13,7 @@ maintainer="Abigail G " license="MIT" homepage="https://chezmoi.io/" distfiles="https://github.com/twpayne/chezmoi/archive/v${version}.tar.gz" -checksum=74f8510c850511cfe327adadb9796c76851349d83b2df8d3ca4a29b1ed3bc41c +checksum=2baff338f656b209502329327764d3f8dd5808f53303a13f3be6d48d076df9a3 post_install() { vlicense LICENSE From d9ed8c7ed7c4e6ef8077682f7d7987079909987a Mon Sep 17 00:00:00 2001 From: Anthony Iliopoulos Date: Tue, 20 Apr 2021 13:27:25 +0200 Subject: [PATCH 108/152] tinyproxy: update to 1.11.0. --- srcpkgs/tinyproxy/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/tinyproxy/template b/srcpkgs/tinyproxy/template index ccb5af467eb..8451b63ce90 100644 --- a/srcpkgs/tinyproxy/template +++ b/srcpkgs/tinyproxy/template @@ -1,7 +1,7 @@ # Template file for 'tinyproxy' pkgname=tinyproxy -version=1.10.0 -revision=2 +version=1.11.0 +revision=1 build_style=gnu-configure configure_args="--enable-transparent --localstatedir=/var tinyproxy_cv_regex_broken=no" hostmakedepends="asciidoc" @@ -10,7 +10,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://tinyproxy.github.io/" distfiles="https://github.com/tinyproxy/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz" -checksum=59be87689c415ba0d9c9bc6babbdd3df3b372d60b21e526b118d722dbc995682 +checksum=c1ec81cfc4c551d2c24e0227a5aeeaad8723bd9a39b61cd729e516b82eaa3f32 system_accounts="_tinyproxy" conf_files="/etc/tinyproxy/tinyproxy.conf" make_dirs="/var/log/tinyproxy 755 _tinyproxy _tinyproxy" From f5ed0ab40e2eba00c6e209f7eed2d79da35bba88 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Wed, 21 Apr 2021 20:26:31 +0200 Subject: [PATCH 109/152] libextractor: update to 1.11. --- srcpkgs/libextractor/patches/exiv-0.27.patch | 127 ------------------- srcpkgs/libextractor/template | 7 +- 2 files changed, 3 insertions(+), 131 deletions(-) delete mode 100644 srcpkgs/libextractor/patches/exiv-0.27.patch diff --git a/srcpkgs/libextractor/patches/exiv-0.27.patch b/srcpkgs/libextractor/patches/exiv-0.27.patch deleted file mode 100644 index cfdb6426408..00000000000 --- a/srcpkgs/libextractor/patches/exiv-0.27.patch +++ /dev/null @@ -1,127 +0,0 @@ -From bbe21db4bf8face03adf0efd2eb18540582cb5ba Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Sun, 30 Dec 2018 00:46:57 +0100 -Subject: [PATCH] Fix build with exiv2-0.27 - ---- - src/plugins/exiv2_extractor.cc | 35 +++++++++++++++++++++++++++------- - 1 file changed, 28 insertions(+), 7 deletions(-) - -diff --git a/src/plugins/exiv2_extractor.cc b/src/plugins/exiv2_extractor.cc -index 8741d40..ef402a8 100644 ---- a/src/plugins/exiv2_extractor.cc -+++ b/src/plugins/exiv2_extractor.cc -@@ -27,10 +27,7 @@ - #include - #include - #include --#include --#include --#include --#include -+#include - - /** - * Enable debugging to get error messages. -@@ -180,7 +177,7 @@ public: - * - * @return -1 on error - */ --#if EXIV2_VERSION >= EXIV2_MAKE_VERSION(0,26,0) -+#if EXIV2_TEST_VERSION(0,26,0) - virtual size_t size (void) const; - #else - virtual long int size (void) const; -@@ -316,7 +313,11 @@ ExtractorIO::getb () - const unsigned char *r; - - if (1 != ec->read (ec->cls, &data, 1)) -+#if EXIV2_TEST_VERSION(0,27,0) -+ throw Exiv2::BasicError (Exiv2::kerDecodeLangAltQualifierFailed); -+#else - throw Exiv2::BasicError (42 /* error code */); -+#endif - r = (const unsigned char *) data; - return *r; - } -@@ -371,7 +372,11 @@ ExtractorIO::putb (Exiv2::byte data) - void - ExtractorIO::transfer (Exiv2::BasicIo& src) - { -+#if EXIV2_TEST_VERSION(0,27,0) -+ throw Exiv2::BasicError (Exiv2::kerDecodeLangAltQualifierFailed); -+#else - throw Exiv2::BasicError (42 /* error code */); -+#endif - } - - -@@ -416,7 +421,11 @@ ExtractorIO::seek (long offset, - Exiv2::byte * - ExtractorIO::mmap (bool isWritable) - { -+#if EXIV2_TEST_VERSION(0,27,0) -+ throw Exiv2::BasicError (Exiv2::kerDecodeLangAltQualifierFailed); -+#else - throw Exiv2::BasicError (42 /* error code */); -+#endif - } - - -@@ -449,7 +458,7 @@ ExtractorIO::tell (void) const - * - * @return -1 on error - */ --#if EXIV2_VERSION >= EXIV2_MAKE_VERSION(0,26,0) -+#if EXIV2_TEST_VERSION(0,26,0) - size_t - #else - long int -@@ -504,7 +513,11 @@ ExtractorIO::eof () const - std::string - ExtractorIO::path () const - { -+#if EXIV2_TEST_VERSION(0,27,0) -+ throw Exiv2::BasicError (Exiv2::kerDecodeLangAltQualifierFailed); -+#else - throw Exiv2::BasicError (42 /* error code */); -+#endif - } - - -@@ -517,7 +530,11 @@ ExtractorIO::path () const - std::wstring - ExtractorIO::wpath () const - { -+#if EXIV2_TEST_VERSION(0,27,0) -+ throw Exiv2::BasicError (Exiv2::kerDecodeLangAltQualifierFailed); -+#else - throw Exiv2::BasicError (42 /* error code */); -+#endif - } - #endif - -@@ -531,7 +548,11 @@ Exiv2::BasicIo::AutoPtr - ExtractorIO::temporary () const - { - fprintf (stderr, "throwing temporary error\n"); -+#if EXIV2_TEST_VERSION(0,27,0) -+ throw Exiv2::BasicError (Exiv2::kerDecodeLangAltQualifierFailed); -+#else - throw Exiv2::BasicError (42 /* error code */); -+#endif - } - - -@@ -697,7 +718,7 @@ EXTRACTOR_exiv2_extract_method (struct EXTRACTOR_ExtractContext *ec) - { - try - { --#if EXIV2_MAKE_VERSION(0,23,0) <= EXIV2_VERSION -+#if !EXIV2_TEST_VERSION(0,24,0) - Exiv2::LogMsg::setLevel (Exiv2::LogMsg::mute); - #endif - std::auto_ptr eio(new ExtractorIO (ec)); --- -2.20.1 - diff --git a/srcpkgs/libextractor/template b/srcpkgs/libextractor/template index bd7af6f78de..884dbd8c09e 100644 --- a/srcpkgs/libextractor/template +++ b/srcpkgs/libextractor/template @@ -1,20 +1,19 @@ # Template file for 'libextractor' pkgname=libextractor -version=1.9 +version=1.11 revision=1 build_style=gnu-configure configure_args="--disable-static" hostmakedepends="pkg-config" -#FIXME: Build without gsf support for now, ole2_extractor.c causes GCC sigfault makedepends="zlib-devel bzip2-devel exiv2-devel tiff-devel libpng-devel libjpeg-turbo-devel libvorbis-devel libflac-devel giflib-devel libmpeg2-devel - ffmpeg-devel gtk+3-devel libltdl-devel libarchive-devel file-devel" + ffmpeg-devel gtk+3-devel libltdl-devel libarchive-devel file-devel libgsf-devel" short_desc="Library used to extract meta data from files" maintainer="Martin Riese " license="GPL-3.0-or-later" homepage="https://www.gnu.org/software/libextractor/" distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=f08f257d26c5e9b503f068d6753c8e55cb76f47f73a81da6ed2bba3de3fee2ff +checksum=16f633ab8746a38547c4a1da3f4591192b0825ad83c4336f0575b85843d8bd8f patch_args="-Np1" post_install() { From a115986764d056f8b9742f0842555754b1a6110a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Fri, 23 Apr 2021 10:00:32 +0200 Subject: [PATCH 110/152] peshming: update to 0.4.0. --- srcpkgs/peshming/template | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/srcpkgs/peshming/template b/srcpkgs/peshming/template index 4d63e946034..299d243509f 100644 --- a/srcpkgs/peshming/template +++ b/srcpkgs/peshming/template @@ -1,8 +1,6 @@ -broken="checksum changed, can't compare with old one" - # Template file for 'peshming' pkgname=peshming -version=0.3.0 +version=0.4.0 revision=1 wrksrc="peshming" build_style=cargo @@ -12,7 +10,7 @@ maintainer="Jan Christian Grünhage " license="AGPL-3.0-only" homepage="https://git.jcg.re/jcgruenhage/peshming" distfiles="https://git.jcg.re/jcgruenhage/peshming/archive/v${version}.tar.gz" -checksum=c04b23b803ff379f6c1f691aaf0a20f2e7a9c5be6c24d0ac70e504f4dabe55e3 +checksum=fd2d3eae35746f513006a34757d00e50d15042df54187f886c553e748985319d case "$XBPS_TARGET_MACHINE" in ppc64*) ;; From a314332caea4293386e43f331cde4990f1803891 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 18 Apr 2021 08:18:00 +0700 Subject: [PATCH 111/152] refind: update to 0.13.2. --- srcpkgs/refind/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/refind/template b/srcpkgs/refind/template index f592c67e164..49d46290752 100644 --- a/srcpkgs/refind/template +++ b/srcpkgs/refind/template @@ -1,6 +1,6 @@ # Template file for 'refind' pkgname=refind -version=0.13.1 +version=0.13.2 revision=1 archs="x86_64* i686* aarch64*" makedepends="gnu-efi-libs" @@ -10,7 +10,7 @@ maintainer="Đoàn Trần Công Danh " license="GPL-3.0-only, BSD-3-Clause, BSD-2-Clause, GPL-2.0-only, LGPL-2.1-only" homepage="https://sourceforge.net/projects/refind/" distfiles="${SOURCEFORGE_SITE}/refind/refind-src-${version}.tar.gz" -checksum=291a81f2e2c7f68a4f6abd92c998290de20b39886871ebc9cc19e7912b8856fa +checksum=dd58944854a42df5a2a943f15e5dcfd995808f28580df96ad39d68fb1e48c970 python_version=2 conf_files="/etc/default/refind-kernel-hook.conf" From 3c4b80fcacfa185971650f50a875aeab4ef998e4 Mon Sep 17 00:00:00 2001 From: Joey Date: Thu, 22 Apr 2021 02:20:28 -0400 Subject: [PATCH 112/152] python-hyperlink: update to 21.0.0. --- srcpkgs/python-hyperlink/template | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/srcpkgs/python-hyperlink/template b/srcpkgs/python-hyperlink/template index eb2799306a5..412cc5c0fb4 100644 --- a/srcpkgs/python-hyperlink/template +++ b/srcpkgs/python-hyperlink/template @@ -1,18 +1,24 @@ # Template file for 'python-hyperlink' pkgname=python-hyperlink -version=19.0.0 -revision=4 +version=21.0.0 +revision=1 wrksrc="hyperlink-${version}" build_style=python-module -pycompile_module="hyperlink" hostmakedepends="python-setuptools python3-setuptools" depends="python-idna" +checkdepends="python-idna python-typing python-pytest python-mock + python3-idna python3-pytest" short_desc="Pure-Python implementation of immutable URLs (Python2)" maintainer="Alessio Sergi " license="MIT" homepage="https://github.com/python-hyper/hyperlink" distfiles="${PYPI_SITE}/h/hyperlink/hyperlink-${version}.tar.gz" -checksum=4288e34705da077fada1111a24a0aa08bb1e76699c9ce49876af722441845654 +checksum=427af957daa58bc909471c6c40f74c5450fa123dd093fc53efd2e91d2705a56b + +do_check() { + python3 -m pytest build-${py3_ver} + # python 2 tests fail +} post_install() { vlicense LICENSE @@ -20,11 +26,9 @@ post_install() { python3-hyperlink_package() { depends="python3-idna" - pycompile_module="hyperlink" short_desc="${short_desc/Python2/Python3}" pkg_install() { vmove usr/lib/python3* vlicense LICENSE } } - From b2742095131f60ca66c53c1318b11f00f33d4962 Mon Sep 17 00:00:00 2001 From: Paper Date: Fri, 23 Apr 2021 12:40:25 +0200 Subject: [PATCH 113/152] python3-astroid: update to 2.5.3. --- srcpkgs/python3-astroid/template | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/srcpkgs/python3-astroid/template b/srcpkgs/python3-astroid/template index b46bab1b014..a8fb9a7017f 100644 --- a/srcpkgs/python3-astroid/template +++ b/srcpkgs/python3-astroid/template @@ -1,7 +1,7 @@ # Template file for 'python3-astroid' pkgname=python3-astroid -version=2.4.2 -revision=3 +version=2.5.3 +revision=1 wrksrc="astroid-${version}" build_style=python3-module hostmakedepends="python3-setuptools" @@ -13,15 +13,6 @@ short_desc="Abstract syntax tree for Python3" maintainer="Alessio Sergi " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://github.com/PyCQA/astroid" +changelog="https://raw.githubusercontent.com/PyCQA/astroid/master/ChangeLog" distfiles="${PYPI_SITE}/a/astroid/astroid-${version}.tar.gz" -checksum=2f4078c2a41bf377eea06d71c9d2ba4eb8f6b1af2135bec27bbbb7d8f12bb703 - -post_patch() { - vsed -i -e 's/lazy_object_proxy.*"/lazy_object_proxy"/' \ - astroid/__pkginfo__.py -} - -post_install() { - # no tests - rm -rf ${DESTDIR}/usr/lib/python*/site-packages/astroid/tests -} +checksum=ad63b8552c70939568966811a088ef0bc880f99a24a00834abd0e3681b514f91 From 3ddf75d093814c496ba9aade7f0a3937282c7422 Mon Sep 17 00:00:00 2001 From: Paper Date: Fri, 23 Apr 2021 12:48:41 +0200 Subject: [PATCH 114/152] pylint: update to 2.7.4. --- srcpkgs/pylint/template | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/srcpkgs/pylint/template b/srcpkgs/pylint/template index 379c67948b7..e2c275d029d 100644 --- a/srcpkgs/pylint/template +++ b/srcpkgs/pylint/template @@ -1,7 +1,7 @@ # Template file for 'pylint' pkgname=pylint -version=2.6.0 -revision=4 +version=2.7.4 +revision=1 wrksrc="pylint-${version}" build_style=python3-module hostmakedepends="python3-setuptools" @@ -11,13 +11,10 @@ short_desc="Python code static checker" maintainer="Orphaned " license="GPL-2.0-or-later" homepage="http://www.pylint.org/" +changelog="https://raw.githubusercontent.com/PyCQA/pylint/master/ChangeLog" distfiles="${PYPI_SITE}/p/pylint/pylint-${version}.tar.gz" -checksum=bb4a908c9dadbc3aac18860550e870f58e1a02c9f2c204fdf5693d73be061210 - -do_check() { - # tests fail - : #python3 -m pytest -} +checksum=bd38914c7731cdc518634a8d3c5585951302b6e2b6de60fbb3f7a0220e21eeee +make_check=no post_install() { # no tests From a05723b58ae26b16deca61ac5c2437370df80caa Mon Sep 17 00:00:00 2001 From: Paper Date: Fri, 23 Apr 2021 11:56:44 +0200 Subject: [PATCH 115/152] android-udev-rules: update to 20210302. --- srcpkgs/android-udev-rules/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/android-udev-rules/template b/srcpkgs/android-udev-rules/template index b9113d3cb12..d49283dc10f 100644 --- a/srcpkgs/android-udev-rules/template +++ b/srcpkgs/android-udev-rules/template @@ -1,13 +1,13 @@ # Template file for 'android-udev-rules' pkgname=android-udev-rules -version=20200613 -revision=2 +version=20210302 +revision=1 short_desc="Android udev rules list aimed to be the most comprehensive on the net" maintainer="Rien Maertens " license="GPL-3.0-or-later" homepage="https://github.com/M0Rf30/android-udev-rules" distfiles="https://github.com/M0Rf30/android-udev-rules/archive/${version}.tar.gz" -checksum=8c7fad8cf97fe106f826f07aa9f033e9aa9ee69422b35dada6d9d2df878b5473 +checksum=57c8f8d05492e407485f70a4c571a75d6a28d47b97debc8b279819ff82f19b5b system_groups="adbusers" do_install() { From 82c7dbae68748601d36ba3b16daf30d8953d3722 Mon Sep 17 00:00:00 2001 From: Joey Date: Fri, 23 Apr 2021 00:21:09 -0400 Subject: [PATCH 116/152] python3-txaio: update to 21.2.1. --- srcpkgs/python3-txaio/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-txaio/template b/srcpkgs/python3-txaio/template index e9b27b0a688..4de2e16894f 100644 --- a/srcpkgs/python3-txaio/template +++ b/srcpkgs/python3-txaio/template @@ -1,6 +1,6 @@ # Template file for 'python3-txaio' pkgname=python3-txaio -version=20.12.1 +version=21.2.1 revision=1 wrksrc="txaio-${version}" build_style=python3-module @@ -10,7 +10,7 @@ maintainer="travankor " license="MIT" homepage="https://github.com/crossbario/txaio" distfiles="https://github.com/crossbario/txaio/archive/v${version}.tar.gz" -checksum=51796ed894c7fca3f15d60f2e42aec0bd933112073de748e4fe67faf62a03387 +checksum=ca6f62d244ec3581b71c5c1f808a8b4a48f35cc02591b2c7c1eba7970d76cb6c do_check() { # Depends on deprecated and unmaintained trollius package From d2107aad1a3cd1704dcbf4b4044cd2d199789fdc Mon Sep 17 00:00:00 2001 From: skmpz Date: Fri, 23 Apr 2021 08:54:47 +0300 Subject: [PATCH 117/152] openvpn: update to 2.5.2. --- srcpkgs/openvpn/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/openvpn/template b/srcpkgs/openvpn/template index cbad158b7c7..31a9679a33f 100644 --- a/srcpkgs/openvpn/template +++ b/srcpkgs/openvpn/template @@ -1,6 +1,6 @@ # Template file for 'openvpn' pkgname=openvpn -version=2.5.1 +version=2.5.2 revision=1 build_style=gnu-configure configure_args="$(vopt_enable pkcs11) --disable-systemd @@ -13,7 +13,7 @@ maintainer="Orphaned " license="GPL-2.0-only" homepage="https://www.openvpn.net" distfiles="http://build.openvpn.net/downloads/releases/${pkgname}-${version}.tar.xz" -checksum=40930489c837c05f6153f38e1ebaec244431ef1a034e4846ff732d71d59ff194 +checksum=b12743836901f365efaf82ab2493967e1b21c21eb43ce9a8da1002a17c9c1dc8 build_options="mbedtls pkcs11" build_options_default="pkcs11" From 380822d3b80833282c916da4c86a090deeb857c5 Mon Sep 17 00:00:00 2001 From: skmpz Date: Fri, 23 Apr 2021 09:23:39 +0300 Subject: [PATCH 118/152] libXt: update to 1.2.1. --- srcpkgs/libXt/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/libXt/template b/srcpkgs/libXt/template index 58170e13c63..a3a7f24e000 100644 --- a/srcpkgs/libXt/template +++ b/srcpkgs/libXt/template @@ -1,17 +1,17 @@ -# Template build file for 'libXt'. +# Template file for 'libXt' pkgname=libXt -version=1.2.0 +version=1.2.1 revision=1 build_style=gnu-configure configure_args="--enable-malloc0returnsnull" hostmakedepends="pkg-config xorgproto" makedepends="xorgproto libSM-devel libX11-devel" short_desc="X Toolkit Intrinsics library" -maintainer="Orphaned " +maintainer="skmpz " license="MIT" homepage="http://xorg.freedesktop.org" distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2" -checksum=b31df531dabed9f4611fc8980bc51d7782967e2aff44c4105251a1acb5a77831 +checksum=679cc08f1646dbd27f5e48ffe8dd49406102937109130caab02ca32c083a3d60 post_install() { vlicense COPYING From 851dbe0342be1cc09b39161d80705e9bf116f8de Mon Sep 17 00:00:00 2001 From: Kyra Zimmer Date: Fri, 23 Apr 2021 09:24:30 +0200 Subject: [PATCH 119/152] godot: update to 3.3. --- srcpkgs/godot/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template index 9be5b1ab40a..2f86a7d36b4 100644 --- a/srcpkgs/godot/template +++ b/srcpkgs/godot/template @@ -1,6 +1,6 @@ # Template file for 'godot' pkgname=godot -version=3.2.3 +version=3.3 revision=1 archs="x86_64* i686* aarch64* armv7* ppc64*" wrksrc="${pkgname}-${version}-stable" @@ -27,7 +27,7 @@ maintainer="Nick Hahn " license="MIT" homepage="https://www.godotengine.org/" distfiles="https://github.com/godotengine/${pkgname}/archive/${version}-stable.tar.gz" -checksum=4c2a8e7da1ad05c6223b0ff6cf2be124dad6708b56a8ec9910dc2aaf82a553ae +checksum=595ff16eaef3d0b6c030575f4b7fcae8b805e407b90a2f71af3e4142362c1794 nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/6342/steps/shell_3/logs/stdio CFLAGS+=" -fPIE -fPIC" From 6d34db9d27b84077a3b7f7dc14c179ee0c5c6bc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 18 Apr 2021 08:40:42 +0700 Subject: [PATCH 120/152] python3-Sphinx: update to 3.5.4. --- srcpkgs/python3-Sphinx/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-Sphinx/template b/srcpkgs/python3-Sphinx/template index 290850ec55f..bd2ddebd37d 100644 --- a/srcpkgs/python3-Sphinx/template +++ b/srcpkgs/python3-Sphinx/template @@ -1,6 +1,6 @@ # Template file for 'python3-Sphinx' pkgname=python3-Sphinx -version=3.5.1 +version=3.5.4 revision=1 wrksrc=Sphinx-${version} build_style=python3-module @@ -18,7 +18,7 @@ maintainer="Đoàn Trần Công Danh " license="BSD-3-Clause" homepage="http://sphinx-doc.org" distfiles="${PYPI_SITE}/S/Sphinx/Sphinx-${version}.tar.gz" -checksum=11d521e787d9372c289472513d807277caafb1684b33eb4f08f7574c405893a9 +checksum=19010b7b9fa0dc7756a6e105b2aacd3a80f798af3c25c273be64d7beeb482cb1 conflicts="python-Sphinx>=0" do_check() { From af784cfcbf91af111a771fb4bef05c0b8d950bf6 Mon Sep 17 00:00:00 2001 From: amak Date: Fri, 23 Apr 2021 11:23:41 +1000 Subject: [PATCH 121/152] libnpupnp: update to 4.1.4 --- srcpkgs/libnpupnp/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libnpupnp/template b/srcpkgs/libnpupnp/template index 16c0d5b6cc5..677191fbea3 100644 --- a/srcpkgs/libnpupnp/template +++ b/srcpkgs/libnpupnp/template @@ -1,6 +1,6 @@ # Template file for 'libnpupnp' pkgname=libnpupnp -version=4.1.3 +version=4.1.4 revision=1 build_style=gnu-configure hostmakedepends="pkg-config" @@ -10,7 +10,7 @@ maintainer="amak " license="BSD-3-Clause" homepage="https://www.lesbonscomptes.com/upmpdcli/npupnp-doc/libnpupnp.html" distfiles="https://www.lesbonscomptes.com/upmpdcli/downloads/libnpupnp-${version}.tar.gz" -checksum=74703d49be52d29b52f59342ec7359178b127568399551d9d3f56bb7950fcc02 +checksum=03506f02546e3b3d31b389e046c4691f020b82d315426ce79f1e2b1eb7958656 post_install() { vlicense COPYING From 162be019ff5e0569ce8fae6a89b2daf24c31ec25 Mon Sep 17 00:00:00 2001 From: q66 Date: Fri, 23 Apr 2021 19:17:48 +0200 Subject: [PATCH 122/152] firefox: fix flac-no-ffvpx.patch to unbreak ppc64* --- srcpkgs/firefox/patches/flac-no-ffvpx.patch | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/srcpkgs/firefox/patches/flac-no-ffvpx.patch b/srcpkgs/firefox/patches/flac-no-ffvpx.patch index e3f60e8ecf6..740f5614456 100644 --- a/srcpkgs/firefox/patches/flac-no-ffvpx.patch +++ b/srcpkgs/firefox/patches/flac-no-ffvpx.patch @@ -12,15 +12,14 @@ index 53fc3c9937f7..b23771ab80fa 100644 namespace mozilla { -@@ -14,6 +15,11 @@ namespace mozilla { +@@ -14,6 +15,10 @@ namespace mozilla { bool FlacDecoder::IsEnabled() { #ifdef MOZ_FFVPX return StaticPrefs::media_flac_enabled(); +#elif defined(MOZ_FFMPEG) + RefPtr platform = new PDMFactory(); + return StaticPrefs::media_flac_enabled() && -+ platform->SupportsMimeType("audio/flac"_ns, -+ /* DecoderDoctorDiagnostics* */ nullptr); ++ platform->SupportsMimeType("audio/flac"_ns); #else // Until bug 1295886 is fixed. return false; From 281988cfcb18a283a9ce73031840287ef78bc72e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= Date: Fri, 23 Apr 2021 15:07:54 -0300 Subject: [PATCH 123/152] cairo-dock-plugins: revbump to actually replace vte290 with vte3. 8d643c6fddaf029b045ddbe29e2f21ece1a7fd50 didn't revbump, only changed the dependency. Closes #30456, thanks eth0OS for diagnosing. --- srcpkgs/cairo-dock-plugins/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cairo-dock-plugins/template b/srcpkgs/cairo-dock-plugins/template index 6bb439f1b5d..38295ded98c 100644 --- a/srcpkgs/cairo-dock-plugins/template +++ b/srcpkgs/cairo-dock-plugins/template @@ -1,7 +1,7 @@ # Template file for 'cairo-dock-plugins' pkgname=cairo-dock-plugins version=3.4.1 -revision=14 +revision=15 build_style=cmake hostmakedepends="gettext pkg-config" makedepends="alsa-lib-devel fftw-devel pulseaudio-devel libexif-devel From d8678f75798008857f26149dbe836857de1397b6 Mon Sep 17 00:00:00 2001 From: reback00 Date: Sat, 24 Apr 2021 00:31:07 +0600 Subject: [PATCH 124/152] ibus-m17n: update to 1.4.5 --- srcpkgs/ibus-m17n/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ibus-m17n/template b/srcpkgs/ibus-m17n/template index 7118fe0e3bc..325e7ef1832 100644 --- a/srcpkgs/ibus-m17n/template +++ b/srcpkgs/ibus-m17n/template @@ -1,6 +1,6 @@ # Template file for 'ibus-m17n' pkgname=ibus-m17n -version=1.4.4 +version=1.4.5 revision=1 build_style=gnu-configure configure_args="--prefix=/usr --libexecdir=/usr/lib/ibus" @@ -13,7 +13,7 @@ maintainer="reback00 " license="GPL-2.0-or-later" homepage="https://github.com/ibus/ibus-m17n" distfiles="https://github.com/ibus/ibus-m17n/releases/download/${version}/ibus-m17n-${version}.tar.gz" -checksum=a479351c3ed44283aef2b990f21e8a3e1b23ff0745836d3a45edfe7929432915 +checksum=3aeb59fe13ab64516f7a39462d78812952b480c5ee885aa2ab45e8ff52ff1a8c pre_configure() { autoreconf -fi From 5e6bcda7b12c72e21e1601e4a1c4f883905a9828 Mon Sep 17 00:00:00 2001 From: skmpz Date: Sat, 17 Apr 2021 08:48:49 +0300 Subject: [PATCH 125/152] libdrm: update to 2.4.105. Closes: #30278 [via git-merge-pr] --- .../libdrm/patches/revert_set_fb_modifiers_flag.patch | 9 +++++++++ srcpkgs/libdrm/template | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/libdrm/patches/revert_set_fb_modifiers_flag.patch diff --git a/srcpkgs/libdrm/patches/revert_set_fb_modifiers_flag.patch b/srcpkgs/libdrm/patches/revert_set_fb_modifiers_flag.patch new file mode 100644 index 00000000000..9df4a09b81b --- /dev/null +++ b/srcpkgs/libdrm/patches/revert_set_fb_modifiers_flag.patch @@ -0,0 +1,9 @@ +https://gitlab.freedesktop.org/mesa/drm/-/commit/40f73d0b0b3936ccadc693edc25aad70c1225766 +--- xf86drmMode.c 2021-04-07 16:54:11.000000000 +0300 ++++ xf86drmMode.c 2021-04-23 08:16:18.037479830 +0300 +@@ -292,2 +292 @@ drm_public int drmModeAddFB2WithModifier +- if (modifier) { +- f.flags |= DRM_MODE_FB_MODIFIERS; ++ if (modifier) +@@ -295 +293,0 @@ drm_public int drmModeAddFB2WithModifier +- } diff --git a/srcpkgs/libdrm/template b/srcpkgs/libdrm/template index 36ec6d3fa67..ef96bcf5d12 100644 --- a/srcpkgs/libdrm/template +++ b/srcpkgs/libdrm/template @@ -1,6 +1,6 @@ # Template file for 'libdrm' pkgname=libdrm -version=2.4.103 +version=2.4.105 revision=1 wrksrc="drm-libdrm-${version}" build_style=meson @@ -12,7 +12,7 @@ maintainer="Orphaned " license="MIT" homepage="https://dri.freedesktop.org/" distfiles="https://gitlab.freedesktop.org/mesa/drm/-/archive/libdrm-${version}/drm-libdrm-${version}.tar.gz" -checksum=9235bcbcaca43372151ce82af7c1f83aec5e6f371153cd7957a117f99098713f +checksum=0ba5017cafd4b7ac885356403c20105d40efcd11271ebf75727c1a5599e4ed53 case "$XBPS_TARGET_MACHINE" in aarch64*) configure_args+=" -Dvc4=true";; From 555d13d3bebabe00c9c36b47a335e5715eb35c77 Mon Sep 17 00:00:00 2001 From: reback00 Date: Sat, 24 Apr 2021 00:04:44 +0600 Subject: [PATCH 126/152] pnpm: update to 6.1.0 --- srcpkgs/pnpm/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/pnpm/template b/srcpkgs/pnpm/template index 6d7ecfe1ce8..6de605f2e69 100644 --- a/srcpkgs/pnpm/template +++ b/srcpkgs/pnpm/template @@ -1,6 +1,6 @@ # Template file for 'pnpm' pkgname=pnpm -version=6.0.1 +version=6.1.0 revision=1 build_style=fetch hostmakedepends="nodejs jq" @@ -10,7 +10,7 @@ maintainer="reback00 " license="MIT" homepage="https://pnpm.js.org/" distfiles="https://registry.npmjs.org/${pkgname}/-/${pkgname}-${version}.tgz" -checksum=6e390217ab6250f85d28cb0135620e3b0526a849dda7fb7c54f092c1b6bd465c +checksum=29edaaee2babbeb34309421b24cbe8f36b05066abba6ab14c97f7483ad5e3378 python_version=3 do_install() { From 017d015f996ee3181725bf2e4f14c7510357151e Mon Sep 17 00:00:00 2001 From: Seth Date: Thu, 15 Apr 2021 02:40:44 -0400 Subject: [PATCH 127/152] urlwatch: update to 2.23 and claim maintainership --- srcpkgs/urlwatch/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/urlwatch/template b/srcpkgs/urlwatch/template index b03f00c3418..f6098a2707c 100644 --- a/srcpkgs/urlwatch/template +++ b/srcpkgs/urlwatch/template @@ -1,7 +1,7 @@ # Template file for 'urlwatch' pkgname=urlwatch -version=2.21 -revision=2 +version=2.23 +revision=1 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-appdirs python3-keyring python3-minidb python3-requests @@ -11,16 +11,16 @@ depends="python3-appdirs python3-keyring python3-minidb python3-requests checkdepends="python3-pytest python3-pycodestyle python3-docutils python3-Pygments ${depends}" short_desc="Tool for monitoring webpages for updates" -maintainer="Orphaned " +maintainer="RunningDroid " license="BSD-3-Clause" homepage="https://thp.io/2008/urlwatch/" distfiles="${PYPI_SITE}/u/urlwatch/urlwatch-${version}.tar.gz" -checksum=c259e0169cc99114b54470d08a8312473159dfdbed1d712d1a222fd8a9d7291a +checksum=73a29efbef80c02bc8c285fca427793979c0e4bef40bc084df5de5436378b842 do_check() { # skip the tests that require python modules that aren't packaged # (pdftotext & pytesseract) - pytest -k "not (pdf or ocr)" -v + pytest -k "not (pdf or ocr or json)" -v } post_install() { From 79d5574b41a750913f5b9b5d2dfcd8c0b4e85f45 Mon Sep 17 00:00:00 2001 From: Justin Jagieniak Date: Tue, 30 Mar 2021 21:24:54 +0200 Subject: [PATCH 128/152] New package: kup-0.8.0 --- srcpkgs/kup/template | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 srcpkgs/kup/template diff --git a/srcpkgs/kup/template b/srcpkgs/kup/template new file mode 100644 index 00000000000..461bbcd45f9 --- /dev/null +++ b/srcpkgs/kup/template @@ -0,0 +1,16 @@ +# Template file for 'kup' +pkgname=kup +version=0.8.0 +revision=1 +build_style=cmake +hostmakedepends="extra-cmake-modules kdoctools qt5-qmake qt5-host-tools kcoreaddons gettext kconfig" +makedepends="cmake qt5-devel kcoreaddons-devel ki18n-devel kio-devel ksolid-devel + kidletime-devel knotifications-devel kconfig-devel kinit-devel kjobwidgets-devel + libgit2-devel plasma-framework-devel" +depends="rsync" +short_desc="Kup is created to keep backups of personal files" +maintainer="Justin Jagieniak " +license="GPL-2.0-or-later" +homepage="https://www.kde.org/applications/utilities/kup/" +distfiles="${KDE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz" +checksum="79154cd12bcbef87b3b22851adcd505f5da7723483361c7a16ae4c3eea61f0bd" From 7d2635f6d2575bb061393bd5cd47775d446f3998 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 23 Apr 2021 21:08:44 +0200 Subject: [PATCH 129/152] common/shlibs: cleanup double entries --- common/shlibs | 51 --------------------------------------------------- 1 file changed, 51 deletions(-) diff --git a/common/shlibs b/common/shlibs index 966f665424f..d2cd0cd4c79 100644 --- a/common/shlibs +++ b/common/shlibs @@ -118,7 +118,6 @@ libGLESv2.so atom-1.41.0_1 libGLESv2.so opera-55.0.2994.37_2 libGLESv2.so discord-0.0.7_1 libGLESv2.so keybase-desktop-3.1.2_1 -libGLESv2.so wire-desktop-3.6.2885_1 libGLESv2.so Signal-Desktop-1.23.2_1 libGLESv2.so slack-desktop-3.4.2_1 libbrcmEGL.so rpi-userland-20180103_2 @@ -571,18 +570,6 @@ libkrb5support.so.0 mit-krb5-libs-1.8_1 libkdb_ldap.so.1 mit-krb5-libs-1.14.2_2 libverto.so.0 mit-krb5-libs-1.8_1 libverto-k5ev.so.0 mit-krb5-libs-1.8_1 -libgssapi_krb5.so.2 mit-krb5-libs-1.18.3_2 -libgssrpc.so.4 mit-krb5-libs-1.18.3_2 -libk5crypto.so.3 mit-krb5-libs-1.18.3_2 -libkadm5clnt_mit.so.12 mit-krb5-libs-1.18.3_2 -libkadm5srv_mit.so.12 mit-krb5-libs-1.18.3_2 -libkdb5.so.10 mit-krb5-libs-1.18.3_2 -libkrb5.so.3 mit-krb5-libs-1.18.3_2 -libkrad.so.0 mit-krb5-libs-1.18.3_2 -libkrb5support.so.0 mit-krb5-libs-1.18.3_2 -libkdb_ldap.so.1 mit-krb5-libs-1.18.3_2 -libverto.so.0 mit-krb5-libs-1.18.3_2 -libverto-k5ev.so.0 mit-krb5-libs-1.18.3_2 libmenu-cache.so.3 menu-cache-1.0.0_1 libupower-glib.so.3 libupower-glib3-0.99.3_1 libcanberra.so.0 libcanberra-0.23_1 @@ -643,18 +630,14 @@ libboost_wserialization.so.1.72.0 libboost_wserialization1.72-1.72.0_1 libboost_graph.so.1.72.0 libboost_graph1.72-1.72.0_1 libboost_log.so.1.72.0 libboost_log1.72-1.72.0_1 libboost_locale.so.1.72.0 libboost_locale1.72-1.72.0_1 -libboost_math_tr1.so.1.72.0 libboost_math_tr11.72-1.72.0_1 libboost_program_options.so.1.72.0 libboost_program_options1.72-1.72.0_1 libboost_iostreams.so.1.72.0 libboost_iostreams1.72-1.72.0_1 libboost_system.so.1.72.0 libboost_system1.72-1.72.0_1 libboost_thread.so.1.72.0 libboost_thread1.72-1.72.0_1 libboost_log_setup.so.1.72.0 libboost_log_setup1.72-1.72.0_1 libboost_date_time.so.1.72.0 libboost_date_time1.72-1.72.0_1 -libboost_math_c99.so.1.72.0 libboost_math_c991.72-1.72.0_1 libboost_wave.so.1.72.0 libboost_wave1.72-1.72.0_1 -libboost_math_tr1.so.1.72.0 libboost_math_tr11.72-1.72.0_1 libboost_atomic.so.1.72.0 libboost_atomic1.72-1.72.0_1 -libboost_math_c99.so.1.72.0 libboost_math_c991.72-1.72.0_1 libboost_type_erasure.so.1.72.0 libboost_type_erasure1.72-1.72.0_1 libboost_fiber.so.1.72.0 libboost_fiber1.72-1.72.0_1 libboost_stacktrace_noop.so.1.72.0 libboost_stacktrace_noop1.72-1.72.0_1 @@ -697,14 +680,6 @@ libevent_core-2.1.so.7 libevent-2.1.11_1 libevent_extra-2.1.so.7 libevent-2.1.11_1 libevent_pthreads-2.1.so.7 libevent-2.1.11_1 libevent_openssl-2.1.so.7 libevent-2.1.11_1 -liblber-2.4.so.2 libldap-2.4.57_2 -libldap-2.4.so.2 libldap-2.4.57_2 -libldap_r-2.4.so.2 libldap-2.4.57_2 -libevent-2.1.so.7 libevent-2.1.12_2 -libevent_core-2.1.so.7 libevent-2.1.12_2 -libevent_extra-2.1.so.7 libevent-2.1.12_2 -libevent_pthreads-2.1.so.7 libevent-2.1.12_2 -libevent_openssl-2.1.so.7 libevent-2.1.12_2 libSDL_mixer-1.2.so.0 SDL_mixer-1.2.11_1 libapr-1.so.0 apr-1.4.2_1 libaprutil-1.so.0 apr-util-1.6.1_11 @@ -997,7 +972,6 @@ libIceDB.so.37 libIce-3.7.5_2 libIceXML.so.37 libIce-3.7.5_2 libIceDiscovery.so.37 libIce-3.7.5_2 libIceLocatorDiscovery.so.37 libIce-3.7.5_2 -libkdecorations2private.so.8 kdecoration-5.20.90_1 libvdpau.so.1 libvdpau-0.4.1_1 libgsm.so.1 libgsm-1.0.13_13 libcgroup.so.1 libcgroup-0.37.1_1 @@ -1191,7 +1165,6 @@ libspice-client-glib-2.0.so.8 spice-gtk-0.37_6 libspice-controller.so.0 spice-gtk-0.37_6 libvirt-gconfig-1.0.so.0 libvirt-glib-0.1.2_1 libvirt-gobject-1.0.so.0 libvirt-glib-0.1.2_1 -libvirt-glib-1.0.so.0 libvirt-glib-0.1.2_1 libgsasl.so.7 libgsasl-1.8.0_1 libzmq.so.5 zeromq-4.1.2_1 libstatgrab.so.10 libstatgrab-0.91_1 @@ -1602,12 +1575,6 @@ libdovecot-compression.so.0 dovecot-2.3.13_3 libdovecot-sql.so.0 dovecot-2.3.13_3 libdovecot-storage.so.0 dovecot-2.3.13_3 libdovecot-lda.so.0 dovecot-2.3.13_3 -libdovecot.so.0 dovecot-2.3.13_3 -libdovecot-login.so.0 dovecot-2.3.13_3 -libdovecot-compression.so.0 dovecot-2.3.13_3 -libdovecot-sql.so.0 dovecot-2.3.13_3 -libdovecot-storage.so.0 dovecot-2.3.13_3 -libdovecot-lda.so.0 dovecot-2.3.13_3 libwiretap.so.11 libwireshark-3.4.0_1 libwireshark.so.14 libwireshark-3.4.0_1 libwsutil.so.12 libwireshark-3.4.0_1 @@ -1933,7 +1900,6 @@ libQt53DQuickScene2D.so.5 qt5-3d-5.15.2_3 libQt53DExtras.so.5 qt5-3d-5.15.2_3 libQt53DQuickExtras.so.5 qt5-3d-5.15.2_3 libQt53DQuickAnimation.so.5 qt5-3d-5.15.2_3 -libQt53DQuickInput.so.5 qt5-3d-5.15.2_3 libQt5Charts.so.5 qt5-charts-5.15.2_3 libQt5DataVisualization.so.5 qt5-datavis3d-5.15.2_3 libQt5Gamepad.so.5 qt5-gamepad-5.15.2_3 @@ -2205,16 +2171,6 @@ libclamunrar.so.9 clamav-0.103.1_2 libclamunrar_iface.so.9 clamav-0.103.1_2 libfreshclam.so.2 clamav-0.103.1_2 libqca-qt5.so.2 qca-qt5-2.1.3_1 -libclamav.so.9 clamav-0.103.1_2 -libclamunrar.so.9 clamav-0.103.1_2 -libclamunrar_iface.so.9 clamav-0.103.1_2 -libfreshclam.so.2 clamav-0.103.1_2 -libqca-qt5.so.2 qca-qt5-2.3.1_2 -libclamav.so.9 clamav-0.103.1_2 -libclamunrar.so.9 clamav-0.103.1_2 -libclamunrar_iface.so.9 clamav-0.103.1_2 -libfreshclam.so.2 clamav-0.103.1_2 -libqca-qt5.so.2 qca-qt5-2.3.1_2 libqt5keychain.so.1 qtkeychain-qt5-0.7.0_1 libphonon4qt5.so.4 phonon-qt5-4.8.3_1 libphonon4qt5experimental.so.4 phonon-qt5-4.8.3_1 @@ -2456,9 +2412,6 @@ libvterm.so.0 libvterm-0.0.20151005_1 libboinc_opencl.so.7 boinc-7.16.16_2 libboinc_api.so.7 boinc-7.16.16_2 libboinc_graphics2.so.7 boinc-7.16.16_2 -libboinc_opencl.so.7 boinc-nox-7.16.16_2 -libboinc_api.so.7 boinc-nox-7.16.16_2 -libboinc_graphics2.so.7 boinc-nox-7.16.16_2 libsynfig.so.0 synfig-1.0.1_1 libhidapi-hidraw.so.0 hidapi-0.8.0rc1_1 libhidapi-libusb.so.0 hidapi-0.8.0rc1_1 @@ -2959,8 +2912,6 @@ libqalculate.so.21 libqalculate-3.0.0_1 libweston-9.so.0 weston-9.0.0_1 libostree-1.so.1 libostree-2020.8_2 librhash.so.0 rhash-1.3.4_1 -libostree-1.so.1 libostree-2020.8_2 -librhash.so.0 rhash-1.4.1_2 libserialport.so.0 libserialport-0.1.1_1 libsigrok.so.4 libsigrok-0.5.0_1 libsigrokcxx.so.4 libsigrok-0.5.0_1 @@ -3427,8 +3378,6 @@ libspa-jack.so libspa-jack-0.3.6_1 libspa-v4l2.so libspa-v4l2-0.3.6_1 libspa-videoconvert.so libspa-videoconvert-0.3.6_1 libspa-vulkan.so libspa-vulkan-0.3.6_1 -libspa-bluez5.so libspa-bluetooth-0.3.6_1 -libspa-ffmpeg.so libspa-ffmpeg-0.3.6_1 librem.so rem-0.5.3_1 libshp.so.1 shapelib-1.4.1_1 libantlr3c.so libantlr3c-3.4_1 From 421bdfb714614fe3fdc1b4c60677ea84a0f0ee3c Mon Sep 17 00:00:00 2001 From: Piraty Date: Fri, 23 Apr 2021 12:43:46 +0200 Subject: [PATCH 130/152] jitterentropy: update to 3.0.2. Set make_use_env=yes so the makefile appends its desired CFLAGS to those of xbps-src (mainly so -O0 takes precedence over -O2 in XBPS_CFLAGS) as jitterentropy should be built without optimization. --- srcpkgs/jitterentropy/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/jitterentropy/template b/srcpkgs/jitterentropy/template index 5a9003fdbbc..ffaf54f5fbd 100644 --- a/srcpkgs/jitterentropy/template +++ b/srcpkgs/jitterentropy/template @@ -1,15 +1,16 @@ # Template file for 'jitterentropy' pkgname=jitterentropy -version=3.0.1 -revision=3 +version=3.0.2 +revision=1 wrksrc="${pkgname}-library-${version}" build_style=gnu-makefile +make_use_env=yes short_desc="Hardware RNG based on CPU timing jitter" maintainer="Piraty " license="BSD-3-Clause" homepage="https://www.chronox.de/jent.html" distfiles="https://github.com/smuellerDD/jitterentropy-library/archive/v${version}.tar.gz" -checksum=015a443ebfaab7bc302caa24dcc124aefe1818046893f49591d2465bd3f58e16 +checksum=5be868e343c25e24312f5e6894642ce1044994b99d6676430c760584a1b1613e post_install() { vlicense COPYING From b943ea3851de04ed167338b0e1e7f2c2358fc324 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Fri, 23 Apr 2021 23:21:09 +0200 Subject: [PATCH 131/152] filelight: update to 21.04.0. --- srcpkgs/filelight/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/filelight/template b/srcpkgs/filelight/template index 0ceb7e92fc8..0efc46d8bf7 100644 --- a/srcpkgs/filelight/template +++ b/srcpkgs/filelight/template @@ -1,6 +1,6 @@ # Template file for 'filelight' pkgname=filelight -version=20.12.3 +version=21.04.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools @@ -11,4 +11,4 @@ maintainer="Piotr Wójcik " license="GPL-2.0-only" homepage="https://utils.kde.org/projects/filelight/" distfiles="${KDE_SITE}/release-service/${version}/src/filelight-${version}.tar.xz" -checksum=206a70d9aa2d5ba025cb5ab84d860843a163919f26517eca5c0108b123be4a5a +checksum=db2004c06c2ae95f007ade9244d161bb140b3012776cce0f0f1fcf7a0cc3d7ad From 136cfb8e802c51622307c749b83b8515393c24cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Fri, 23 Apr 2021 23:21:09 +0200 Subject: [PATCH 132/152] kaccounts-integration: update to 21.04.0. --- srcpkgs/kaccounts-integration/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kaccounts-integration/template b/srcpkgs/kaccounts-integration/template index b018988aada..ab092f3f894 100644 --- a/srcpkgs/kaccounts-integration/template +++ b/srcpkgs/kaccounts-integration/template @@ -1,6 +1,6 @@ # Template file for 'kaccounts-integration' pkgname=kaccounts-integration -version=20.12.3 +version=21.04.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake @@ -12,7 +12,7 @@ maintainer="Piotr Wójcik " license="GPL-2.0-or-later" homepage="https://cgit.kde.org/kaccounts-integration.git/" distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-integration-${version}.tar.xz" -checksum=98390b72fbb3eb26a892f6f2169d71df754dd44887ed599116b624012297a655 +checksum=fe3e3096a237ba0f97cd8a25926648aef30fdc8dd475d78748857032a9f6cefe kaccounts-integration-devel_package() { short_desc+=" - development" From f5fffd220a9ffcc0a614bc3ab0933ef43b210308 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Fri, 23 Apr 2021 23:21:09 +0200 Subject: [PATCH 133/152] kaccounts-providers: update to 21.04.0. --- srcpkgs/kaccounts-providers/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kaccounts-providers/template b/srcpkgs/kaccounts-providers/template index a5094cd0fcc..84d97909a99 100644 --- a/srcpkgs/kaccounts-providers/template +++ b/srcpkgs/kaccounts-providers/template @@ -1,6 +1,6 @@ # Template file for 'kaccounts-providers' pkgname=kaccounts-providers -version=20.12.3 +version=21.04.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules intltool qt5-qmake qt5-host-tools @@ -12,7 +12,7 @@ maintainer="Piotr Wójcik " license="GPL-2.0-or-later" homepage="https://cgit.kde.org/kaccounts-providers.git/" distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-providers-${version}.tar.xz" -checksum=ae71cadebff1e16991c48fcb9c71c177e2fc2d04536b89d1437587bcdae70617 +checksum=e0b58817dd41f18f6408e40f7d0390f6e8c426394fc1e36c691f98f794c6369f build_options="nextcloud" desc_option_nextcloud="Build nextcloud support (needs Qt5 WebEngine)" From 03e7af59b0a9b76aff3bf755d888683d15b4e338 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Fri, 23 Apr 2021 23:21:09 +0200 Subject: [PATCH 134/152] kcron: update to 21.04.0. --- srcpkgs/kcron/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kcron/template b/srcpkgs/kcron/template index ae834a7601c..3966dd41252 100644 --- a/srcpkgs/kcron/template +++ b/srcpkgs/kcron/template @@ -1,6 +1,6 @@ # Template file for 'kcron' pkgname=kcron -version=20.12.3 +version=21.04.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools @@ -11,4 +11,4 @@ maintainer="Piotr Wójcik " license="GPL-2.0-or-later" homepage="https://userbase.kde.org/System_Settings/Task_Scheduler" distfiles="${KDE_SITE}/release-service/${version}/src/kcron-${version}.tar.xz" -checksum=ee8276e91e35959c6ea795327957ed6a218a59ac0912aac3a3cbc5f5abafc54a +checksum=c3ca3b59d10a850e7bf24cdc95256bd1d98ce1be1c2da55fb075de8e2c239e90 From b06da2f12fae2542652612ea3c44a05068428394 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Fri, 23 Apr 2021 23:21:09 +0200 Subject: [PATCH 135/152] kdialog: update to 21.04.0. --- srcpkgs/kdialog/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kdialog/template b/srcpkgs/kdialog/template index e0a4a3b03b3..0a09104ba02 100644 --- a/srcpkgs/kdialog/template +++ b/srcpkgs/kdialog/template @@ -1,6 +1,6 @@ # Template file for 'kdialog' pkgname=kdialog -version=20.12.3 +version=21.04.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3 @@ -11,4 +11,4 @@ maintainer="Piotr Wójcik " license="GPL-2.0-or-later" homepage="https://invent.kde.org/utilities/kdialog" distfiles="${KDE_SITE}/release-service/${version}/src/kdialog-${version}.tar.xz" -checksum=231f6735e5905e92381da835da1b90bddb8ada39d8bffd90c8d2f9a3673602de +checksum=babc9bc9c88cdce81e2380cde280be650ea6ec10fddb949a45a142a1ee6d5535 From 8d7c743b44523e95314dc354359fc2052d6d8aa8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Fri, 23 Apr 2021 23:21:09 +0200 Subject: [PATCH 136/152] keditbookmarks: update to 21.04.0. --- srcpkgs/keditbookmarks/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/keditbookmarks/template b/srcpkgs/keditbookmarks/template index d976cd27076..afd2126e025 100644 --- a/srcpkgs/keditbookmarks/template +++ b/srcpkgs/keditbookmarks/template @@ -1,6 +1,6 @@ # Template file for 'keditbookmarks' pkgname=keditbookmarks -version=20.12.3 +version=21.04.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools @@ -11,7 +11,7 @@ maintainer="Piotr Wójcik " license="GPL-2.0-or-later, GFDL-1.2-only" homepage="https://www.kde.org/" distfiles="${KDE_SITE}/release-service/${version}/src/keditbookmarks-${version}.tar.xz" -checksum=6823446698d80e6ce59601f1772ec316ad205954cac8be6381456f714c6dd759 +checksum=8c9e69198d3351eef02531562a53ccef6e6781af95ea9cb7d0b49e07d313b3a9 pre_check() { export QT_QPA_PLATFORM=offscreen From 6f18c141b98b5c9bdeabb7ecc13f13935cc9c1bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Fri, 23 Apr 2021 23:21:09 +0200 Subject: [PATCH 137/152] kfind: update to 21.04.0. --- srcpkgs/kfind/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kfind/template b/srcpkgs/kfind/template index a74ffe9109f..cdbae9b7209 100644 --- a/srcpkgs/kfind/template +++ b/srcpkgs/kfind/template @@ -1,6 +1,6 @@ # Template file for 'kfind' pkgname=kfind -version=20.12.3 +version=21.04.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake @@ -11,4 +11,4 @@ maintainer="Piotr Wójcik " license="GPL-2.0-or-later" homepage="https://www.kde.org/applications/utilities/kfind/" distfiles="${KDE_SITE}/release-service/${version}/src/kfind-${version}.tar.xz" -checksum=e6f608fcd717021bc2f4c69def81f18361c05abb72503deb268d219fb8a6f167 +checksum=72bfa8708e0e627fff6cc78693f6c778ba27cebdc65f84c69189385de5814284 From 84c335e608fa5489852d48136ca83ef428645ba7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Fri, 23 Apr 2021 23:21:10 +0200 Subject: [PATCH 138/152] kig: update to 21.04.0. --- srcpkgs/kig/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kig/template b/srcpkgs/kig/template index 5a4bf8f150d..65fba07bd5e 100644 --- a/srcpkgs/kig/template +++ b/srcpkgs/kig/template @@ -1,6 +1,6 @@ # Template file for 'kig' pkgname=kig -version=20.12.3 +version=21.04.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules kcoreaddons kdoctools gettext @@ -11,4 +11,4 @@ maintainer="Piotr Wójcik " license="GPL-2.0-only" homepage="https://www.kde.org/applications/education/kig/" distfiles="${KDE_SITE}/release-service/${version}/src/kig-${version}.tar.xz" -checksum=ce3261eb10e052fa10fcb3742d6a1820006bfa100f5aaae09f367acac3019ed9 +checksum=178ecb364e248f4f7ed39dcb93dcd6ce4cee0c5628f5e49d6e05383afc3d9734 From cb0ef99d9d597781d674e8078cc99d20d77dc3cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Fri, 23 Apr 2021 23:21:10 +0200 Subject: [PATCH 139/152] kio-gdrive: update to 21.04.0. --- srcpkgs/kio-gdrive/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/kio-gdrive/template b/srcpkgs/kio-gdrive/template index 95fa0167843..8821e625326 100644 --- a/srcpkgs/kio-gdrive/template +++ b/srcpkgs/kio-gdrive/template @@ -1,15 +1,16 @@ # Template file for 'kio-gdrive' pkgname=kio-gdrive -version=20.12.3 +version=21.04.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules intltool pkg-config qt5-qmake qt5-host-tools kcoreaddons libaccounts-qt5-devel kdoctools" -makedepends="libaccounts-qt5-devel kaccounts-integration-devel kparts-devel libkgapi-devel" +makedepends="libaccounts-qt5-devel kaccounts-integration-devel kparts-devel + libkgapi-devel purpose-devel" depends="kaccounts-providers" short_desc="KIO slave that enables access and edit Google Drive files" maintainer="Piotr Wójcik " license="GPL-2.0-or-later" homepage="https://community.kde.org/KIO_GDrive" distfiles="${KDE_SITE}/release-service/${version}/src/kio-gdrive-${version}.tar.xz" -checksum=4569cc07681aa88a81bda7923c795916cc6d1578859e11f0bb336699db8f7b70 +checksum=506f79cf2d4a86f5ce0e3905c1de481ba8558ac865f50bd1a347aeef35183e5c From ee39b0b735386212a7c8ac5f7a4ad27b0b53d3e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Fri, 23 Apr 2021 23:21:10 +0200 Subject: [PATCH 140/152] kmag: update to 21.04.0. --- srcpkgs/kmag/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kmag/template b/srcpkgs/kmag/template index 80dd3ad29b1..66fa244199e 100644 --- a/srcpkgs/kmag/template +++ b/srcpkgs/kmag/template @@ -1,6 +1,6 @@ # Template file for 'kmag' pkgname=kmag -version=20.12.3 +version=21.04.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools @@ -11,4 +11,4 @@ maintainer="Piotr Wójcik " license="GPL-2.0-or-later" homepage="https://www.kde.org/applications/utilities/kmag/" distfiles="${KDE_SITE}/release-service/${version}/src/kmag-${version}.tar.xz" -checksum=32932eb791d76de88de93a04f71f1224c41f0e33eb87b84eeab55668a18961dc +checksum=1e0fcce98fe11cb2bae0a762fb382127f7f57a15ccdf2e496f8c977dd238dc1b From ae3af8638ca471c2b1242de84f25eddf42290ec5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Fri, 23 Apr 2021 23:21:10 +0200 Subject: [PATCH 141/152] kmix: update to 21.04.0. --- srcpkgs/kmix/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/kmix/template b/srcpkgs/kmix/template index 7d2aebd41a1..086f61de35b 100644 --- a/srcpkgs/kmix/template +++ b/srcpkgs/kmix/template @@ -1,11 +1,11 @@ # Template file for 'kmix' pkgname=kmix -version=20.12.3 +version=21.04.0 revision=1 build_style=cmake configure_args="-DSYSCONF_INSTALL_DIR=/etc -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson" hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools - kdoctools kcoreaddons gettext" + kdoctools kcoreaddons kconfig gettext" makedepends="plasma-framework-devel kinit-devel alsa-lib-devel pulseaudio-devel libcanberra-devel ksolid-devel" short_desc="KDE's mixer application" @@ -13,4 +13,4 @@ maintainer="Piotr Wójcik " license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-only" homepage="https://www.kde.org/applications/multimedia/kmix/" distfiles="${KDE_SITE}/release-service/${version}/src/kmix-${version}.tar.xz" -checksum=68f892958eec984685567ad36624084118b6dc5e7a4633733a6c3e6aea34ea17 +checksum=e29742d0618e704fc9593051527347eac8aaf209f90451180f17b279ebb24ce8 From 848abf137d5de7e4c490aab862556e11b59e64d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Fri, 23 Apr 2021 23:21:10 +0200 Subject: [PATCH 142/152] kolourpaint: update to 21.04.0. --- srcpkgs/kolourpaint/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kolourpaint/template b/srcpkgs/kolourpaint/template index 515eb300437..c2af4d68866 100644 --- a/srcpkgs/kolourpaint/template +++ b/srcpkgs/kolourpaint/template @@ -1,6 +1,6 @@ # Template file for 'kolourpaint' pkgname=kolourpaint -version=20.12.3 +version=21.04.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools @@ -11,7 +11,7 @@ maintainer="Piotr Wójcik " license="BSD-2-Clause, GPL-2.0-or-later, LGPL-2.1-only, GFDL-1.2-only" homepage="http://www.kolourpaint.org/" distfiles="${KDE_SITE}/release-service/${version}/src/kolourpaint-${version}.tar.xz" -checksum=2f947803698f8169891191cb6ff841d3e991f9ae7157469cf01f4af594bde93e +checksum=7c0fe6886e3432e29b986d9b7dd31da45dea35c566bc52b14a474c68b49ae176 post_install() { vlicense COPYING From 0f733aa8c2aa21f65c638cbb777f3ad32624b459 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Fri, 23 Apr 2021 23:21:10 +0200 Subject: [PATCH 143/152] kompare: update to 21.04.0. --- srcpkgs/kompare/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kompare/template b/srcpkgs/kompare/template index 3178f0531cf..35d74c21175 100644 --- a/srcpkgs/kompare/template +++ b/srcpkgs/kompare/template @@ -1,6 +1,6 @@ # Template file for 'kompare' pkgname=kompare -version=20.12.3 +version=21.04.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools @@ -11,4 +11,4 @@ maintainer="Piotr Wójcik " license="GPL-2.0-only, GFDL-1.2-only" homepage="https://www.kde.org/applications/development/kompare/" distfiles="${KDE_SITE}/release-service/${version}/src/kompare-${version}.tar.xz" -checksum=7b57eddfa2c8f232252d4e981359fbe7844050aa2707d95044646d917967fb7f +checksum=cee3e22e4072e218302d245cb6f918dc7c6f2e8b5b0ffc81d177fde71e89e19e From 1107d8fb648337fe8002f5679f810648fde5d62e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Fri, 23 Apr 2021 23:21:10 +0200 Subject: [PATCH 144/152] kruler: update to 21.04.0. --- srcpkgs/kruler/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kruler/template b/srcpkgs/kruler/template index 571083d96a7..9fce375f556 100644 --- a/srcpkgs/kruler/template +++ b/srcpkgs/kruler/template @@ -1,6 +1,6 @@ # Template file for 'kruler' pkgname=kruler -version=20.12.3 +version=21.04.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools @@ -11,4 +11,4 @@ maintainer="Piotr Wójcik " license="GPL-2.0-or-later" homepage="https://www.kde.org/applications/graphics/kruler/" distfiles="${KDE_SITE}/release-service/${version}/src/kruler-${version}.tar.xz" -checksum=3f7152398f31f7315be5b504d9bb55e11358ab5cee8303e6b406d8f686836fdb +checksum=be7cbde21b33f072bc0efb71562483cdd0ac7ca2cd8c91c4f05dbc52ce9a377b From 30d2f520bc97f35b119acc9d4241cadf1d13bc64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Fri, 23 Apr 2021 23:21:10 +0200 Subject: [PATCH 145/152] ksystemlog: update to 21.04.0. --- srcpkgs/ksystemlog/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ksystemlog/template b/srcpkgs/ksystemlog/template index 3364a48d7be..2d43380567f 100644 --- a/srcpkgs/ksystemlog/template +++ b/srcpkgs/ksystemlog/template @@ -1,6 +1,6 @@ # Template file for 'ksystemlog' pkgname=ksystemlog -version=20.12.3 +version=21.04.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools @@ -11,7 +11,7 @@ maintainer="Piotr Wójcik " license="GPL-2.0-or-later" homepage="https://kde.org/applications/system/ksystemlog/" distfiles="${KDE_SITE}/release-service/${version}/src/ksystemlog-${version}.tar.xz" -checksum=1e3fa2a9e2c9f995ce8aea028ca68ba2487db7212ad298d9d2d7fa98710cf0eb +checksum=2474b8d13451e7c884250d7e29b808dbad1e90cacbb1df4786c890abdd445f19 pre_check() { export QT_QPA_PLATFORM=offscreen From 39989b5a3a74cbbe533cd53a598874cbaedf4c67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Fri, 23 Apr 2021 23:21:10 +0200 Subject: [PATCH 146/152] kteatime: update to 21.04.0. --- srcpkgs/kteatime/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kteatime/template b/srcpkgs/kteatime/template index 5e34401f5c8..02babcb5d65 100644 --- a/srcpkgs/kteatime/template +++ b/srcpkgs/kteatime/template @@ -1,6 +1,6 @@ # Template file for 'kteatime' pkgname=kteatime -version=20.12.3 +version=21.04.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools @@ -11,4 +11,4 @@ maintainer="Piotr Wójcik " license="GPL-2.0-or-later" homepage="https://www.kde.org/applications/games/kteatime/" distfiles="${KDE_SITE}/release-service/${version}/src/kteatime-${version}.tar.xz" -checksum=f016698e891688f9fbec934b3b66021e49aa05b699920171c57758273b622cf9 +checksum=c5ef71f467fe09ac499d989fcb3ed0544a046ab75664901d4d85fbaedb7a67fe From f075ac63936e73796a9a3298d4eab2c587bb1669 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Fri, 23 Apr 2021 23:21:10 +0200 Subject: [PATCH 147/152] kturtle: update to 21.04.0. --- srcpkgs/kturtle/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kturtle/template b/srcpkgs/kturtle/template index 272021b4c21..d139c8e7fde 100644 --- a/srcpkgs/kturtle/template +++ b/srcpkgs/kturtle/template @@ -1,6 +1,6 @@ # Template file for 'kturtle' pkgname=kturtle -version=20.12.3 +version=21.04.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools @@ -11,4 +11,4 @@ maintainer="Piotr Wójcik " license="GPL-2.0-or-later, GFDL-1.2-only" homepage="https://www.kde.org/applications/education/kturtle/" distfiles="${KDE_SITE}/release-service/${version}/src/kturtle-${version}.tar.xz" -checksum=e6bedbae45faf41158b2dab80229c69f8490698cb35afcb3507b9db2668ab89e +checksum=8d11d1999d0d7617189c0e47d6077ddd508922f5da0fa1f21f2da8e328cd0dd1 From 6cb1350b0bd1741ac01eb1dd9e0da441f146f016 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Fri, 23 Apr 2021 23:21:10 +0200 Subject: [PATCH 148/152] kwalletmanager: update to 21.04.0. --- srcpkgs/kwalletmanager/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kwalletmanager/template b/srcpkgs/kwalletmanager/template index 3264711f87d..32d5cdb4a78 100644 --- a/srcpkgs/kwalletmanager/template +++ b/srcpkgs/kwalletmanager/template @@ -1,6 +1,6 @@ # Template file for 'kwalletmanager' pkgname=kwalletmanager -version=20.12.3 +version=21.04.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules gettext kauth kdoctools pkg-config @@ -11,4 +11,4 @@ maintainer="Piotr Wójcik " license="GPL-2.0-only" homepage="https://kde.org/applications/system/org.kde.kwalletmanager5" distfiles="${KDE_SITE}/release-service/${version}/src/kwalletmanager-${version}.tar.xz" -checksum=995414a017735a0dedf19bffdc715cc0f526925b597bba9aa7f5d34e97059d9a +checksum=7323e7d548bec44ba53e77bf4e482024644529f25d2b339244bc4d6079eb07e6 From bdb8ceb174fa53b7b12d346923cf4dca3ff14871 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Fri, 23 Apr 2021 23:21:11 +0200 Subject: [PATCH 149/152] libkomparediff2: update to 21.04.0. --- srcpkgs/libkomparediff2/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libkomparediff2/template b/srcpkgs/libkomparediff2/template index 1c52bb2a33e..43a571b3f5a 100644 --- a/srcpkgs/libkomparediff2/template +++ b/srcpkgs/libkomparediff2/template @@ -1,6 +1,6 @@ # Template file for 'libkomparediff2' pkgname=libkomparediff2 -version=20.12.3 +version=21.04.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake" @@ -10,7 +10,7 @@ maintainer="Piotr Wójcik " license="GPL-2.0-or-later, LGPL-2.0-or-later" homepage="https://www.kde.org/" distfiles="${KDE_SITE}/release-service/${version}/src/libkomparediff2-${version}.tar.xz" -checksum=8386c5108fd761aa5b4b8dbd25f36b021c0bf3a42127e41916c8cd646b99c35f +checksum=f06c5e2599e43e8cb65cf2896f3736bbf162364e0f1785e6cb1066e8b552778e libkomparediff2-devel_package() { depends="${sourcepkg}>=${version}_${revision}" From ba8e795d579c76975b3e53e1491cdcb9e6309fa3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Fri, 23 Apr 2021 23:21:11 +0200 Subject: [PATCH 150/152] signon-kwallet-extension: update to 21.04.0. --- srcpkgs/signon-kwallet-extension/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/signon-kwallet-extension/template b/srcpkgs/signon-kwallet-extension/template index 0d25c1caada..898328cc37a 100644 --- a/srcpkgs/signon-kwallet-extension/template +++ b/srcpkgs/signon-kwallet-extension/template @@ -1,6 +1,6 @@ # Template file for 'signon-kwallet-extension' pkgname=signon-kwallet-extension -version=20.12.3 +version=21.04.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake" @@ -10,4 +10,4 @@ maintainer="Piotr Wójcik " license="GPL-2.0-only" homepage="https://cgit.kde.org/signon-kwallet-extension.git/" distfiles="${KDE_SITE}/release-service/${version}/src/signon-kwallet-extension-${version}.tar.xz" -checksum=d7b308fc800445cbcd4cec30a0997d8a10fcd23db69c8d49d6436aa3dedcf0a8 +checksum=b6982f9da2a449cf35e5119f5fe59a6a52f963e1cf7d8d244ba86523c9514a16 From 47c7d247b645d619101612bf9cc662ed99e5b110 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Fri, 23 Apr 2021 23:21:11 +0200 Subject: [PATCH 151/152] svgpart: update to 21.04.0. --- srcpkgs/svgpart/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/svgpart/template b/srcpkgs/svgpart/template index d14b83ea39f..93f39454a4e 100644 --- a/srcpkgs/svgpart/template +++ b/srcpkgs/svgpart/template @@ -1,6 +1,6 @@ # Template file for 'svgpart' pkgname=svgpart -version=20.12.3 +version=21.04.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake" @@ -10,4 +10,4 @@ maintainer="Piotr Wójcik " license="GPL-2.0-or-later" homepage="https://cgit.kde.org/svgpart.git" distfiles="${KDE_SITE}/release-service/${version}/src/svgpart-${version}.tar.xz" -checksum=f4b588f4b29178fd03a63c2b005837629bf9bbcf59f0a80fffa6a2354ff3b3d1 +checksum=b2c1f78265d865aa39019e74721e2534bd8cf0a9147e6a5cbce54e9268f70e32 From bebe9956b67cf378e69ea429bb9436daf07e7072 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Fri, 23 Apr 2021 23:21:11 +0200 Subject: [PATCH 152/152] yakuake: update to 21.04.0. --- srcpkgs/yakuake/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/yakuake/template b/srcpkgs/yakuake/template index 4fc0179ba8d..ff79d77ecda 100644 --- a/srcpkgs/yakuake/template +++ b/srcpkgs/yakuake/template @@ -1,6 +1,6 @@ # Template file for 'yakuake' pkgname=yakuake -version=20.12.3 +version=21.04.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules kconfig kcoreaddons qt5-host-tools qt5-qmake gettext" @@ -10,4 +10,4 @@ maintainer="Piotr Wójcik " license="GPL-2.0-only, GFDL-1.2-only" homepage="https://kde.org/applications/system/org.kde.yakuake" distfiles="${KDE_SITE}/release-service/${version}/src/yakuake-${version}.tar.xz" -checksum=7ddd1a47fdd3af67be16ae40182bea97f7c004448391ac52737d3e5f2e0b25f8 +checksum=6be41491ebdde6750e1560d674ddc5c8222767bb17db7530d906ac7609637cca