diff --git a/testing/hyprland/APKBUILD b/testing/hyprland/APKBUILD index 056d6004044..f235a5ecdb1 100644 --- a/testing/hyprland/APKBUILD +++ b/testing/hyprland/APKBUILD @@ -1,9 +1,9 @@ # Contributor: Zach DeCook # Maintainer: Zach DeCook pkgname=hyprland -pkgver=0.42.0 +pkgver=0.43.0 pkgrel=0 -_commit="9a09eac79b85c846e3a865a9078a3f8ff65a9259" +_commit="0f594732b063a90d44df8c5d402d658f27471dfe" pkgdesc="Independent, highly customizable, dynamic tiling Wayland compositor that doesn't sacrifice on its looks." url="https://hyprland.org" arch="all" @@ -11,7 +11,7 @@ license="BSD-3-Clause" source=" https://github.com/hyprwm/Hyprland/archive/v$pkgver/Hyprland-v$pkgver.tar.gz use-system-installed-udis86.patch - strncpy-include-cstring.patch + fix_time_t.patch " builddir="$srcdir/Hyprland-$pkgver" makedepends=" @@ -87,7 +87,7 @@ wallpapers() { } sha512sums=" -695d2f6ffc43e9e0620154c32e52a451492e3d093fe08d671273a56af219d38f7d061402997b6da53c95c15ab68caaa652fc8964bfaefd248f48ae62989ae544 Hyprland-v0.42.0.tar.gz +0e8851e1afde0a51b7a097dbff8315e713ad14e70559291a08a44915f90f6e1e16352ce475da4c4b0b1750463140e8a85d01a4dfd124f43216bde917f7d24bc4 Hyprland-v0.43.0.tar.gz d2f7b35552fa0a3e992b9050f7066d983b3b7c193a888018b2e0d6fa9e17fc3deff922fa3989d0bb79e8bd82df2bc16ff0c27a82759ad0ce2e72789506eb07db use-system-installed-udis86.patch -52ca7d010e39a90e1d8a9c6031f162de5b61d8a7fce6ed854b15e98dfa017f29ec3ac1850fcf70e9012f0d8bb6a7b8d1c54e3454dd9d03f8edf08c2ccee5650f strncpy-include-cstring.patch +f072a663a09c01b47e84177b9d4d22582a7acfb1834b7773a20112d9626eb068c63e7218c4ab0c85c8ce747d0cca511832f49238b7eba4c7d78253ef2f57aaaf fix_time_t.patch " diff --git a/testing/hyprland/fix_time_t.patch b/testing/hyprland/fix_time_t.patch new file mode 100644 index 00000000000..1dd8f4ca655 --- /dev/null +++ b/testing/hyprland/fix_time_t.patch @@ -0,0 +1,15 @@ +diff --git a/src/protocols/PresentationTime.cpp b/src/protocols/PresentationTime.cpp +index e1ff52cd..71f74cd5 100644 +--- a/src/protocols/PresentationTime.cpp ++++ b/src/protocols/PresentationTime.cpp +@@ -58,8 +58,8 @@ void CPresentationFeedback::sendQueued(SP data, timespe + if (reportedFlags & Aquamarine::IOutput::AQ_OUTPUT_PRESENT_HW_COMPLETION) + flags |= WP_PRESENTATION_FEEDBACK_KIND_HW_COMPLETION; + +- __time_t tv_sec = 0; +- if (sizeof(__time_t) > 4) ++ time_t tv_sec = 0; ++ if (sizeof(time_t) > 4) + tv_sec = when->tv_sec >> 32; + + if (data->wasPresented) diff --git a/testing/hyprland/strncpy-include-cstring.patch b/testing/hyprland/strncpy-include-cstring.patch deleted file mode 100644 index 87bd678aafc..00000000000 --- a/testing/hyprland/strncpy-include-cstring.patch +++ /dev/null @@ -1,56 +0,0 @@ -commit 2c93331ca20469582c57c8bcf834e2b0022cb598 -Author: Zach DeCook -Date: Fri Aug 9 08:53:44 2024 -0400 - - Include cstring whenever strncpy is used - - Fixes ppc64le build in alpine - -diff --git a/hyprctl/main.cpp b/hyprctl/main.cpp -index c86406fc..5d5113b8 100644 ---- a/hyprctl/main.cpp -+++ b/hyprctl/main.cpp -@@ -26,6 +26,7 @@ - #include - #include - #include -+#include - using namespace Hyprutils::String; - - #include "Strings.hpp" -diff --git a/src/helpers/SdDaemon.cpp b/src/helpers/SdDaemon.cpp -index 25e0ca3b..48c23e6b 100644 ---- a/src/helpers/SdDaemon.cpp -+++ b/src/helpers/SdDaemon.cpp -@@ -8,6 +8,7 @@ - #include - #include - #include -+#include - - namespace Systemd { - int SdBooted(void) { -diff --git a/src/managers/EventManager.cpp b/src/managers/EventManager.cpp -index 75c98e2a..079a6b68 100644 ---- a/src/managers/EventManager.cpp -+++ b/src/managers/EventManager.cpp -@@ -8,6 +8,7 @@ - #include - #include - #include -+#include - - CEventManager::CEventManager() { - m_iSocketFD = socket(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC | SOCK_NONBLOCK, 0); -diff --git a/src/xwayland/Server.cpp b/src/xwayland/Server.cpp -index cec582f6..200bec70 100644 ---- a/src/xwayland/Server.cpp -+++ b/src/xwayland/Server.cpp -@@ -19,6 +19,7 @@ - #include - #include - #include -+#include - - // TODO: cleanup - static bool set_cloexec(int fd, bool cloexec) {