git: d54bbf6ddf2d - main - x11/hyprpaper: update to 0.6.0

The branch main has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=d54bbf6ddf2dc8bde4b35093479e95001ad5e403

commit d54bbf6ddf2dc8bde4b35093479e95001ad5e403
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2024-01-02 21:22:34 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2024-01-03 12:58:10 +0000

    x11/hyprpaper: update to 0.6.0
    
    Changes:        https://github.com/hyprwm/hyprpaper/releases/tag/v0.6.0
    Reported by:    GitHub (watch releases)
---
 x11/hyprpaper/Makefile                 | 16 ++++++++++-----
 x11/hyprpaper/distinfo                 | 10 ++++-----
 x11/hyprpaper/files/patch-private-libs | 37 ++++++++++++++++++++++++++++++++++
 3 files changed, 53 insertions(+), 10 deletions(-)

diff --git a/x11/hyprpaper/Makefile b/x11/hyprpaper/Makefile
index d37e4c7334be..26a9adfff5ea 100644
--- a/x11/hyprpaper/Makefile
+++ b/x11/hyprpaper/Makefile
@@ -1,26 +1,32 @@
 PORTNAME=	hyprpaper
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.5.0
+DISTVERSION=	0.6.0
 CATEGORIES=	x11 wayland
 
-PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES+=	81d6b682f6e6.patch:-p1 # https://github.com/hyprwm/hyprpaper/pull/117
-
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Blazing fast Wayland wallpaper utility with IPC controls
 WWW=		https://github.com/hyprwm/hyprpaper
 
 LICENSE=	BSD3CLAUSE
+LICENSE+=	GPLv3+
+LICENSE_COMB=	multi
 LICENSE_FILE=	${WRKSRC}/LICENSE
+LICENSE_FILE_GPLv3+ =	${WRKSRC_hyprlang}/LICENSE
+
+BROKEN_armv7=	https://github.com/hyprwm/hyprlang/issues/8
+BROKEN_i386=	https://github.com/hyprwm/hyprlang/issues/8
+BROKEN_powerpc=	https://github.com/hyprwm/hyprlang/issues/8
 
 BUILD_DEPENDS=	gmake:devel/gmake \
 		wayland-protocols>0:graphics/wayland-protocols
-LIB_DEPENDS=	libwayland-client.so:graphics/wayland
+LIB_DEPENDS=	libwayland-client.so:graphics/wayland \
+		libwebp.so:graphics/webp
 
 USES=		compiler:c++11-lib cmake gnome jpeg localbase:ldflags pkgconfig
 USE_GNOME=	cairo
 USE_GITHUB=	yes
 GH_ACCOUNT=	hyprwm
+GH_TUPLE=	hyprwm:hyprlang:v0.2.1:hyprlang/subprojects/hyprlang
 PLIST_FILES=	bin/${PORTNAME}
 
 post-patch:
diff --git a/x11/hyprpaper/distinfo b/x11/hyprpaper/distinfo
index 190562e21c19..304f8be09b93 100644
--- a/x11/hyprpaper/distinfo
+++ b/x11/hyprpaper/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1701012338
-SHA256 (hyprwm-hyprpaper-v0.5.0_GH0.tar.gz) = 683b63ca8a5268ab02a78bef8dff5dc4e5bd6f4009300bbbd5e5955dc5590b5f
-SIZE (hyprwm-hyprpaper-v0.5.0_GH0.tar.gz) = 27437
-SHA256 (81d6b682f6e6.patch) = 0553563588918ddda8311e2112a2bf2c17330ea63d177e57888b6fba7acdaab3
-SIZE (81d6b682f6e6.patch) = 1817
+TIMESTAMP = 1704230554
+SHA256 (hyprwm-hyprpaper-v0.6.0_GH0.tar.gz) = 71d8294ffbcbaae628c4eabdcb3b7fb1974d6bed7794b787bb77934d0a3f4538
+SIZE (hyprwm-hyprpaper-v0.6.0_GH0.tar.gz) = 28122
+SHA256 (hyprwm-hyprlang-v0.2.1_GH0.tar.gz) = e41b265f09c1e84e03f052f584fcc086fe48ec5057191ef35917ce79e7dc4190
+SIZE (hyprwm-hyprlang-v0.2.1_GH0.tar.gz) = 61006
diff --git a/x11/hyprpaper/files/patch-private-libs b/x11/hyprpaper/files/patch-private-libs
new file mode 100644
index 000000000000..365f59de6260
--- /dev/null
+++ b/x11/hyprpaper/files/patch-private-libs
@@ -0,0 +1,37 @@
+hyprlang has no other consumers. Keep it private for now.
+
+--- CMakeLists.txt.orig	2024-01-02 21:22:34 UTC
++++ CMakeLists.txt
+@@ -41,11 +41,12 @@ find_package(PkgConfig REQUIRED)
+ find_package(Threads REQUIRED)
+ 
+ find_package(PkgConfig REQUIRED)
+-pkg_check_modules(deps REQUIRED IMPORTED_TARGET wayland-client wayland-protocols cairo pango pangocairo libjpeg libwebp hyprlang>=0.2.0)
++pkg_check_modules(deps REQUIRED IMPORTED_TARGET wayland-client wayland-protocols cairo pango pangocairo libjpeg libwebp)
+ 
+ file(GLOB_RECURSE SRCFILES "src/*.cpp")
+ 
+ add_executable(hyprpaper ${SRCFILES})
++add_subdirectory(subprojects/hyprlang EXCLUDE_FROM_ALL)
+ 
+ target_compile_definitions(hyprpaper PRIVATE "-DGIT_COMMIT_HASH=\"${GIT_COMMIT_HASH}\"")
+ target_compile_definitions(hyprpaper PRIVATE "-DGIT_BRANCH=\"${GIT_BRANCH}\"")
+@@ -59,6 +60,7 @@ target_link_libraries(hyprpaper PkgConfig::deps)
+ include(CPack)
+ 
+ target_link_libraries(hyprpaper PkgConfig::deps)
++target_link_libraries(hyprpaper hyprlang)
+ 
+ target_link_libraries(hyprpaper
+         OpenGL
+--- subprojects/hyprlang/CMakeLists.txt.orig	2024-01-02 22:10:42 UTC
++++ subprojects/hyprlang/CMakeLists.txt
+@@ -17,7 +17,7 @@ file(GLOB_RECURSE SRCFILES CONFIGURE_DEPENDS "src/*.cp
+ 
+ file(GLOB_RECURSE SRCFILES CONFIGURE_DEPENDS "src/*.cpp" "include/hyprlang.hpp")
+ 
+-add_library(hyprlang SHARED ${SRCFILES})
++add_library(hyprlang STATIC ${SRCFILES})
+ target_include_directories( hyprlang
+     PUBLIC "./include"
+     PRIVATE "./src"