Compare commits

..

16 Commits

Author SHA1 Message Date
Markus Volk
28a76fee8c nwg-dock-hyprland: update 2024-09-29 17:04:17 +02:00
Markus Volk
683bfcab76 nwg-menu: update 2024-09-29 17:03:57 +02:00
Markus Volk
2f0e9a8843 nwg-panel: update 2024-09-29 16:59:09 +02:00
Markus Volk
b1a9587ab2 nwg-drawer: update 2024-09-29 16:58:22 +02:00
Markus Volk
4c0710018b nwg-displays: update 2024-09-29 16:57:57 +02:00
Markus Volk
ff3ffe6bda azote: update 2024-09-29 16:57:38 +02:00
Markus Volk
668ff50ecb hyprland: update 2024-09-29 16:43:27 +02:00
Markus Volk
0358832188 hyprutils: update 2024-09-29 16:43:11 +02:00
Markus Volk
1ca7ed8cb2 hyprwayland-scanner: update 2024-09-29 16:42:55 +02:00
Markus Volk
21ef010a0a hyprlock: update 2024-09-29 16:42:38 +02:00
Markus Volk
029994bb6f hyprland-plugins: update 2024-09-29 16:42:17 +02:00
Markus Volk
0f7fb02511 hyprpicker: update 2024-09-29 16:41:51 +02:00
Markus Volk
5642bce642 hypridle: update 2024-09-29 16:41:35 +02:00
Markus Volk
ea585f8ac0 aquamarine: update 2024-09-29 16:41:16 +02:00
Markus Volk
fe81d91aff xdg-desktop-portal-hyprland: update
revert 15932f0f9e4185faad4e90fa53a09a59d2a72fdf to avoid issues with pipewire
[15932f0f9e]
2024-09-29 16:40:56 +02:00
Markus Volk
121114ee63 layer.conf: add master 2024-09-29 16:13:54 +02:00
18 changed files with 86 additions and 25 deletions

View File

@ -8,7 +8,7 @@ BBFILE_COLLECTIONS += "wayland"
BBFILE_PATTERN_wayland = "^${LAYERDIR}/" BBFILE_PATTERN_wayland = "^${LAYERDIR}/"
BBFILE_PRIORITY_wayland = "5" BBFILE_PRIORITY_wayland = "5"
LAYERSERIES_COMPAT_wayland = "styhead" LAYERSERIES_COMPAT_wayland = "styhead master"
LAYERDEPENDS_wayland = " \ LAYERDEPENDS_wayland = " \
core \ core \

View File

@ -5,6 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=e0f1d50df739a9fb8eae12a8f37ce352"
SRC_URI:append = " \ SRC_URI:append = " \
file://0001-meson.build-Dont-build-hyprland-share-picker-with-me.patch \ file://0001-meson.build-Dont-build-hyprland-share-picker-with-me.patch \
file://0001-Revert-core-add-version-and-improve-help.patch \
" "
require xdg-desktop-portal-hyprland.inc require xdg-desktop-portal-hyprland.inc

View File

@ -1,3 +1,3 @@
SRC_URI = "gitsm://github.com/hyprwm/xdg-desktop-portal-hyprland.git;protocol=https;nobranch=1" SRC_URI = "gitsm://github.com/hyprwm/xdg-desktop-portal-hyprland.git;protocol=https;nobranch=1"
SRCREV = "73b8c4f1150040644cf678aa8bbf2cec48a433cf" SRCREV = "7e500e679ede40e79cf2d89b5f5fa3e34923bd26"
PV = "1.3.4" PV = "1.3.6"

View File

