diff --git a/devel/hyprlang/Makefile b/devel/hyprlang/Makefile index c67f2d34f8d0..9983449d4777 100644 --- a/devel/hyprlang/Makefile +++ b/devel/hyprlang/Makefile @@ -1,32 +1,33 @@ PORTNAME= hyprlang DISTVERSIONPREFIX= v -DISTVERSION= 0.2.1 -PORTREVISION= 1 +DISTVERSION= 0.3.0 CATEGORIES= devel MAINTAINER= jbeich@FreeBSD.org COMMENT= Library to parse hypr config files WWW= https://hyprland.org/hyprlang LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/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 USES= cmake:testing compiler:c++11-lib USE_GITHUB= yes USE_LDCONFIG= yes GH_ACCOUNT= hyprwm PLIST_FILES= include/${PORTNAME}.hpp \ lib/lib${PORTNAME}.so \ - share/pkgconfig/${PORTNAME}.pc + lib/lib${PORTNAME}.so.${PORTVERSION:R:R} \ + lib/lib${PORTNAME}.so.${PORTVERSION} \ + libdata/pkgconfig/${PORTNAME}.pc # XXX Drop after FreeBSD 14.0 EOL around 2025-03-01 .if exists(/usr/include/c++/v1/__format/format_functions.h) && \ !exists(/usr/include/c++/v1/__format/write_escaped.h) CXXFLAGS+= -fexperimental-library .endif .include diff --git a/devel/hyprlang/distinfo b/devel/hyprlang/distinfo index ac63b443fb3f..1794c16e5005 100644 --- a/devel/hyprlang/distinfo +++ b/devel/hyprlang/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1704233442 -SHA256 (hyprwm-hyprlang-v0.2.1_GH0.tar.gz) = e41b265f09c1e84e03f052f584fcc086fe48ec5057191ef35917ce79e7dc4190 -SIZE (hyprwm-hyprlang-v0.2.1_GH0.tar.gz) = 61006 +TIMESTAMP = 1707510626 +SHA256 (hyprwm-hyprlang-v0.3.0_GH0.tar.gz) = 6355ae011b1d9d77f95d435fd79582a547cf08db3c0189f2a4ed0a6a25d9b4a1 +SIZE (hyprwm-hyprlang-v0.3.0_GH0.tar.gz) = 61520 diff --git a/devel/hyprlang/files/patch-CMakeLists.txt b/devel/hyprlang/files/patch-CMakeLists.txt deleted file mode 100644 index c4b6e2e698e6..000000000000 --- a/devel/hyprlang/files/patch-CMakeLists.txt +++ /dev/null @@ -1,36 +0,0 @@ -https://github.com/hyprwm/hyprlang/issues/6 -https://github.com/hyprwm/hyprlang/issues/7 -https://github.com/hyprwm/hyprlang/issues/11 - ---- CMakeLists.txt.orig 2024-01-02 22:10:42 UTC -+++ CMakeLists.txt -@@ -2,7 +2,8 @@ set(PREFIX ${CMAKE_INSTALL_PREFIX}) - - set(HYPRLANG_VERSION "0.2.1") - set(PREFIX ${CMAKE_INSTALL_PREFIX}) --set(INCLUDE ${CMAKE_INSTALL_INCLUDEDIR}) -+include(GNUInstallDirs) -+set(INCLUDE ${CMAKE_INSTALL_FULL_INCLUDEDIR}) - - project(hyprlang - VERSION ${HYPRLANG_VERSION} -@@ -31,16 +32,16 @@ target_link_libraries(hyprlang_test PRIVATE hyprlang) - - add_executable(hyprlang_test "tests/parse/main.cpp") - target_link_libraries(hyprlang_test PRIVATE hyprlang) --add_test(NAME "Parsing" WORKING_DIRECTORY "../tests/" COMMAND hyprlang_test "parse") -+add_test(NAME "Parsing" WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}/tests/" COMMAND hyprlang_test "parse") - add_dependencies(tests hyprlang_test) - - add_executable(hyprlang_fuzz "tests/fuzz/main.cpp") - target_link_libraries(hyprlang_fuzz PRIVATE hyprlang) --add_test(NAME "Fuzz" WORKING_DIRECTORY "../tests/" COMMAND hyprlang_fuzz "fuzz") -+add_test(NAME "Fuzz" WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}/tests/" COMMAND hyprlang_fuzz "fuzz") - add_dependencies(tests hyprlang_fuzz) - - # Installation - install(TARGETS hyprlang - PUBLIC_HEADER DESTINATION include - LIBRARY DESTINATION lib) --install(FILES build/hyprlang.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pkgconfig) -+install(FILES ${CMAKE_BINARY_DIR}/hyprlang.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pkgconfig) diff --git a/x11/hyprpaper/Makefile b/x11/hyprpaper/Makefile index deecc3bddb07..1baa03be2d79 100644 --- a/x11/hyprpaper/Makefile +++ b/x11/hyprpaper/Makefile @@ -1,48 +1,48 @@ PORTNAME= hyprpaper DISTVERSIONPREFIX= v DISTVERSION= 0.6.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 wayland MAINTAINER= jbeich@FreeBSD.org COMMENT= Blazing fast Wayland wallpaper utility with IPC controls WWW= https://github.com/hyprwm/hyprpaper LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= gmake:devel/gmake \ wayland-protocols>0:graphics/wayland-protocols 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 PLIST_FILES= bin/${PORTNAME} post-patch: # Extract (snapshot) version from the port instead of Git @${REINPLACE_CMD} -i .nogit -e '/Get git info/,/^#$$/d' \ -e 's/$${GIT_BRANCH}/main/' \ -e 's/$${GIT_COMMIT_HASH}/${GH_TAGNAME}/' \ -e '/$${GIT_COMMIT_MESSAGE}/d' \ -e 's/$${GIT_DIRTY}/portbld/' \ ${WRKSRC}/CMakeLists.txt # Drop unused dependencies @${REINPLACE_CMD} 's/ wlroots//' ${WRKSRC}/Makefile @${REINPLACE_CMD} -e 's/ pango pangocairo//' \ -e '/OpenGL/d; /GLESv2/d' \ -e '/ rt)/d' \ ${WRKSRC}/CMakeLists.txt pre-configure: @${SETENV} ${MAKE_ENV} ${GMAKE} protocols -C${WRKSRC} do-install: ${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/${PORTNAME} \ ${STAGEDIR}${PREFIX}/bin .include diff --git a/x11/xdg-desktop-portal-hyprland/Makefile b/x11/xdg-desktop-portal-hyprland/Makefile index 64407e6055df..486c2b6ead14 100644 --- a/x11/xdg-desktop-portal-hyprland/Makefile +++ b/x11/xdg-desktop-portal-hyprland/Makefile @@ -1,73 +1,74 @@ PORTNAME= xdg-desktop-portal-hyprland DISTVERSIONPREFIX= v DISTVERSION= 1.3.1 +PORTREVISION= 1 CATEGORIES= x11 wayland MAINTAINER= jbeich@FreeBSD.org COMMENT= xdg-desktop-portal backend for hyprland WWW= https://github.com/hyprwm/xdg-desktop-portal-hyprland LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= wayland-protocols>=1.31:graphics/wayland-protocols LIB_DEPENDS= libhyprlang.so:devel/hyprlang \ libsdbus-c++.so:devel/sdbus-cpp \ libdrm.so:graphics/libdrm \ libwayland-client.so:graphics/wayland \ libpipewire-0.3.so:multimedia/pipewire RUN_DEPENDS= grim:x11/grim \ slurp:x11/slurp FLAVORS= qt5 qt6 qt5_CONFLICTS_INSTALL= ${PORTNAME}-qt6 qt6_CONFLICTS_INSTALL= ${PORTNAME} qt6_PKGNAMESUFFIX= -qt6 USES= cmake compiler:c++11-lib gl pkgconfig qt:5 USE_GITHUB= yes USE_GL= gbm USE_QT= qmake:build buildtools:build core gui wayland:run widgets GH_ACCOUNT= hyprwm GH_TUPLE= hyprwm:hyprland-protocols:v0.2:hyprland_protocols/subprojects/hyprland-protocols LDFLAGS+= -Wl,--as-needed # GL, sdbus-cpp deps PLIST_FILES= bin/hyprland-share-picker \ lib/systemd/user/${PORTNAME}.service \ libexec/${PORTNAME} \ share/dbus-1/services/org.freedesktop.impl.portal.desktop.hyprland.service \ share/xdg-desktop-portal/portals/hyprland.portal .if ${FLAVOR:U} == qt6 USES:= ${USES:S/qt:5/qt:6/} USE_QT= base wayland:run .endif # XXX Drop after FreeBSD 14.0 EOL around 2025-03-01 .if exists(/usr/lib/libc++.so) && !exists(/usr/include/c++/v1/__format/write_escaped.h) CXXFLAGS+= -fexperimental-library .endif # XXX Drop after FreeBSD 13.2 EOL around 2024-05-01 (don't forget distinfo) .if ${CXX} == c++ && exists(/usr/lib/libc++.so) .if !exists(/usr/include/c++/v1/__ranges/as_rvalue_view.h) || make(makesum) || make(fetch) USES+= llvm:min=16,build,export PATH:= ${LLVM_PREFIX}/bin:${PATH} # XXX _CMAKE_TOOLCHAIN_SUFFIX vs. devel/llvm* CONFIGURE_ENV+= CC="${CC}" CXX="${CXX}" CPP="${CPP}" # XXX Move into separate port and standardize via USES GH_TUPLE+= llvm:llvm-project:llvmorg-16.0.1:libcxx CXXFLAGS+= -nostdinc++ -isystem${WRKDIR}/libcxx_prefix/include/c++/v1 # Don't link against new libc++ as it's not necessary #LDFLAGS+= -nostdlib++ -L${WRKDIR}/libcxx_prefix/lib -l:libc++.a -lcxxrt pre-configure: bundled-libcxx bundled-libcxx: @${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} \ -DLIBCXX_INCLUDE_BENCHMARKS:BOOL=OFF \ -DCMAKE_INSTALL_PREFIX:PATH=${WRKDIR}/libcxx_prefix \ -B ${WRKDIR}/libcxx_build -S ${WRKSRC_libcxx}/libcxx @${DO_MAKE_BUILD:NDESTDIR*} install -C ${WRKDIR}/libcxx_build .endif .endif # exists(/usr/lib/libc++.so) .include