mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-08-05 13:27:09 +02:00
testing/xdg-desktop-portal-hyprland: upgrade to 1.3.9
This commit is contained in:
parent
5106e2fc10
commit
6c06934bba
@ -1,8 +1,8 @@
|
||||
# Contributor: Rabindra Dhakal <contact@qaidvoid.dev>
|
||||
# Maintainer: Zach DeCook <zachdecook@librem.one>
|
||||
pkgname=xdg-desktop-portal-hyprland
|
||||
pkgver=1.3.3
|
||||
pkgrel=1
|
||||
pkgver=1.3.9
|
||||
pkgrel=0
|
||||
pkgdesc="xdg-desktop-portal backend for hyprland"
|
||||
url="https://github.com/hyprwm/xdg-desktop-portal-hyprland"
|
||||
arch="all !armhf !armv7 !x86" # 32bit builds broken
|
||||
@ -17,9 +17,11 @@ makedepends="
|
||||
cmake
|
||||
hyprland-protocols
|
||||
hyprlang-dev
|
||||
samurai
|
||||
hyprutils-dev
|
||||
hyprwayland-scanner
|
||||
pipewire-dev
|
||||
qt6-qtwayland-dev
|
||||
samurai
|
||||
sdbus-cpp-dev
|
||||
wayland-dev
|
||||
"
|
||||
@ -45,6 +47,6 @@ package() {
|
||||
}
|
||||
|
||||
sha512sums="
|
||||
c100ca27e9cd430602ad0ea4733f34919d84206df084df0d9f8ed8ca8a634069cc7ef71cb587f92eae6eeedf4029a88644b24b9b8d37138cb544279f5be30720 xdg-desktop-portal-hyprland-1.3.3.tar.gz
|
||||
de46d0be8eda427fb8bb4c20490d585bbedd963ba04394d6625394775b8217376cc5b56a12c457096668ab2fb2150400d3ae8e5ddcbb4dac9e8dea9afbac892b use-system-installed-sdbus-c++.patch
|
||||
2a157d406b63371b0594a679622e113379a326ef68a02163aa5c0b14703c2472f972d080ff146d401c87e084bbfdbc4133768792d4996c2d2ad45ca6db8ccc1e xdg-desktop-portal-hyprland-1.3.9.tar.gz
|
||||
68d11e2868f010169a9e828680a0edc82ce3d4844df7083b5c509e9d1dab3146675ed084366b5f388e80b8c288f6ec13e2cd3811b3271022fe159ef91017c877 use-system-installed-sdbus-c++.patch
|
||||
"
|
||||
|
@ -1,32 +1,34 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index f98bafd..2ef5aaf 100644
|
||||
index 335014ce6fc8..a79752258bba 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -41,17 +41,12 @@ add_compile_options(-Wall -Wextra -Wno-unused-parameter -Wno-unused-value
|
||||
@@ -51,6 +51,7 @@ add_compile_options(
|
||||
message(STATUS "Checking deps...")
|
||||
add_subdirectory(hyprland-share-picker)
|
||||
|
||||
+find_package(sdbus-c++ REQUIRED)
|
||||
find_package(Threads REQUIRED)
|
||||
find_package(PkgConfig REQUIRED)
|
||||
pkg_check_modules(deps REQUIRED IMPORTED_TARGET wayland-client wayland-protocols wayland-scanner libpipewire-0.3 libspa-0.2 libdrm gbm hyprlang>=0.2.0)
|
||||
pkg_check_modules(
|
||||
@@ -68,12 +69,6 @@ pkg_check_modules(
|
||||
hyprwayland-scanner>=0.4.2)
|
||||
|
||||
# check whether we can find sdbus-c++ through pkg-config
|
||||
-pkg_check_modules(SDBUS IMPORTED_TARGET sdbus-c++)
|
||||
-pkg_check_modules(SDBUS IMPORTED_TARGET sdbus-c++>=2.0.0)
|
||||
-if(NOT SDBUS_FOUND)
|
||||
- include_directories("subprojects/sdbus-cpp/include/")
|
||||
- add_subdirectory(subprojects/sdbus-cpp EXCLUDE_FROM_ALL)
|
||||
- add_library(PkgConfig::SDBUS ALIAS sdbus-c++)
|
||||
- include_directories("subprojects/sdbus-cpp/include/")
|
||||
- add_subdirectory(subprojects/sdbus-cpp EXCLUDE_FROM_ALL)
|
||||
- add_library(PkgConfig::SDBUS ALIAS sdbus-c++)
|
||||
-endif()
|
||||
|
||||
# same for hyprland-protocols
|
||||
pkg_check_modules(HYPRLAND_PROTOS IMPORTED_TARGET hyprland-protocols)
|
||||
@@ -63,7 +58,7 @@ endif()
|
||||
|
||||
@@ -86,7 +81,7 @@ endif()
|
||||
file(GLOB_RECURSE SRCFILES CONFIGURE_DEPENDS "src/*.cpp")
|
||||
add_executable(xdg-desktop-portal-hyprland ${SRCFILES})
|
||||
-target_link_libraries(xdg-desktop-portal-hyprland PRIVATE rt PkgConfig::SDBUS Threads::Threads PkgConfig::deps)
|
||||
+target_link_libraries(xdg-desktop-portal-hyprland PRIVATE rt sdbus-c++ Threads::Threads PkgConfig::deps)
|
||||
target_link_libraries(
|
||||
- xdg-desktop-portal-hyprland PRIVATE rt PkgConfig::SDBUS Threads::Threads
|
||||
+ xdg-desktop-portal-hyprland PRIVATE rt sdbus-c++ Threads::Threads
|
||||
PkgConfig::deps)
|
||||
|
||||
# protocols
|
||||
pkg_get_variable(WaylandScanner wayland-scanner wayland_scanner)
|
||||
|
Loading…
Reference in New Issue
Block a user