Compare commits

..

No commits in common. "7ea94ce7784980c16b7c97ae3a1e8cf60d46afc5" and "c66a2e487cf59eacaa3e386afc9ebfe956fcb2a3" have entirely different histories.

6 changed files with 26 additions and 75 deletions

View File

@ -24,8 +24,8 @@ SRC_URI = " \
"
S = "${WORKDIR}/git"
PV = "1.18.1"
SRCREV = "ce9c9f6be6bc0226741b5e114167a53e135ae885"
PV = "1.18.0"
SRCREV = "b5e692ef8ba1627605b351349505f049b4f76b7c"
PACKAGECONFIG[grapheme-clustering] = "-Dgrapheme-clustering=enabled,-Dgrapheme-clustering=disabled,utf8proc"
PACKAGECONFIG[docs] = "-Ddocs=enabled,-Ddocs=disabled,scdoc-native"

View File

@ -22,7 +22,7 @@ DEPENDS = " \
SRC_URI = "git://github.com/hyprwm/aquamarine.git;protocol=https;branch=main"
S = "${WORKDIR}/git"
SRCREV = "4f6642808b18827a574b5225f0436c597cbcdcc5"
SRCREV = "295d37df17ea32184fa15ee862d5b7d92293d09e"
PV = "0.3.1"
inherit cmake pkgconfig

View File

@ -47,8 +47,8 @@ RRECOMMENDS:${PN} ?= " \
SRC_URI = "gitsm://github.com/hyprwm/Hyprland.git;protocol=https;branch=main"
SRCREV = "682b30fba89c043e86d9c96bdb8df133c1683054"
PV = "0.43-dev"
SRCREV = "9a09eac79b85c846e3a865a9078a3f8ff65a9259"
PV = "0.42"
S = "${WORKDIR}/git"
inherit meson pkgconfig features_check

View File

@ -1,40 +0,0 @@
From 6c00eb848ce432183c79f34f2e487f6c00a1746a Mon Sep 17 00:00:00 2001
From: Markus Volk <f_l_k@t-online.de>
Date: Sat, 17 Aug 2024 08:26:30 +0200
Subject: [PATCH] CMakeLists: require native hyprwayland-scanner
This would fix a cross-compile issue where hyprwayland-scanner is pulled in for
target but needs to run on host.
Patch-Status: Submitted [https://github.com/hyprwm/hyprpaper/pull/191]
Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
CMakeLists.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c3b0f1e..4e48137 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,6 +45,7 @@ add_compile_options(-Wall -Wextra -Wno-unused-parameter -Wno-unused-value
find_package(Threads REQUIRED)
find_package(PkgConfig REQUIRED)
+find_package(hyprwayland-scanner 0.4.0 REQUIRED)
pkg_check_modules(
deps
@@ -58,8 +59,7 @@ pkg_check_modules(
libjpeg
libwebp
hyprlang>=0.2.0
- hyprutils>=0.2.0
- hyprwayland-scanner>=0.4.0)
+ hyprutils>=0.2.0)
file(GLOB_RECURSE SRCFILES "src/*.cpp")
--
2.45.2

View File

@ -3,13 +3,10 @@ HOMEPAGE = "https://hyprland.org/"
LICENSE = "BSD-3-Clause"
LIC_FILES_CHKSUM = "file://LICENSE;md5=936078e4e67b0e1e1bd1e862d4ffbc25"
SRC_URI = " \
git://github.com/hyprwm/hyprpaper.git;protocol=https;branch=main \
file://0001-CMakeLists-require-native-hyprwayland-scanner.patch \
"
SRC_URI = "git://github.com/hyprwm/hyprpaper.git;protocol=https;branch=main"
PV = "0.7.1"
SRCREV = "808d88e5745e775763109e26502e951043349d5f"
PV = "0.7.0"
SRCREV = "f4abf5902f3f0c51d2aab8a521f7c1b1b08afd64"
S = "${WORKDIR}/git"
DEPENDS += " \
@ -17,7 +14,6 @@ DEPENDS += " \
file \
fribidi \
hyprlang \
hyprwayland-scanner-native \
jpeg \
libglvnd \
libwebp \
@ -31,4 +27,22 @@ RDEPENDS:${PN} = "hyprlang"
REQUIRED_DISTRO_FEATURES = "wayland"
EXTRA_OEMAKE = " \
WAYLAND_SCANNER=${STAGING_BINDIR_NATIVE}/wayland-scanner \
WAYLAND_PROTOCOLS=${STAGING_DATADIR}/wayland-protocols \
"
do_configure:prepend() {
sed -i -e '$ainstall(TARGETS hyprpaper)' ${S}/CMakeLists.txt
}
do_compile:prepend() {
cd ${S} && oe_runmake protocols
}
do_install() {
install -d ${D}${bindir}
install -m0755 ${B}/hyprpaper ${D}${bindir}
}
inherit cmake pkgconfig features_check

View File

@ -1,23 +0,0 @@
SUMMARY = "A plugin for Hyprland that implements a workspace overview feature similar to that of KDE Plasma, GNOME and macOS"
HOMEPAGE = "https://hyprland.org/"
LICENSE = "GPL-2.0-only"
LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263"
SRC_URI = "git://github.com/clague/Hyprspace.git;protocol=https;branch=main"
SRCREV = "6ac35435eebb466e1630f573e2c97344c2848353"
S = "${WORKDIR}/git"
DEPENDS += " \
libdrm \
pixman \
hyprland \
hyprutils \
"
REQUIRED_DISTRO_FEATURES = "wayland"
inherit meson pkgconfig features_check
FILES:${PN} += "${libdir}/libHyprspace.so"
FILES:${PN}-dev = ""