@ -0,0 +1,59 @@
From 72cdf9a1eb442929d4e169168c54dc4af1bf15b7 Mon Sep 17 00:00:00 2001
From: Markus Volk <f_l_k@t-online.de>
Date: Sun, 29 Sep 2024 16:33:52 +0200
Subject: [PATCH] Revert "core: add --version and improve --help"
This reverts commit 15932f0f9e4185faad4e90fa53a09a59d2a72fdf.
---
CMakeLists.txt | 2 --
src/main.cpp | 14 +++++---------
2 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 66773db..8f194f7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,8 +21,6 @@ else()
message(STATUS "Configuring XDPH in Release with CMake")
endif()
-add_compile_definitions(XDPH_VERSION="${VER}")
-
include_directories(. "protocols/")
# configure
diff --git a/src/main.cpp b/src/main.cpp
index cdeb83d..d7a4482 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4,12 +4,11 @@
#include "core/PortalManager.hpp"
void printHelp() {
- std::cout << R"#(┃ xdg-desktop-portal-hyprland
-┣━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
-┃ -v (--verbose) → enable trace logging
-┃ -q (--quiet) → disable logging
-┃ -h (--help) → print this menu
-┃ -V (--version) → print xdph's version
+ std::cout << R"#(| xdg-desktop-portal-hyprland
+| --------------------------------------
+| -v (--verbose) > enable trace logging
+| -q (--quiet) > disable logging
+| -h (--help) > print this menu
)#";
}
@@ -28,9 +27,6 @@ int main(int argc, char** argv, char** envp) {
else if (arg == "--help" || arg == "-h") {
printHelp();
return 0;
- } else if (arg == "--version" || arg == "-V") {
- std::cout << "xdg-desktop-portal-hyprland v" << XDPH_VERSION << "\n";
- return 0;
} else {
printHelp();
return 1;
--
2.46.0

View File

@ -24,8 +24,8 @@ RDEPENDS:${PN} = " \
inherit setuptools3 inherit setuptools3
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
PV = "1.13.0" PV = "1.13.1"
SRCREV = "05be4c908a468e6392ecb8695a5211b68f310df1" SRCREV = "6086ea5fd7b126afc590be721ae3fb8bff0efcba"
do_install:append() { do_install:append() {
install -d ${D}${datadir}/azote ${D}${datadir}/pixmaps ${D}${datadir}/applications install -d ${D}${datadir}/azote ${D}${datadir}/pixmaps ${D}${datadir}/applications

View File

@ -17,8 +17,8 @@ RDEPENDS:${PN} = "\
inherit setuptools3 inherit setuptools3
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
PV = "0.3.19" PV = "0.3.21"
SRCREV = "74e907f1a8e9cb2f8e649d7439da11e00c249856" SRCREV = "935bfbdc8f876db4b48f2e5be9d7599ae5cfed34"
do_install:append() { do_install:append() {
install -d ${D}${datadir}/pixmaps ${D}${datadir}/applications install -d ${D}${datadir}/pixmaps ${D}${datadir}/applications

View File

@ -12,8 +12,8 @@ GO_IMPORT = "github.com/nwg-piotr/nwg-dock-hyprland.git"
SRC_URI = "git://${GO_IMPORT};destsuffix=src/${GO_IMPORT};nobranch=1;protocol=https" SRC_URI = "git://${GO_IMPORT};destsuffix=src/${GO_IMPORT};nobranch=1;protocol=https"
PV = "0.2.1" PV = "0.2.2"
SRCREV = "95225b4bd747c02b1ed7be49f52893a9fd0bcad3" SRCREV = "445baf061525c546a9906874fbb0ca161df239ed"
S = "${WORKDIR}/sources" S = "${WORKDIR}/sources"
UNPACKDIR = "${S}" UNPACKDIR = "${S}"

View File

@ -13,8 +13,8 @@ GO_IMPORT = "github.com/nwg-piotr/nwg-drawer.git"
SRC_URI = "git://${GO_IMPORT};destsuffix=src/${GO_IMPORT};nobranch=1;protocol=https" SRC_URI = "git://${GO_IMPORT};destsuffix=src/${GO_IMPORT};nobranch=1;protocol=https"
PV = "0.4.7" PV = "0.5.0"
SRCREV = "0cd48d1631eecb3043ee2c1fed9dfa25ca855375" SRCREV = "44e4c95900f6a8334393a42a405d26715822a220"
S = "${WORKDIR}/sources" S = "${WORKDIR}/sources"
UNPACKDIR = "${S}" UNPACKDIR = "${S}"

View File

@ -18,7 +18,7 @@ GO_IMPORT = "github.com/nwg-piotr/nwg-menu.git"
SRC_URI = "git://${GO_IMPORT};destsuffix=src/${GO_IMPORT};nobranch=1;protocol=https" SRC_URI = "git://${GO_IMPORT};destsuffix=src/${GO_IMPORT};nobranch=1;protocol=https"
PV = "0.1.3" PV = "0.1.3"
SRCREV = "fd8b92ad1ad0c0c7a23fc7a0be942ca0cbe7f7e0" SRCREV = "8b1837263063b81c88221cdabb4a4a1449e96aab"
S = "${WORKDIR}/sources" S = "${WORKDIR}/sources"
UNPACKDIR = "${S}" UNPACKDIR = "${S}"

View File

@ -20,6 +20,6 @@ RDEPENDS:${PN} = "\
inherit setuptools3 inherit setuptools3
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
PV = "0.9.31" PV = "0.9.39"
SRCREV = "dffae7319c59ae55c515fafb150a0f10be21f3cf" SRCREV = "1673def21826e89172d64b483d6624fa57226c81"

View File

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

View File

@ -9,9 +9,9 @@ SRC_URI = "git://github.com/hyprwm/hypridle.git;protocol=https;branch=main"
DEPENDS = "wayland wayland-native wayland-protocols hyprlang sdbus-c++-1" DEPENDS = "wayland wayland-native wayland-protocols hyprlang sdbus-c++-1"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
SRCREV = "7cff4581a3753154fc5b41f39a098fad49b777b1" SRCREV = "cc23f97836adbba1abc8edd48169fb1f1f698c32"
PV = "0.1.2" PV = "0.1.2"
inherit cmake pkgconfig inherit cmake pkgconfig
FILES:${PN} += "${systemd_user_unitdir}" FILES:${PN} += "${systemd_user_unitdir} ${datadir}/hypr/hypridle.conf"

View File

@ -1,5 +1,5 @@
SRC_URI = "git://github.com/hyprwm/hyprland-plugins.git;protocol=https;branch=main" SRC_URI = "git://github.com/hyprwm/hyprland-plugins.git;protocol=https;branch=main"
SRCREV = "7a28245e5a8d30e520bc6ce8bc9b7ee177d9f2b6" SRCREV = "4fcb465c9d771f4ae1f451e8d953250d16eead70"
# Hack to allow patching the plugins # Hack to allow patching the plugins
do_configure:prepend() { do_configure:prepend() {

View File

@ -42,7 +42,7 @@ RRECOMMENDS:${PN} ?= " \
SRC_URI = "gitsm://github.com/hyprwm/Hyprland.git;protocol=https;branch=main" SRC_URI = "gitsm://github.com/hyprwm/Hyprland.git;protocol=https;branch=main"
SRCREV = "0f594732b063a90d44df8c5d402d658f27471dfe" SRCREV = "4b00cba319dc44294567d06df7c378cf5e4e5338"
PV = "0.43" PV = "0.43"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"

View File

@ -26,7 +26,7 @@ DEPENDS = " \
" "
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
SRCREV = "9393a3e94d837229714e28041427709756033f5a" SRCREV = "9ea804788ca5b4852d7e045d7a57f8d413852ca0"
PV = "0.4.1" PV = "0.4.1"
inherit cmake pkgconfig features_check inherit cmake pkgconfig features_check

View File

@ -7,19 +7,20 @@ SRC_URI = "git://github.com/hyprwm/hyprpicker.git;protocol=https;branch=main"
PV = "0.3.0" PV = "0.3.0"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
SRCREV = "38fe668e58014c75cf28f7cb5fc136aa710e7039" SRCREV = "c9238d39f64dd2618975c9d654301a4720659aed"
DEPENDS = " \ DEPENDS = " \
cairo \ cairo \
fribidi \ fribidi \
hyprutils \ hyprutils \
hyprwayland-scanner \
hyprwayland-scanner-native \
jpeg \ jpeg \
libxkbcommon \ libxkbcommon \
pango \ pango \
pcre \ pcre \
util-linux \ util-linux \
wayland \ wayland \
wayland-native \
wayland-protocols \ wayland-protocols \
" "

View File

@ -9,7 +9,7 @@ DEPENDS = "pixman"
SRC_URI = "git://github.com/hyprwm/hyprutils.git;protocol=https;branch=main" SRC_URI = "git://github.com/hyprwm/hyprutils.git;protocol=https;branch=main"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
SRCREV = "d97af4f6bd068c03a518b597675e598f57ea2291" SRCREV = "7373e8721502bfe696efbe3b7c350335eb0c1fc9"
PV = "0.2.2" PV = "0.2.3"
inherit cmake pkgconfig inherit cmake pkgconfig

View File

@ -9,7 +9,7 @@ SRC_URI = "git://github.com/hyprwm/hyprwayland-scanner.git;protocol=https;branch
DEPENDS = "pugixml" DEPENDS = "pugixml"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
SRCREV = "b68dab23fc922eae99306988133ee80a40b39ca5" SRCREV = "500c81a9e1a76760371049a8d99e008ea77aa59e"
PV = "0.4.2" PV = "0.4.2"
inherit cmake pkgconfig inherit cmake pkgconfig