summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--user/fish/APKBUILD9
-rw-r--r--user/fish/regex-use-different-wrong-escape.patch13
-rw-r--r--user/gst-plugins-bad/APKBUILD1
-rw-r--r--user/kdebugsettings/APKBUILD9
-rw-r--r--user/kdebugsettings/new-kmessagebox.patch18
-rw-r--r--user/krdc/APKBUILD9
-rw-r--r--user/krdc/libvncserver-modern-c.patch124
-rw-r--r--user/ktorrent/APKBUILD2
-rw-r--r--user/lxqt-session/APKBUILD9
-rw-r--r--user/lxqt-session/procps405.patch50
-rw-r--r--user/mosquitto/APKBUILD12
-rw-r--r--user/mosquitto/endian.patch34
-rw-r--r--user/mosquitto/no-persist_read_test.patch2
-rw-r--r--user/mosquitto/openrc-conf.patch4
-rw-r--r--user/qt-creator/APKBUILD4
-rw-r--r--user/qt-creator/qt515.patch11
-rw-r--r--user/sway/APKBUILD9
-rw-r--r--user/sway/libinput-new-api.patch46
18 files changed, 324 insertions, 42 deletions
diff --git a/user/fish/APKBUILD b/user/fish/APKBUILD
index 0544bd24b..a6753a0bf 100644
--- a/user/fish/APKBUILD
+++ b/user/fish/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house>
pkgname=fish
pkgver=3.7.1
-pkgrel=0
+pkgrel=1
pkgdesc="Modern interactive commandline shell"
url="http://www.fishshell.com"
arch="all"
@@ -13,7 +13,9 @@ checkdepends="py3-pexpect"
makedepends="cmake doxygen ncurses-dev pcre2-dev"
install="$pkgname.post-install $pkgname.post-upgrade $pkgname.pre-deinstall"
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-tools::noarch"
-source="https://github.com/fish-shell/fish-shell/releases/download/$pkgver/$pkgname-$pkgver.tar.xz"
+source="https://github.com/fish-shell/fish-shell/releases/download/$pkgver/$pkgname-$pkgver.tar.xz
+ regex-use-different-wrong-escape.patch
+ "
prepare() {
default_prepare
@@ -59,4 +61,5 @@ tools() {
mv "$pkgdir"/usr/share/$pkgname/tools "$subpkgdir"/usr/share/$pkgname
}
-sha512sums="f1605c400c5d5494f37b92dd386963dba7a3f3c401c369aaf3ff616d9d94836a0138d26074be24c92d94d9d7b625513800899c9431f5e21be0757eb0a0bfd3fe fish-3.7.1.tar.xz"
+sha512sums="f1605c400c5d5494f37b92dd386963dba7a3f3c401c369aaf3ff616d9d94836a0138d26074be24c92d94d9d7b625513800899c9431f5e21be0757eb0a0bfd3fe fish-3.7.1.tar.xz
+374a99c59d5fa8b1adabeb8532681f782f74d39ab7c8e200e2486c3dece15f4be1fca649dee7b2964681948c23023fae54b97e15e8f4a4a524bc6a6f5643999e regex-use-different-wrong-escape.patch"
diff --git a/user/fish/regex-use-different-wrong-escape.patch b/user/fish/regex-use-different-wrong-escape.patch
new file mode 100644
index 000000000..4e9bea5fd
--- /dev/null
+++ b/user/fish/regex-use-different-wrong-escape.patch
@@ -0,0 +1,13 @@
+diff -Nurd fish-3.7.1/src/fish_tests.cpp fish-3.7.1.new/src/fish_tests.cpp
+--- fish-3.7.1/src/fish_tests.cpp 2024-03-18 20:40:45.000000000 -0700
++++ fish-3.7.1.new/src/fish_tests.cpp 2025-08-11 02:17:54.184887104 -0700
+@@ -7009,7 +7009,7 @@
+
+- // Test with a bad escape; \b is unsupported.
++ // Test with a bad escape; \z is unsupported.
+ re_error_t error{};
+- res = re->substitute(subj, L"AAA\\bZZZ", sflags, 0, &error);
++ res = re->substitute(subj, L"AAA\\zZZZ", sflags, 0, &error);
+ do_test(!res.has_value());
+ do_test(error.code == -57 /* PCRE2_ERROR_BADREPESCAPE */);
+ do_test(error.message() == L"bad escape sequence in replacement string");
diff --git a/user/gst-plugins-bad/APKBUILD b/user/gst-plugins-bad/APKBUILD
index 4a6cef267..979336925 100644
--- a/user/gst-plugins-bad/APKBUILD
+++ b/user/gst-plugins-bad/APKBUILD
@@ -29,6 +29,7 @@ build() {
-Dnls=enabled \
-Dpackage-name="GStreamer Bad Plugins (${DISTRO_NAME:-Adélie Linux})" \
-Dpackage-origin="${DISTRO_URL:-https://www.adelielinux.org/}" \
+ -Dqsv=disabled \
build
ninja -C build
}
diff --git a/user/kdebugsettings/APKBUILD b/user/kdebugsettings/APKBUILD
index bb267bf33..bd1df3813 100644
--- a/user/kdebugsettings/APKBUILD
+++ b/user/kdebugsettings/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kdebugsettings
pkgver=22.04.2
-pkgrel=0
+pkgrel=1
pkgdesc="Set KDE debug settings"
url="https://kde.org/applications/development/org.kde.kdebugsettings"
arch="all"
@@ -12,7 +12,9 @@ makedepends="qt5-qtbase-dev cmake extra-cmake-modules kcompletion-dev
kconfig-dev kcoreaddons-dev kdbusaddons-dev ki18n-dev kitemviews-dev
kwidgetsaddons-dev"
subpackages="$pkgname-lang"
-source="https://download.kde.org/stable/release-service/$pkgver/src/kdebugsettings-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/kdebugsettings-$pkgver.tar.xz
+ new-kmessagebox.patch
+ "
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -38,4 +40,5 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="5fff45b54253396760cfc9b9ded0a242afaeafb17fc6e61c39ab433ec6f877d105491a8a313298819273bc54797b78993a0003867ed20905fce53431a4799fde kdebugsettings-22.04.2.tar.xz"
+sha512sums="5fff45b54253396760cfc9b9ded0a242afaeafb17fc6e61c39ab433ec6f877d105491a8a313298819273bc54797b78993a0003867ed20905fce53431a4799fde kdebugsettings-22.04.2.tar.xz
+a566ca424fc748ea0e61448de6c5676e349e055cbfb599e900fa0236d8e5e9efd916765d95ae45825560cbe1d547a1dd919bee25c2bf73c1ca984389c133d0ac new-kmessagebox.patch"
diff --git a/user/kdebugsettings/new-kmessagebox.patch b/user/kdebugsettings/new-kmessagebox.patch
new file mode 100644
index 000000000..957590476
--- /dev/null
+++ b/user/kdebugsettings/new-kmessagebox.patch
@@ -0,0 +1,18 @@
+KMessageBox doesn't support warningYesNo any more.
+
+This is a somewhat backport of upstream commit babc1c0a08[^1], but
+without the ifdef chicanery since we know we are using 5.100+.
+
+[^1]: https://invent.kde.org/utilities/kdebugsettings/-/commit/babc1c0a080b171aa0e44ae16e231b77b2e6500c
+
+--- kdebugsettings-22.04.2/src/customdebugsettingspage.cpp.old 2022-06-04 08:29:53.000000000 +0000
++++ kdebugsettings-22.04.2/src/customdebugsettingspage.cpp 2025-08-12 08:28:08.136276098 +0000
+@@ -182,7 +182,7 @@
+ }
+ const QString str = i18np("Do you want to remove this rule?", "Do you want to remove these %1 rules?", lst.count());
+
+- if (KMessageBox::No == KMessageBox::warningYesNo(this, str)) {
++ if (KMessageBox::ButtonCode::SecondaryAction == KMessageBox::warningTwoActions(this, str, i18n("Remove Rule"), KStandardGuiItem::remove(), KStandardGuiItem::cancel())) {
+ return;
+ }
+ for (int i = 0; i < lst.count(); ++i) {
diff --git a/user/krdc/APKBUILD b/user/krdc/APKBUILD
index b49bd1056..249d99c72 100644
--- a/user/krdc/APKBUILD
+++ b/user/krdc/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=krdc
pkgver=22.04.2
-pkgrel=0
+pkgrel=1
pkgdesc="View and control remote desktops (VNC)"
url="https://www.kde.org/applications/internet/krdc/"
arch="all"
@@ -14,7 +14,9 @@ makedepends="cmake extra-cmake-modules kcmutils-dev kdnssd-dev kiconthemes-dev
kcompletion-dev kwallet-dev kwidgetsaddons-dev knotifyconfig-dev
libvncserver-dev $depends_dev"
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/release-service/$pkgver/src/krdc-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/krdc-$pkgver.tar.xz
+ libvncserver-modern-c.patch
+ "
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -40,4 +42,5 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="56e87131310708d81de044240917f6afa6d332209ef0468f73b944f3b5781e27b9adbb1b9bdde735d8a9aa5adf73f0c7142f37716b84e59307b39a31872db3fb krdc-22.04.2.tar.xz"
+sha512sums="56e87131310708d81de044240917f6afa6d332209ef0468f73b944f3b5781e27b9adbb1b9bdde735d8a9aa5adf73f0c7142f37716b84e59307b39a31872db3fb krdc-22.04.2.tar.xz
+7a9d01154b3eafec3d0d5f2aa93cf0608478e2e63c0b566ca7113d6f522f91c45b2264b05c190af5c10051ce47957b32684f2ab95fedd3c6a43d9c2da406a16a libvncserver-modern-c.patch"
diff --git a/user/krdc/libvncserver-modern-c.patch b/user/krdc/libvncserver-modern-c.patch
new file mode 100644
index 000000000..d68ee1e17
--- /dev/null
+++ b/user/krdc/libvncserver-modern-c.patch
@@ -0,0 +1,124 @@
+Needed for newer GCC.
+
+From 20c8099d34fc495784b360af131195c851c116f8 Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Thu, 9 May 2024 16:53:56 +0200
+Subject: [PATCH] Use PkgConfig to find vncclient
+
+This is more robust than the custom find module
+---
+ CMakeLists.txt | 9 ++----
+ cmake/modules/FindLibVNCServer.cmake | 48 ----------------------------
+ vnc/CMakeLists.txt | 7 +---
+ vnc/qtonly/CMakeLists.txt | 12 ++-----
+ 4 files changed, 6 insertions(+), 70 deletions(-)
+ delete mode 100644 cmake/modules/FindLibVNCServer.cmake
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c1318839..d5b6dd25 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -72,13 +72,8 @@ set(CMAKE_CXX_STANDARD 20)
+ add_subdirectory(core)
+
+ if(WITH_VNC)
+- find_package(LibVNCServer)
+- set_package_properties(LibVNCServer PROPERTIES
+- DESCRIPTION "VNC server / client library"
+- URL "http://libvncserver.sourceforge.net/"
+- PURPOSE "Needed to build VNC client support in KRDC"
+- TYPE REQUIRED
+- )
++ find_package(PkgConfig REQUIRED)
++ pkg_check_modules(VNCCLIENT libvncclient REQUIRED IMPORTED_TARGET)
+
+ find_package(LibSSH)
+ set_package_properties(LibSSH PROPERTIES
+diff --git a/cmake/modules/FindLibVNCServer.cmake b/cmake/modules/FindLibVNCServer.cmake
+deleted file mode 100644
+index f6634b6e..00000000
+--- a/cmake/modules/FindLibVNCServer.cmake
++++ /dev/null
+@@ -1,48 +0,0 @@
+-# cmake macro to test LIBVNCSERVER LIB
+-
+-# SPDX-FileCopyrightText: 2006 Alessandro Praduroux <pradu@pradu.it>
+-# SPDX-FileCopyrightText: 2007 Urs Wolfer <uwolfer@kde.org>
+-#
+-# SPDX-License-Identifier: BSD-3-Clause
+-
+-IF (LIBVNCSERVER_INCLUDE_DIR AND LIBVNCSERVER_LIBRARIES)
+- # Already in cache, be silent
+- SET(LIBVNCSERVER_FIND_QUIETLY TRUE)
+-ENDIF (LIBVNCSERVER_INCLUDE_DIR AND LIBVNCSERVER_LIBRARIES)
+-
+-FIND_PATH(LIBVNCSERVER_INCLUDE_DIR rfb/rfb.h)
+-
+-FIND_LIBRARY(LIBVNCSERVER_LIBRARIES NAMES vncserver libvncserver)
+-
+-# libvncserver and libvncclient are in the same package, so it does
+-# not make sense to add a new cmake script for finding libvncclient.
+-# instead just find the libvncclient also in this file.
+-FIND_PATH(LIBVNCCLIENT_INCLUDE_DIR rfb/rfbclient.h)
+-FIND_LIBRARY(LIBVNCCLIENT_LIBRARIES NAMES vncclient libvncclient)
+-
+-IF (LIBVNCSERVER_INCLUDE_DIR AND LIBVNCSERVER_LIBRARIES)
+- SET(CMAKE_REQUIRED_INCLUDES "${LIBVNCSERVER_INCLUDE_DIR}" "${CMAKE_REQUIRED_INCLUDES}")
+- SET(_TEST_SOURCE_CODE "
+-#include <rfb/rfbclient.h>
+-
+-int main()
+-{
+- rfbClient* tmp;
+- tmp->GotXCutText;
+- return 0;
+-}
+- ")
+- CHECK_CXX_SOURCE_COMPILES("${_TEST_SOURCE_CODE}" LIBVNCSERVER_FOUND)
+-ENDIF (LIBVNCSERVER_INCLUDE_DIR AND LIBVNCSERVER_LIBRARIES)
+-
+-IF (LIBVNCSERVER_FOUND)
+- IF (NOT LIBVNCSERVER_FIND_QUIETLY)
+- MESSAGE(STATUS "Found LibVNCServer: ${LIBVNCSERVER_LIBRARIES}")
+- ENDIF (NOT LIBVNCSERVER_FIND_QUIETLY)
+-ELSE (LIBVNCSERVER_FOUND)
+- IF (LIBVNCSERVER_FIND_REQUIRED)
+- MESSAGE(FATAL_ERROR "Could NOT find acceptable version of LibVNCServer (version 0.9 or later required).")
+- ENDIF (LIBVNCSERVER_FIND_REQUIRED)
+-ENDIF (LIBVNCSERVER_FOUND)
+-
+-MARK_AS_ADVANCED(LIBVNCSERVER_INCLUDE_DIR LIBVNCSERVER_LIBRARIES)
+diff --git a/vnc/CMakeLists.txt b/vnc/CMakeLists.txt
+index 9bc06626..edd67f0d 100644
+--- a/vnc/CMakeLists.txt
++++ b/vnc/CMakeLists.txt
+@@ -19,17 +19,13 @@ ki18n_wrap_ui(krdc_vncplugin
+ vncpreferences.ui
+ )
+
+-target_include_directories(krdc_vncplugin PRIVATE
+- ${LIBVNCCLIENT_INCLUDE_DIR}
+-)
+-
+ target_link_libraries(krdc_vncplugin
+ Qt::Core
+ KF5::ConfigCore
+ KF5::CoreAddons
+ KF5::XmlGui
+ Qt::Gui
+- ${LIBVNCCLIENT_LIBRARIES}
++ PkgConfig::VNCCLIENT
+ krdccore
+ )
+
+@@ -58,7 +54,6 @@ target_link_libraries(kcm_krdc_vncplugin
+ KF5::CoreAddons
+ KF5::XmlGui
+ Qt::Gui
+- ${LIBVNCCLIENT_LIBRARIES}
+ krdccore
+ )
+
+--
+GitLab
+
diff --git a/user/ktorrent/APKBUILD b/user/ktorrent/APKBUILD
index ded9908b6..64da9e8a7 100644
--- a/user/ktorrent/APKBUILD
+++ b/user/ktorrent/APKBUILD
@@ -14,7 +14,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtscript-dev kio-dev
kdbusaddons-dev kiconthemes-dev knotifications-dev knotifyconfig-dev
kcmutils-dev kparts-dev kservice-dev solid-dev kwidgetsaddons-dev
kwindowsystem-dev kxmlgui-dev libktorrent-dev taglib-dev kplotting-dev
- kdnssd-dev plasma-workspace-dev"
+ kdnssd-dev libkworkspace-dev"
subpackages="$pkgname-doc $pkgname-lang"
source="https://download.kde.org/stable/release-service/$pkgver/src/ktorrent-$pkgver.tar.xz"
diff --git a/user/lxqt-session/APKBUILD b/user/lxqt-session/APKBUILD
index 6defb32e8..fbc0b5a1a 100644
--- a/user/lxqt-session/APKBUILD
+++ b/user/lxqt-session/APKBUILD
@@ -3,7 +3,7 @@
pkgname=lxqt-session
pkgver=1.4.0
_lxqt=0.13.0
-pkgrel=0
+pkgrel=1
pkgdesc="Session management utilities for LXQt"
url="https://lxqt.github.io/"
arch="all"
@@ -13,7 +13,9 @@ depends="qtxdg-tools xdg-user-dirs"
makedepends="cmake extra-cmake-modules lxqt-build-tools>=$_lxqt eudev-dev
liblxqt-dev>=${pkgver%.*} procps-dev qt5-qttools-dev kwindowsystem-dev"
subpackages="$pkgname-doc"
-source="https://github.com/lxde/lxqt-session/releases/download/$pkgver/lxqt-session-$pkgver.tar.xz"
+source="https://github.com/lxde/lxqt-session/releases/download/$pkgver/lxqt-session-$pkgver.tar.xz
+ procps405.patch
+ "
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -40,4 +42,5 @@ package() {
rm "$pkgdir"/usr/share/man/man1/start*
}
-sha512sums="4f5731969582222eef9d0d2f2b37c4a160c3c6469f3a16cb4b1804ba76a9320d36b0ed91cada6ee905339ed8cfbd443851804086d978424c4d79045cc90e1629 lxqt-session-1.4.0.tar.xz"
+sha512sums="4f5731969582222eef9d0d2f2b37c4a160c3c6469f3a16cb4b1804ba76a9320d36b0ed91cada6ee905339ed8cfbd443851804086d978424c4d79045cc90e1629 lxqt-session-1.4.0.tar.xz
+d5957c971414c64e5ce80b8b9a9e9f0811f7ac9ffdf3f8a017f4bd7723746771b717e58dfb2bb13df836531fb787b96383bb6aa0c076cf5f856fbf028bfe452d procps405.patch"
diff --git a/user/lxqt-session/procps405.patch b/user/lxqt-session/procps405.patch
new file mode 100644
index 000000000..9e49ecc9e
--- /dev/null
+++ b/user/lxqt-session/procps405.patch
@@ -0,0 +1,50 @@
+From 4e5d62200fceb75a7867005c29103aa502733270 Mon Sep 17 00:00:00 2001
+From: Christian Hesse <mail@eworm.de>
+Date: Mon, 23 Dec 2024 16:13:31 +0100
+Subject: [PATCH] Adopt API changes for procps-ng 4.0.5 (#565)
+
+The 'info' parameter was dropped in 'VAL' macros.
+
+https://gitlab.com/procps-ng/procps/-/commit/967fdcfb06e20aad0f31073474cb94545c9bdea5
+---
+ CMakeLists.txt | 3 +++
+ lxqt-session/src/procreaper.cpp | 8 ++++++++
+ 2 files changed, 11 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 932f7894..855a35f9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -39,6 +39,9 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
+ message(STATUS "Using PROCPS -> ${PROCPS_MODULE_NAME} v${PROCPS_VERSION}")
+ if (PROCPS_VERSION VERSION_GREATER_EQUAL 4.0.0)
+ add_definitions("-DUSING_LIBPROC2")
++ if (PROCPS_VERSION VERSION_GREATER_EQUAL 4.0.5)
++ add_definitions("-DUSING_LIBPROC2_1")
++ endif()
+ endif()
+ endif()
+
+diff --git a/lxqt-session/src/procreaper.cpp b/lxqt-session/src/procreaper.cpp
+index ea614530..8069c606 100644
+--- a/lxqt-session/src/procreaper.cpp
++++ b/lxqt-session/src/procreaper.cpp
+@@ -121,10 +121,18 @@ void ProcReaper::stop(const std::set<int64_t> & excludedPids)
+ pids_stack * stack = nullptr;
+ while ((stack = procps_pids_get(info, PIDS_FETCH_TASKS_ONLY)))
+ {
++# if defined(USING_LIBPROC2_1)
++ const int ppid = PIDS_VAL(rel_ppid, s_int, stack);
++# else
+ const int ppid = PIDS_VAL(rel_ppid, s_int, stack, info);
++# endif
+ if (ppid == my_pid)
+ {
++# if defined(USING_LIBPROC2_1)
++ const int tgid = PIDS_VAL(rel_tgid, s_int, stack);
++# else
+ const int tgid = PIDS_VAL(rel_tgid, s_int, stack, info);
++# endif
+ children.push_back(tgid);
+ }
+ }
diff --git a/user/mosquitto/APKBUILD b/user/mosquitto/APKBUILD
index 4b7f6f06b..7df72e307 100644
--- a/user/mosquitto/APKBUILD
+++ b/user/mosquitto/APKBUILD
@@ -2,14 +2,14 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Max Rees <maxcrees@me.com>
pkgname=mosquitto
-pkgver=2.0.15
+pkgver=2.0.22
pkgrel=0
pkgdesc="An Open Source MQTT Broker"
url="https://mosquitto.org/"
arch="all"
license="EPL-1.0 AND EDL-1.0 AND MIT AND BSD-3-Clause"
depends=""
-checkdepends="python3 ca-certificates cunit-dev"
+checkdepends="python3 ca-certificates cunit-dev py3-psutil"
makedepends="c-ares-dev openssl-dev util-linux-dev cjson-dev"
subpackages="$pkgname-dev $pkgname-doc $pkgname-libs $pkgname-openrc
$pkgname-clients"
@@ -91,8 +91,8 @@ clients() {
mv "$pkgdir"/usr/bin/mosquitto_[ps]ub "$subpkgdir"/usr/bin/
}
-sha512sums="8a0c58222ea0b9304e7f096f6d13965478072baf1d1c9bc931b32a33f5ea8196c2dd54bde8d83fec7ed9cd413cb5fb115ce0a6701ca20664df52fdd7ca63ddaf mosquitto-2.0.15.tar.gz
+sha512sums="5aae399b308d8262a758a72064c613bfd6930e1a54f34939e30454d988c65c9d7c4c139ed70a016baa1264a0100a0c842c00e843ffe3ef83f90be440403e7482 mosquitto-2.0.22.tar.gz
681fddc737b3ef3e6c052f0c854a730df290352640a18a63e23ef83d14c425558aff87805d1eb95e44de101b5df48872173af9f5414464ffa8cf727ea2c0491e mosquitto.initd
-b07f9bec2751ab32c43f53e74d8fca18dbf2d7ce7f8fab562dbcf75de19609ba6219d735ac504697404e0ed36613a14074e3a19e735297195877798f778d337a openrc-conf.patch
-89f738f77732500bc2aff3086b891c1e537510e756baf0ac92c1462c2ef7e47cdc62536d90174e6b6c80637199e463609723f9915999c0b95ce878ebbed739a1 endian.patch
-b173f11e898bf2d882b7d833f99c863dc1fd14ee6f55484c29dafd067fa1af27ab85864df674c0a042547c5c132b80123d159f10e7bdab316a0292461b91fafd no-persist_read_test.patch"
+d564b5887a242257de56df1f6d1cad03f3627ee79a56e892dd35cb305262c83b9518a1998f8787a2459f81a97cdf8606c1a1a0f184513158f6378d3950d266cb openrc-conf.patch
+1e4687d5739af04ca1f952cb83febf7a7fbc9bbe6d0dcff8822e268c423ae17be4a917e3e88cd7730bd8a2e4c04ddf15b95f65f89352ee8dd1ab5a8db41b9eb9 endian.patch
+5c920f478a4bce31d442428349d69cda35939050332801264a911a31066489472c63959241395599b5a91ae7da70655c175cc2fe5a75d436da63074a7bb38ecd no-persist_read_test.patch"
diff --git a/user/mosquitto/endian.patch b/user/mosquitto/endian.patch
index 2efd1111d..9a19748ad 100644
--- a/user/mosquitto/endian.patch
+++ b/user/mosquitto/endian.patch
@@ -40,12 +40,12 @@ index 7460c309..701d88d9 100644
@@ -24,6 +24,7 @@ Contributors:
#include <arpa/inet.h>
#endif
- #include <assert.h>
+#include <endian.h>
#include <errno.h>
#include <fcntl.h>
#include <stdio.h>
-@@ -108,6 +109,7 @@ int persist__chunk_client_msg_read_v234(FILE *db_fptr, struct P_client_msg *chun
+ #include <string.h>
+@@ -107,6 +108,7 @@ int persist__chunk_client_msg_read_v234(FILE *db_fptr, struct P_client_msg *chun
}
read_e(db_fptr, &chunk->F.store_id, sizeof(dbid_t));
@@ -53,7 +53,7 @@ index 7460c309..701d88d9 100644
read_e(db_fptr, &i16temp, sizeof(uint16_t));
chunk->F.mid = ntohs(i16temp);
-@@ -137,6 +139,7 @@ int persist__chunk_msg_store_read_v234(FILE *db_fptr, struct P_msg_store *chunk,
+@@ -136,6 +138,7 @@ int persist__chunk_msg_store_read_v234(FILE *db_fptr, struct P_msg_store *chunk,
char *err;
read_e(db_fptr, &chunk->F.store_id, sizeof(dbid_t));
@@ -61,7 +61,7 @@ index 7460c309..701d88d9 100644
rc = persist__read_string(db_fptr, &chunk->source.id);
if(rc){
-@@ -205,7 +208,7 @@ int persist__chunk_retain_read_v234(FILE *db_fptr, struct P_retain *chunk)
+@@ -204,7 +207,7 @@ int persist__chunk_retain_read_v234(FILE *db_fptr, struct P_retain *chunk)
log__printf(NULL, MOSQ_LOG_ERR, "Error: %s.", err);
return 1;
}
@@ -77,12 +77,12 @@ index abc9a580..12d3e801 100644
@@ -24,6 +24,7 @@ Contributors:
#include <arpa/inet.h>
#endif
- #include <assert.h>
+#include <endian.h>
#include <errno.h>
#include <fcntl.h>
#include <stdio.h>
-@@ -116,6 +117,7 @@ int persist__chunk_client_msg_read_v56(FILE *db_fptr, struct P_client_msg *chunk
+ #include <string.h>
+@@ -115,6 +116,7 @@ int persist__chunk_client_msg_read_v56(FILE *db_fptr, struct P_client_msg *chunk
read_e(db_fptr, &chunk->F, sizeof(struct PF_client_msg));
chunk->F.mid = ntohs(chunk->F.mid);
chunk->F.id_len = ntohs(chunk->F.id_len);
@@ -90,7 +90,7 @@ index abc9a580..12d3e801 100644
length -= (uint32_t)(sizeof(struct PF_client_msg) + chunk->F.id_len);
-@@ -165,6 +167,7 @@ int persist__chunk_msg_store_read_v56(FILE *db_fptr, struct P_msg_store *chunk,
+@@ -164,6 +166,7 @@ int persist__chunk_msg_store_read_v56(FILE *db_fptr, struct P_msg_store *chunk,
chunk->F.source_username_len = ntohs(chunk->F.source_username_len);
chunk->F.topic_len = ntohs(chunk->F.topic_len);
chunk->F.source_port = ntohs(chunk->F.source_port);
@@ -98,7 +98,7 @@ index abc9a580..12d3e801 100644
length -= (uint32_t)(sizeof(struct PF_msg_store) + chunk->F.payloadlen + chunk->F.source_id_len + chunk->F.source_username_len + chunk->F.topic_len);
-@@ -246,6 +249,7 @@ int persist__chunk_retain_read_v56(FILE *db_fptr, struct P_retain *chunk)
+@@ -245,6 +248,7 @@ int persist__chunk_retain_read_v56(FILE *db_fptr, struct P_retain *chunk)
log__printf(NULL, MOSQ_LOG_ERR, "Error: %s.", strerror(errno));
return 1;
}
@@ -110,16 +110,16 @@ diff --git a/src/persist_write.c b/src/persist_write.c
index ccfbc29c..93a32639 100644
--- a/src/persist_write.c
+++ b/src/persist_write.c
-@@ -273,7 +273,7 @@ static int persist__retain_save(FILE *db_fptr, struct mosquitto__retainhier *nod
-
- if(node->retained && strncmp(node->retained->topic, "$SYS", 4)){
+@@ -291,7 +291,7 @@ static int persist__retain_save(FILE *db_fptr, struct mosquitto__retainhier *nod
/* Don't save $SYS messages. */
+ memset(&retain_chunk, 0, sizeof(struct P_retain));
+
- retain_chunk.F.store_id = node->retained->db_id;
+ retain_chunk.F.store_id = htole64(node->retained->db_id);
rc = persist__chunk_retain_write_v6(db_fptr, &retain_chunk);
if(rc){
return rc;
-@@ -367,7 +367,7 @@ int persist__backup(bool shutdown)
+@@ -385,7 +385,7 @@ int persist__backup(bool shutdown)
write_e(db_fptr, &db_version_w, sizeof(uint32_t));
memset(&cfg_chunk, 0, sizeof(struct PF_cfg));
@@ -135,12 +135,12 @@ index 8c9f6c34..b9fb5a8e 100644
@@ -24,6 +24,7 @@ Contributors:
#include <arpa/inet.h>
#endif
- #include <assert.h>
+#include <endian.h>
#include <errno.h>
#include <fcntl.h>
#include <stdio.h>
-@@ -100,6 +101,7 @@ int persist__chunk_client_msg_write_v6(FILE *db_fptr, struct P_client_msg *chunk
+ #include <string.h>
+@@ -99,6 +100,7 @@ int persist__chunk_client_msg_write_v6(FILE *db_fptr, struct P_client_msg *chunk
chunk->F.mid = htons(chunk->F.mid);
chunk->F.id_len = htons(chunk->F.id_len);
@@ -148,7 +148,7 @@ index 8c9f6c34..b9fb5a8e 100644
header.chunk = htonl(DB_CHUNK_CLIENT_MSG);
header.length = htonl((uint32_t)sizeof(struct PF_client_msg) + id_len + proplen);
-@@ -149,6 +151,7 @@ int persist__chunk_message_store_write_v6(FILE *db_fptr, struct P_msg_store *chu
+@@ -148,6 +150,7 @@ int persist__chunk_message_store_write_v6(FILE *db_fptr, struct P_msg_store *chu
proplen += property__get_remaining_length(chunk->properties);
}
@@ -156,7 +156,7 @@ index 8c9f6c34..b9fb5a8e 100644
chunk->F.payloadlen = htonl(chunk->F.payloadlen);
chunk->F.source_mid = htons(chunk->F.source_mid);
chunk->F.source_id_len = htons(chunk->F.source_id_len);
-@@ -206,6 +209,7 @@ int persist__chunk_retain_write_v6(FILE *db_fptr, struct P_retain *chunk)
+@@ -205,6 +208,7 @@ int persist__chunk_retain_write_v6(FILE *db_fptr, struct P_retain *chunk)
header.chunk = htonl(DB_CHUNK_RETAIN);
header.length = htonl((uint32_t)sizeof(struct PF_retain));
@@ -167,3 +167,5 @@ index 8c9f6c34..b9fb5a8e 100644
--
2.35.1
+--- mosquitto-2.0.22/src/persist_write.c.old 2025-08-12 10:10:49.824308365 +0000
++++ mosquitto-2.0.22/src/persist_write.c 2025-08-12 10:11:42.938672118 +0000
diff --git a/user/mosquitto/no-persist_read_test.patch b/user/mosquitto/no-persist_read_test.patch
index 6227e0487..3596ed855 100644
--- a/user/mosquitto/no-persist_read_test.patch
+++ b/user/mosquitto/no-persist_read_test.patch
@@ -5,7 +5,7 @@ We disable these tests for now.
--- mosquitto-2.0.14/test/unit/Makefile.old 2021-11-16 18:28:35.000000000 -0600
+++ mosquitto-2.0.14/test/unit/Makefile 2022-11-22 00:37:32.237485238 -0600
-@@ -174,7 +174,5 @@
+@@ -184,7 +184,5 @@
test-broker : build
./bridge_topic_test
diff --git a/user/mosquitto/openrc-conf.patch b/user/mosquitto/openrc-conf.patch
index d1c5ee04b..095aa1c70 100644
--- a/user/mosquitto/openrc-conf.patch
+++ b/user/mosquitto/openrc-conf.patch
@@ -1,6 +1,6 @@
--- mosquitto-1.6.4/mosquitto.conf 2019-08-01 14:50:01.000000000 -0500
+++ mosquitto-1.6.4/mosquitto.conf 2019-08-27 18:16:52.290542736 -0500
-@@ -158,7 +158,7 @@
+@@ -167,7 +167,7 @@
# This should be set to /var/run/mosquitto.pid if mosquitto is
# being run automatically on boot with an init script and
# start-stop-daemon or similar.
@@ -9,7 +9,7 @@
# Set to true to queue messages with QoS 0 when a persistent client is
# disconnected. These messages are included in the limit imposed by
-@@ -585,7 +585,7 @@
+@@ -469,7 +469,7 @@
# Note that if the broker is running as a Windows service it will default to
# "log_dest none" and neither stdout nor stderr logging is available.
# Use "log_dest none" if you wish to disable logging.
diff --git a/user/qt-creator/APKBUILD b/user/qt-creator/APKBUILD
index 32717276c..bc4810a70 100644
--- a/user/qt-creator/APKBUILD
+++ b/user/qt-creator/APKBUILD
@@ -24,6 +24,7 @@ source="https://download.qt.io/official_releases/qtcreator/${pkgver%.*}/$pkgver/
llvm19.patch
malloc_trim.patch
cstdint.patch
+ qt515.patch
"
ldpath="/usr/lib/qtcreator"
builddir="$srcdir/$pkgname-opensource-src-$pkgver"
@@ -48,4 +49,5 @@ be2a3e99e1a7b72d3b8d092edaffc60249efbbe27d5037cebba388d36f0d404e8d109489336c83f6
02d0ac36e4c9fd5682d45ef5f040f6ef11c25b3c9a0865cb8a1ef660dfb067a3dbeac1187246da79a506db6c24379b77a7d8510edcf10c9a56c6a9de1b507672 llvm18.patch
ce849abae28a3fd946b490e55cc44f4c19fe3ccf167e936c9e01b7c240c98b7f7af27336549ccbe18995fd2ae81366278a8345f54d3d87127232c06649af0e71 llvm19.patch
7fcb9b293daecc4c0f294d372507db9a6282479c4cf45999446193d9f35552db2532d47dedc9c5666a10855e20d0fe655f0ee0408abca8cc8ffbf121a230960f malloc_trim.patch
-7d7a739cf98c1bc4232d9d14334e3c3a319746db931aaad4d441c903351c56869015ce427e2098fbe930d56a2dd433b1869fbbf5a78f91c10a94f5a47a778ea0 cstdint.patch"
+7d7a739cf98c1bc4232d9d14334e3c3a319746db931aaad4d441c903351c56869015ce427e2098fbe930d56a2dd433b1869fbbf5a78f91c10a94f5a47a778ea0 cstdint.patch
+2fdd0e1400e8c8c56d6fc8836bf10a308e05469d280250e1e25ec65959f5c376b570015e5118653f401ee7dfdcd26fab72977db5a86d39f131da3a8528b9d747 qt515.patch"
diff --git a/user/qt-creator/qt515.patch b/user/qt-creator/qt515.patch
new file mode 100644
index 000000000..984879469
--- /dev/null
+++ b/user/qt-creator/qt515.patch
@@ -0,0 +1,11 @@
+--- qt-creator-opensource-src-4.15.2/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate_56.cpp.old 2021-07-13 02:12:55.000000000 +0000
++++ qt-creator-opensource-src-4.15.2/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate_56.cpp 2025-08-12 09:23:43.870540324 +0000
+@@ -153,7 +153,7 @@
+ const PropertyName &baseName,
+ QObjectList *inspectedObjects)
+ {
+- return QQuickDesignerSupportProperties::propertyNameListForWritableProperties(object, baseName, inspectedObjects);
++ return QQuickDesignerSupportProperties::propertyNameListForWritableProperties(object);
+ }
+
+ void tweakObjects(QObject *object)
diff --git a/user/sway/APKBUILD b/user/sway/APKBUILD
index 16a8b3992..6831a1044 100644
--- a/user/sway/APKBUILD
+++ b/user/sway/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house>
pkgname=sway
pkgver=1.10
-pkgrel=0
+pkgrel=1
pkgdesc="tiling Wayland compositor like i3"
url="https://swaywm.org"
arch="all"
@@ -12,7 +12,9 @@ makedepends="cairo-dev gdk-pixbuf-dev json-c-dev meson libevdev-dev
libinput-dev>=1.26.0 libxkbcommon>=1.5.0 pango-dev pcre2-dev scdoc
wayland-protocols wlroots-0.18-dev"
subpackages="$pkgname-doc"
-source="https://github.com/swaywm/sway/releases/download/$pkgver/sway-$pkgver.tar.gz"
+source="https://github.com/swaywm/sway/releases/download/$pkgver/sway-$pkgver.tar.gz
+ libinput-new-api.patch
+ "
build() {
meson setup \
@@ -34,4 +36,5 @@ package() {
DESTDIR="$pkgdir" meson install -C output
}
-sha512sums="f75a80506d2dcae722ea64c47fa423b9713bcfaa6541ffc353abd413238abb9ab7c88490d54e30ef09dc003215aa6a0005e5b425c9c943f982d5ff3c7cfad440 sway-1.10.tar.gz"
+sha512sums="f75a80506d2dcae722ea64c47fa423b9713bcfaa6541ffc353abd413238abb9ab7c88490d54e30ef09dc003215aa6a0005e5b425c9c943f982d5ff3c7cfad440 sway-1.10.tar.gz
+7fe9e2c293de5b158e9397ca0cc5192e2fe8f14b3f978927bdfe3c65c88ee67c3dd100d6ed066ca260ebc103ba76fed24a325821e67d7d6bc8c4273a4e42b116 libinput-new-api.patch"
diff --git a/user/sway/libinput-new-api.patch b/user/sway/libinput-new-api.patch
new file mode 100644
index 000000000..6938f9b3a
--- /dev/null
+++ b/user/sway/libinput-new-api.patch
@@ -0,0 +1,46 @@
+From e2409aa49611bee1e1b99033461bfab0a7550c48 Mon Sep 17 00:00:00 2001
+From: Simon Ser <contact@emersion.fr>
+Date: Wed, 20 Nov 2024 20:41:16 +0100
+Subject: [PATCH] ipc-json: handle LIBINPUT_CONFIG_DRAG_LOCK_ENABLED_STICKY
+
+New entry introduced in libinput 1.27.0.
+---
+ meson.build | 8 +++-----
+ sway/ipc-json.c | 5 +++++
+ 2 files changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 71e75fd9bc..9ce5723e78 100644
+--- a/meson.build
++++ b/meson.build
+@@ -109,11 +109,9 @@ conf_data.set10('HAVE_LIBSYSTEMD', sdbus.found() and sdbus.name() == 'libsystemd
+ conf_data.set10('HAVE_LIBELOGIND', sdbus.found() and sdbus.name() == 'libelogind')
+ conf_data.set10('HAVE_BASU', sdbus.found() and sdbus.name() == 'basu')
+ conf_data.set10('HAVE_TRAY', have_tray)
+-conf_data.set10('HAVE_LIBINPUT_CONFIG_ACCEL_PROFILE_CUSTOM', cc.has_header_symbol(
+- 'libinput.h',
+- 'LIBINPUT_CONFIG_ACCEL_PROFILE_CUSTOM',
+- dependencies: libinput,
+-))
++foreach sym : ['LIBINPUT_CONFIG_ACCEL_PROFILE_CUSTOM', 'LIBINPUT_CONFIG_DRAG_LOCK_ENABLED_STICKY']
++ conf_data.set10('HAVE_' + sym, cc.has_header_symbol('libinput.h', sym, dependencies: libinput))
++endforeach
+
+ scdoc = dependency('scdoc', version: '>=1.9.2', native: true, required: get_option('man-pages'))
+ if scdoc.found()
+diff --git a/sway/ipc-json.c b/sway/ipc-json.c
+index 571338a4f1..fc1df2ac64 100644
+--- a/sway/ipc-json.c
++++ b/sway/ipc-json.c
+@@ -931,6 +931,11 @@ static json_object *describe_libinput_device(struct libinput_device *device) {
+ case LIBINPUT_CONFIG_DRAG_LOCK_DISABLED:
+ drag_lock = "disabled";
+ break;
++#if HAVE_LIBINPUT_CONFIG_DRAG_LOCK_ENABLED_STICKY
++ case LIBINPUT_CONFIG_DRAG_LOCK_ENABLED_STICKY:
++ drag_lock = "enabled_sticky";
++ break;
++#endif
+ }
+ json_object_object_add(object, "tap_drag_lock",
+ json_object_new_string(drag_lock));
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-08-13 01:35:46 +0000