From 4d855b09979cdc52ffb59fd7a5ef3d8ca84cf965 Mon Sep 17 00:00:00 2001 From: zenobit Date: Tue, 8 Oct 2024 19:53:19 +0200 Subject: [PATCH] Revert "Update/v0.44.0" --- common/shlibs | 8 ++++---- srcpkgs/aquamarine/template | 4 ++-- srcpkgs/hyprcursor/patches/missing_include.patch | 10 ---------- srcpkgs/hyprcursor/template | 4 ++-- .../patches/revert-c++26-log-on-musl.patch | 16 ---------------- srcpkgs/hyprland/template | 4 ++-- srcpkgs/hyprlang/template | 4 ++-- srcpkgs/hyprpaper/template | 6 +++--- srcpkgs/hyprutils/template | 4 ++-- srcpkgs/hyprwayland-scanner/template | 4 ++-- srcpkgs/xdg-desktop-portal-hyprland/template | 8 ++------ 11 files changed, 21 insertions(+), 51 deletions(-) delete mode 100644 srcpkgs/hyprcursor/patches/missing_include.patch delete mode 100644 srcpkgs/hyprland/patches/revert-c++26-log-on-musl.patch diff --git a/common/shlibs b/common/shlibs index 18096c9..f687f35 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1,7 +1,7 @@ libsdbus-c++.so.1 sdbus-cpp-1.5.0_1 -libhyprlang.so.2 hyprlang-0.5.3_1 -libhyprcursor.so.0 hyprcursor-0.1.10_1 +libhyprlang.so.2 hyprlang-0.5.0_1 +libhyprcursor.so.0 hyprcursor-0.1.9_1 libtomlplusplus.so.3 tomlplusplus-3.4.0_1 -libhyprutils.so.1 hyprutils-0.2.3_1 -libaquamarine.so.3 aquamarine-0.4.1_1 +libhyprutils.so.1 hyprutils-0.2.1_1 +libaquamarine.so.2 aquamarine-0.3.0_1 diff --git a/srcpkgs/aquamarine/template b/srcpkgs/aquamarine/template index 6482866..479ec3c 100644 --- a/srcpkgs/aquamarine/template +++ b/srcpkgs/aquamarine/template @@ -1,6 +1,6 @@ # Template file for 'aquamarine' pkgname=aquamarine -version=0.4.1 +version=0.3.3 revision=1 build_style=cmake hostmakedepends="cmake pkgconf" @@ -11,5 +11,5 @@ license="LGPL-3.0-only" homepage="https://hyprland.org/hyprlang/index.html" changelog="https://github.com/hyprwm/aquamarine/releases" distfiles="https://github.com/hyprwm/aquamarine/archive/refs/tags/v${version}.tar.gz" -checksum=efbdd27204522823f58dc38110cf6f696d3e6f0dec02a96d6f0465592b45a979 +checksum=8785d2d0d23ece3dda39c6a51d36b321611578a8339fcfe9f110e17b309d8047 diff --git a/srcpkgs/hyprcursor/patches/missing_include.patch b/srcpkgs/hyprcursor/patches/missing_include.patch deleted file mode 100644 index e57580f..0000000 --- a/srcpkgs/hyprcursor/patches/missing_include.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/libhyprcursor/hyprcursor.cpp.old b/libhyprcursor/hyprcursor.cpp -index 3a83a264fbc..019e4c09be2 100644 ---- a/libhyprcursor/hyprcursor.cpp.old -+++ b/libhyprcursor/hyprcursor.cpp -@@ -7,4 +7,5 @@ - #include - #include -+#include - #include - #include diff --git a/srcpkgs/hyprcursor/template b/srcpkgs/hyprcursor/template index 7a209b6..fcec2b6 100644 --- a/srcpkgs/hyprcursor/template +++ b/srcpkgs/hyprcursor/template @@ -1,6 +1,6 @@ # Template file for 'hyprcursor' pkgname=hyprcursor -version=0.1.10 +version=0.1.9 revision=1 build_style=cmake hostmakedepends="pkgconf cairo-devel" @@ -10,7 +10,7 @@ maintainer="zenobit " license="BSD-3-Clause" homepage="https://github.com/hyprwm/hyprcursor" distfiles="https://github.com/hyprwm/hyprcursor/archive/refs/tags/v${version}.tar.gz" -checksum=67e845404164fee4c5694209b3d5f93a31b6963dbb0bfd6ed2cd96c99b316a08 +checksum=313cd91436af343918e6dec4a666d4bf3666149ac3cac6f36c683b70304eada4 post_install() { vlicense LICENSE diff --git a/srcpkgs/hyprland/patches/revert-c++26-log-on-musl.patch b/srcpkgs/hyprland/patches/revert-c++26-log-on-musl.patch deleted file mode 100644 index b3e0e6e..0000000 --- a/srcpkgs/hyprland/patches/revert-c++26-log-on-musl.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/src/debug/Log.cpp.old b/src/debug/Log.cpp -index a4c5b08e60b..0def77c003e 100644 ---- a/src/debug/Log.cpp.old -+++ b/src/debug/Log.cpp -@@ -6,11 +6,8 @@ - #include - #include --#include - - void Debug::init(const std::string& IS) { - logFile = IS + (ISDEBUG ? "/hyprlandd.log" : "/hyprland.log"); - logOfs.open(logFile, std::ios::out | std::ios::app); -- auto handle = logOfs.native_handle(); -- fcntl(handle, F_SETFD, FD_CLOEXEC); - } - diff --git a/srcpkgs/hyprland/template b/srcpkgs/hyprland/template index 1958ee6..25644e0 100644 --- a/srcpkgs/hyprland/template +++ b/srcpkgs/hyprland/template @@ -1,6 +1,6 @@ # Template file for 'hyprland' pkgname=hyprland -version=0.44.0 +version=0.42.0 revision=1 build_style=cmake configure_args=" --no-warn-unused-cli \ @@ -55,7 +55,7 @@ license="BSD-3-Clause" homepage="https://hyprland.org/" changelog="https://github.com/hyprwm/Hyprland/releases" distfiles="https://github.com/hyprwm/Hyprland/releases/download/v${version}/source-v${version}.tar.gz" -checksum=c307e52d8f2554b02428926b87060c228472b09ca18fc0d928487aa92559104f +checksum=278c137ad28f5e4ef9d65032b18cb230799c982d008654a90b5060dd32eaa54a if [ "$XBPS_TARGET_LIBC" = "musl" ]; then configure_args+=" -DCMAKE_CXX_FLAGS=\"-lexecinfo\"" diff --git a/srcpkgs/hyprlang/template b/srcpkgs/hyprlang/template index c678df2..69ef20a 100644 --- a/srcpkgs/hyprlang/template +++ b/srcpkgs/hyprlang/template @@ -1,6 +1,6 @@ # Template file for 'hyprlang' pkgname=hyprlang -version=0.5.3 +version=0.5.2 revision=1 build_style=cmake hostmakedepends="cmake pkgconf" @@ -11,4 +11,4 @@ license="LGPL-3.0-only" homepage="https://hyprland.org/hyprlang/index.html" changelog="https://github.com/hyprwm/hyprlang/releases" distfiles="https://github.com/hyprwm/hyprlang/archive/refs/tags/v${version}.tar.gz" -checksum=9715311d6b31c18f1e83da999269c71a61c0862645795d2666fa1d7b20d5d0f6 +checksum=66a1f87634c8ecdeb67d7ccc499a3fc1c19b064a098b103be042751e7430b5cc diff --git a/srcpkgs/hyprpaper/template b/srcpkgs/hyprpaper/template index 1ddfafd..5e198eb 100644 --- a/srcpkgs/hyprpaper/template +++ b/srcpkgs/hyprpaper/template @@ -1,8 +1,8 @@ # Template file for 'hyprpaper' pkgname=hyprpaper -version=0.7.1 +version=0.7.0 revision=1 -hostmakedepends="pkgconf cmake wayland-devel hyprutils hyprwayland-scanner" +hostmakedepends="pkgconf cmake wayland-devel" makedepends=" pango-devel cairo-devel @@ -20,7 +20,7 @@ maintainer="Makrennel " license="BSD-3-Clause" homepage="https://github.com/hyprwm/hyprpaper" distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz" -checksum=1086a9c7e4126446315aed23fc610f0869b77c899b9d828f997e7188341391e7 +checksum=4840425013b95b49120aeb87d4d4e7d83f8956e847a537e1e6dd7f58a4b643b4 do_build() { cmake \ diff --git a/srcpkgs/hyprutils/template b/srcpkgs/hyprutils/template index 9c08b58..607a357 100644 --- a/srcpkgs/hyprutils/template +++ b/srcpkgs/hyprutils/template @@ -1,6 +1,6 @@ # Template file for 'hyprutils' pkgname=hyprutils -version=0.2.3 +version=0.2.1 revision=1 build_style=cmake hostmakedepends="pkgconf" @@ -10,7 +10,7 @@ maintainer="Makrennel " license="BSD-3-Clause" homepage="https://github.com/hyprwm/hyprutils" distfiles="https://github.com/hyprwm/hyprutils/archive/refs/tags/v${version}.tar.gz" -checksum=06821949c3a060c6233bebcaad3a3a3e3a6dfc4b2e6e1034834a5c92d7236b21 +checksum=061449c828d0cdaf7b147d9e232282fd0dde997c6ec7c43d51fe96d878b66c12 post_install() { vlicense LICENSE diff --git a/srcpkgs/hyprwayland-scanner/template b/srcpkgs/hyprwayland-scanner/template index e865f3d..5ff01c2 100644 --- a/srcpkgs/hyprwayland-scanner/template +++ b/srcpkgs/hyprwayland-scanner/template @@ -1,6 +1,6 @@ # Template file for 'hyprwayland-scanner' pkgname=hyprwayland-scanner -version=0.4.2 +version=0.4.0 revision=1 build_style=cmake hostmakedepends="pkgconf" @@ -10,7 +10,7 @@ maintainer="Makrennel " license="BSD-3-Clause" homepage="https://github.com/hyprwm/hyprwayland-scanner" distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz" -checksum=2f1e54336ed6cc3dbab5ad5279f2520eae1a90fc80852ab005a8250a5a15d1ac +checksum=4091122777ade12b8edc8de6f2df4917ced73b81cd40d946a995de73880ec71f post_install() { vlicense LICENSE diff --git a/srcpkgs/xdg-desktop-portal-hyprland/template b/srcpkgs/xdg-desktop-portal-hyprland/template index 5b5388d..8753c5d 100644 --- a/srcpkgs/xdg-desktop-portal-hyprland/template +++ b/srcpkgs/xdg-desktop-portal-hyprland/template @@ -1,6 +1,6 @@ # Template file for 'xdg-desktop-portal-hyprland' pkgname=xdg-desktop-portal-hyprland -version=1.3.6 +version=1.3.3 revision=1 build_style=cmake hostmakedepends=" @@ -20,8 +20,6 @@ makedepends=" elogind-devel qt6-base-devel hyprlang - hyprutils - hyprwayland-scanner sdbus-cpp " depends=" @@ -30,8 +28,6 @@ depends=" qt6-base qt6-wayland hyprlang - hyprutils - hyprwayland-scanner sdbus-cpp " short_desc="Backend of xdg-desktop-portal for Hyprland" @@ -39,7 +35,7 @@ maintainer="Makrennel " license="BSD-3-Clause" homepage="https://github.com/hyprwm/xdg-desktop-portal-hyprland" distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz" -checksum=cf9742c5a6df3de58abf631f01d58c5df0db417004aa8e6852f6533cc8f2938e +checksum=5a8389868287853800d58e5296be9c7fcb0bd191297bc9806c352c735d92d7b3 post_install() { vlicense LICENSE