diff --git a/x11-wm/wlmaker/Makefile b/x11-wm/wlmaker/Makefile index c9b1226a5c02..44254edd7cad 100644 --- a/x11-wm/wlmaker/Makefile +++ b/x11-wm/wlmaker/Makefile @@ -1,53 +1,52 @@ PORTNAME= wlmaker DISTVERSIONPREFIX= v -DISTVERSION= 0.1-430 -DISTVERSIONSUFFIX= -ged7a302 +DISTVERSION= 0.1-433 +DISTVERSIONSUFFIX= -g5a6b8ab CATEGORIES= x11-wm wayland PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCHFILES+= 0179c3c5a837.patch:-p1 # https://github.com/phkaeser/libbase/pull/2 PATCHFILES+= 811db3b1582a.patch:-p1 # https://github.com/phkaeser/libbase/pull/2 PATCHFILES+= 486758619471.patch:-p1 # https://github.com/phkaeser/wlmaker/pull/11 PATCHFILES+= 3a64446b128a.patch:-p1 # https://github.com/phkaeser/wlmaker/pull/11 PATCHFILES+= 2a7108e964e0.patch:-p1 # https://github.com/phkaeser/wlmaker/pull/11 MAINTAINER= jbeich@FreeBSD.org COMMENT= Wayland compositor inspired by Window Maker WWW= https://github.com/phkaeser/wlmaker LICENSE= APACHE20 BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ wayland-protocols>=1.31:graphics/wayland-protocols LIB_DEPENDS= libepoll-shim.so:devel/libepoll-shim \ libwayland-server.so:graphics/wayland \ libwlroots.so:x11-toolkits/wlroots \ libxkbcommon.so:x11/libxkbcommon RUN_DEPENDS= foot:x11/foot USES= cmake compiler:c11 gnome pkgconfig USE_GITHUB= yes USE_GNOME= cairo GH_ACCOUNT= phkaeser -GH_TUPLE= phkaeser:libbase:c215f7d:libbase/submodules/libbase +GH_TUPLE= phkaeser:libbase:9a7149e:libbase/submodules/libbase CFLAGS+= -ffile-prefix-map="${WRKSRC}"= -LDFLAGS+= -Wl,--as-needed # https://github.com/phkaeser/wlmaker/issues/12 PLIST_FILES= bin/${PORTNAME} \ bin/wlmclock \ share/icons/${PORTNAME}/chrome-48x48.png \ share/icons/${PORTNAME}/clip-48x48.png \ share/icons/${PORTNAME}/firefox-48x48.png \ share/icons/${PORTNAME}/terminal-48x48.png \ ${NULL} post-patch: # Drop dependency on unreleased version of libwayland @${REINPLACE_CMD} -e 's/1\.22\.90/1.22.0/' \ ${WRKSRC}/CMakeLists.txt # Respect LOCALBASE for apps and use open source Chrome @${REINPLACE_CMD} -e 's,/usr/bin,${LOCALBASE}/bin,' \ -e 's/google-chrome/chrome/' \ ${WRKSRC}/src/dock.c \ ${WRKSRC}/src/${PORTNAME}.c .include diff --git a/x11-wm/wlmaker/distinfo b/x11-wm/wlmaker/distinfo index b4477571104b..a966ae85c9c5 100644 --- a/x11-wm/wlmaker/distinfo +++ b/x11-wm/wlmaker/distinfo @@ -1,15 +1,15 @@ -TIMESTAMP = 1705242599 -SHA256 (phkaeser-wlmaker-v0.1-430-ged7a302_GH0.tar.gz) = 468eb262a62fdf66423a318f69252d14d74e074cce4cf31daf8fcdfc9a9ea6eb -SIZE (phkaeser-wlmaker-v0.1-430-ged7a302_GH0.tar.gz) = 249717 -SHA256 (phkaeser-libbase-c215f7d_GH0.tar.gz) = 11030b84111982bc175e23d3eced8449585a46ccaa0b2ea1c23d661592f53974 -SIZE (phkaeser-libbase-c215f7d_GH0.tar.gz) = 94029 +TIMESTAMP = 1705524503 +SHA256 (phkaeser-wlmaker-v0.1-433-g5a6b8ab_GH0.tar.gz) = 5c5ce28c65cb62abd39e1c77511cc16007d7234fa7eeffa14417102920d9a8d1 +SIZE (phkaeser-wlmaker-v0.1-433-g5a6b8ab_GH0.tar.gz) = 249691 +SHA256 (phkaeser-libbase-9a7149e_GH0.tar.gz) = 843f7fdf09549629a8226f82178f87a374885adf0bf98d1614ea22125dc78c30 +SIZE (phkaeser-libbase-9a7149e_GH0.tar.gz) = 94018 SHA256 (0179c3c5a837.patch) = 09b1426585e20d4bf5965d0593f71fba55d2b3d034aca59339fbd707a9ce194c SIZE (0179c3c5a837.patch) = 1664 SHA256 (811db3b1582a.patch) = 672f946d56596238837544e5d950791c307a98a66f191ae6a6d4ca7b882df261 SIZE (811db3b1582a.patch) = 1300 SHA256 (486758619471.patch) = 0226ca4162f451b5ba0ed0d98e29b9b7458500f21b4dc6033902d4beeade9189 SIZE (486758619471.patch) = 1113 SHA256 (3a64446b128a.patch) = 6ac2464a4f6675bdb19d144857037785c2153213786af6f330401a447a05e70d SIZE (3a64446b128a.patch) = 906 SHA256 (2a7108e964e0.patch) = e32e575ef56ef9b7c24605ae58139009a83459010580244210cbade860a4945d SIZE (2a7108e964e0.patch) = 971 diff --git a/x11-wm/wlmaker/files/patch-apps_CMakeLists.txt b/x11-wm/wlmaker/files/patch-apps_CMakeLists.txt deleted file mode 100644 index a7a3fa65390c..000000000000 --- a/x11-wm/wlmaker/files/patch-apps_CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -https://github.com/phkaeser/wlmaker/issues/13 - ---- apps/CMakeLists.txt.orig 2024-01-14 14:29:59 UTC -+++ apps/CMakeLists.txt -@@ -19,3 +19,4 @@ TARGET_LINK_LIBRARIES(wlmclock libwlclient primitives - ADD_EXECUTABLE(wlmclock wlmclock.c) - TARGET_INCLUDE_DIRECTORIES(wlmclock PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) - TARGET_LINK_LIBRARIES(wlmclock libwlclient primitives m) -+INSTALL(TARGETS wlmclock DESTINATION bin)