git: 5e92280324c8 - main - x11-wm/hyprland-devel: remove until enough upstream changes accumulate
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 03 May 2023 17:35:04 UTC
The branch main has been updated by jbeich:
URL: https://cgit.FreeBSD.org/ports/commit/?id=5e92280324c80defb51c60472f27c7788ffca55d
commit 5e92280324c80defb51c60472f27c7788ffca55d
Author: Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2023-05-03 17:07:25 +0000
Commit: Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2023-05-03 17:34:07 +0000
x11-wm/hyprland-devel: remove until enough upstream changes accumulate
---
MOVED | 1 +
x11-wm/Makefile | 1 -
x11-wm/hyprland-devel/Makefile | 96 ------------------------
x11-wm/hyprland-devel/distinfo | 9 ---
x11-wm/hyprland-devel/files/patch-system-wlroots | 26 -------
x11-wm/hyprland-devel/pkg-descr | 5 --
x11-wm/hyprland-devel/pkg-message | 10 ---
x11-wm/hyprland-devel/pkg-plist | 10 ---
8 files changed, 1 insertion(+), 157 deletions(-)
diff --git a/MOVED b/MOVED
index 37b6d7c68db6..19e728542eab 100644
--- a/MOVED
+++ b/MOVED
@@ -12753,3 +12753,4 @@ textproc/ltxml||2023-04-30|Has expired: Unfetchable
graphics/ImageMagick7-nox11|graphics/ImageMagick7|2023-04-30|Flavorized
graphics/ImageMagick6-nox11|graphics/ImageMagick6|2023-04-30|Flavorized
security/gpgme-qt5|security/gpgme-qt@qt5|2023-05-02|Flavorized to add Qt6 support
+x11-wm/hyprland-devel|x11-wm/hyprland|2023-05-03|Out of date: use x11-wm/hyprland for now
diff --git a/x11-wm/Makefile b/x11-wm/Makefile
index 6424224f90dd..9730356163eb 100644
--- a/x11-wm/Makefile
+++ b/x11-wm/Makefile
@@ -47,7 +47,6 @@
SUBDIR += hikari
SUBDIR += hs-xmonad
SUBDIR += hyprland
- SUBDIR += hyprland-devel
SUBDIR += i3
SUBDIR += icewm
SUBDIR += ittywm
diff --git a/x11-wm/hyprland-devel/Makefile b/x11-wm/hyprland-devel/Makefile
deleted file mode 100644
index 3bc118167ffe..000000000000
--- a/x11-wm/hyprland-devel/Makefile
+++ /dev/null
@@ -1,96 +0,0 @@
-PORTNAME= hyprland
-DISTVERSIONPREFIX= v
-DISTVERSION= 0.24.1-134
-DISTVERSIONSUFFIX= -gc949173b
-CATEGORIES= x11-wm wayland
-PKGNAMESUFFIX= -devel
-
-MAINTAINER= jbeich@FreeBSD.org
-COMMENT= Dynamic tiling Wayland compositor that doesn't sacrifice on its looks (development snapshot) #'
-WWW= https://hyprland.org/
-
-LICENSE= BSD3CLAUSE
-LICENSE_FILE= ${WRKSRC}/LICENSE
-
-BUILD_DEPENDS= cmake:devel/cmake-core \
- evdev-proto>0:devel/evdev-proto \
- wayland-protocols>=1.25:graphics/wayland-protocols \
- wlroots>=0.16.0.346<0.17.0:x11-toolkits/wlroots
-LIB_DEPENDS= libwayland-server.so:graphics/wayland \
- libwlroots.so:x11-toolkits/wlroots \
- libinput.so:x11/libinput \
- libxkbcommon.so:x11/libxkbcommon
-
-USES= compiler:c++11-lib gl gnome meson pkgconfig xorg
-USE_GITHUB= yes
-USE_GL= egl opengl
-USE_GNOME= cairo pango
-USE_XORG= pixman
-GH_ACCOUNT= hyprwm
-GH_PROJECT= Hyprland
-GH_TUPLE= hyprwm:hyprland-protocols:4d29e48:hyprland_protocols/subprojects/hyprland-protocols \
- canihavesomecoffee:udis86:1.7.2-186-g5336633:udis86/subprojects/udis86
-MESON_ARGS= -Dsystemd=disabled
-
-CONFLICTS_INSTALL= ${PORTNAME}
-
-OPTIONS_DEFINE= X11
-OPTIONS_DEFAULT=X11
-
-X11_USE= XORG=xcb
-X11_MESON_ENABLED= xwayland
-
-post-patch:
-# Extract (snapshot) version from the port instead of meson.build
- @${REINPLACE_CMD} -i .nogit -e "/GIT_BRANCH/s/run_command.*/'main'/" \
- -e "/GIT_COMMIT_HASH/s/run_command.*/'${DISTVERSIONFULL}'/" \
- -e "/GIT_COMMIT_MESSAGE/d" \
- -e "/GIT_DIRTY/s/run_command.*/'portbld'/" \
- -e "/version.*jq/s/run_command.*/'${DISTVERSIONFULL}',/" \
- ${WRKSRC}/meson.build
-# Respect PREFIX for wallpapers
- @${REINPLACE_CMD} 's,/usr/share,${DATADIR:H},' \
- ${WRKSRC}/src/render/OpenGL.cpp
-# Respect LOCALBASE for xdg-desktop-portal-hyprland installation
- @${REINPLACE_CMD} 's,/usr/share,${LOCALBASE}/share,g' \
- ${WRKSRC}/src/Compositor.cpp
-
-.ifdef GH_TUPLE
-post-configure:
- @${REINPLACE_CMD} 's/meson install/& \
- --skip-subprojects/' ${BUILD_WRKSRC}/build.ninja
-.endif
-
-post-install:
-# Plugin API installs all headers (no private vs. public)
- @(cd ${STAGEDIR}${PREFIX} && ${FIND} include/${PORTNAME} ! -type d) >>${TMPPLIST}
-
-# 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
-PATH:= ${LLVM_PREFIX}/bin:${PATH} # XXX _CMAKE_TOOLCHAIN_SUFFIX vs. devel/llvm*
-CC= clang${LLVM_VERSION}
-CXX= clang++${LLVM_VERSION}
-CPP= clang-cpp${LLVM_VERSION}
-CONFIGURE_ENV+= CC="${CC}" CXX="${CXX}" CPP="${CPP}"
-CMAKE_BIN= ${LOCALBASE}/bin/cmake
-
-# 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 "${.CURDIR:H:H}/x11-toolkits/wlroots-devel/override.mk"
-.include <bsd.port.mk>
diff --git a/x11-wm/hyprland-devel/distinfo b/x11-wm/hyprland-devel/distinfo
deleted file mode 100644
index 26bde8b8d3dd..000000000000
--- a/x11-wm/hyprland-devel/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-TIMESTAMP = 1682976507
-SHA256 (hyprwm-Hyprland-v0.24.1-134-gc949173b_GH0.tar.gz) = 0fe1769b58684c9a68438b3fec014332388bac3a3ef9d2998952c43f933dfab6
-SIZE (hyprwm-Hyprland-v0.24.1-134-gc949173b_GH0.tar.gz) = 766367
-SHA256 (hyprwm-hyprland-protocols-4d29e48_GH0.tar.gz) = 1384ccdbb0149cdc40d74fbe21fba97d706db08b718c7df9481076381d852c74
-SIZE (hyprwm-hyprland-protocols-4d29e48_GH0.tar.gz) = 6340
-SHA256 (canihavesomecoffee-udis86-1.7.2-186-g5336633_GH0.tar.gz) = 69aff959179ff6247b375b92e797221dbd8e078eabbf1366280b0532617e7fb8
-SIZE (canihavesomecoffee-udis86-1.7.2-186-g5336633_GH0.tar.gz) = 116938
-SHA256 (llvm-llvm-project-llvmorg-16.0.1_GH0.tar.gz) = b5a9ff1793b1e2d388a3819bf35797002b1d2e40bb35a10c65605e0ea1435271
-SIZE (llvm-llvm-project-llvmorg-16.0.1_GH0.tar.gz) = 179289803
diff --git a/x11-wm/hyprland-devel/files/patch-system-wlroots b/x11-wm/hyprland-devel/files/patch-system-wlroots
deleted file mode 100644
index 0f099fd8359d..000000000000
--- a/x11-wm/hyprland-devel/files/patch-system-wlroots
+++ /dev/null
@@ -1,26 +0,0 @@
-Allow system wlroots to reduce maintenance (wlroots has tons of options)
-
---- meson.build.orig 2023-03-14 21:56:31 UTC
-+++ meson.build
-@@ -39,8 +39,8 @@ add_project_arguments(
- ],
- language: 'cpp')
-
--wlroots = subproject('wlroots', default_options: ['examples=false'])
--have_xwlr = wlroots.get_variable('features').get('xwayland')
-+wlroots = dependency('wlroots', version: ['>=0.17.0', '<0.18.0'], default_options: ['examples=false'])
-+have_xwlr = wlroots.get_variable(pkgconfig: 'have_xwayland', internal: 'have_xwayland') == 'true'
- xcb_dep = dependency('xcb', required: get_option('xwayland'))
-
- cmake = import('cmake')
---- src/meson.build.orig 2023-03-14 21:56:31 UTC
-+++ src/meson.build
-@@ -7,7 +7,7 @@ executable('Hyprland', src,
- server_protos,
- dependency('wayland-server'),
- dependency('wayland-client'),
-- wlroots.get_variable('wlroots'),
-+ wlroots,
- dependency('cairo'),
- dependency('libdrm'),
- dependency('egl'),
diff --git a/x11-wm/hyprland-devel/pkg-descr b/x11-wm/hyprland-devel/pkg-descr
deleted file mode 100644
index 20c74f73f889..000000000000
--- a/x11-wm/hyprland-devel/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-Hyprland is a dynamic tiling Wayland compositor based on wlroots that
-doesn't sacrifice on its looks.
-
-It supports multiple layouts, fancy effects, has a very flexible IPC
-model allowing for a lot of customization, and more.
diff --git a/x11-wm/hyprland-devel/pkg-message b/x11-wm/hyprland-devel/pkg-message
deleted file mode 100644
index 55c7dfda1748..000000000000
--- a/x11-wm/hyprland-devel/pkg-message
+++ /dev/null
@@ -1,10 +0,0 @@
-[
-{ type: install
- message: <<EOM
-Additional packages recommended for new users:
-- hyprpaper
-- hyprpicker
-- xdg-desktop-portal-hyprland
-EOM
-}
-]
diff --git a/x11-wm/hyprland-devel/pkg-plist b/x11-wm/hyprland-devel/pkg-plist
deleted file mode 100644
index 63775edfaec7..000000000000
--- a/x11-wm/hyprland-devel/pkg-plist
+++ /dev/null
@@ -1,10 +0,0 @@
-bin/Hyprland
-bin/hyprctl
-man/man1/Hyprland.1.gz
-man/man1/hyprctl.1.gz
-%%DATADIR%%/hyprland.conf
-%%DATADIR%%/wall_2K.png
-%%DATADIR%%/wall_4K.png
-%%DATADIR%%/wall_8K.png
-share/pkgconfig/hyprland.pc
-share/wayland-sessions/hyprland.desktop