x11/hyprpaper: unbundle devel/hyprlang

This commit is contained in:
Jan Beich 2024-01-03 13:10:40 +01:00
parent 1c60f593c9
commit 91a19f4d40
3 changed files with 3 additions and 48 deletions

View file

@ -1,6 +1,7 @@
PORTNAME= hyprpaper
DISTVERSIONPREFIX= v
DISTVERSION= 0.6.0
PORTREVISION= 1
CATEGORIES= x11 wayland
MAINTAINER= jbeich@FreeBSD.org
@ -8,25 +9,18 @@ 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= libhyprlang.so:devel/hyprlang \
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:

View file

@ -1,5 +1,3 @@
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

View file

@ -1,37 +0,0 @@
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"