From 32a66825278da27a9a2777d9f5940e37d712aec0 Mon Sep 17 00:00:00 2001 From: John McQuah Date: Mon, 16 Oct 2023 12:40:43 +0000 Subject: [PATCH] labwc: fix build when scdoc is not installed --- labwc/.footprint | 8 -------- labwc/.signature | 6 +++--- labwc/Pkgfile | 18 ++++++++++-------- 3 files changed, 13 insertions(+), 19 deletions(-) diff --git a/labwc/.footprint b/labwc/.footprint index fccee4d..71eea51 100644 --- a/labwc/.footprint +++ b/labwc/.footprint @@ -4,14 +4,6 @@ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/labwc drwxr-xr-x root/root usr/share/wayland-sessions/ drwxr-xr-x root/root usr/share/doc/ -drwxr-xr-x root/root usr/share/man/ -drwxr-xr-x root/root usr/share/man/man1/ -drwxr-xr-x root/root usr/share/man/man5/ --rw-r--r-- root/root usr/share/man/man5/labwc-theme.5.gz --rw-r--r-- root/root usr/share/man/man5/labwc-actions.5.gz --rw-r--r-- root/root usr/share/man/man5/labwc-menu.5.gz --rw-r--r-- root/root usr/share/man/man5/labwc-config.5.gz --rw-r--r-- root/root usr/share/man/man1/labwc.1.gz drwxr-xr-x root/root usr/share/doc/labwc/ -rw-r--r-- root/root usr/share/doc/labwc/rc.xml -rw-r--r-- root/root usr/share/doc/labwc/themerc diff --git a/labwc/.signature b/labwc/.signature index 7d3002b..adb0123 100644 --- a/labwc/.signature +++ b/labwc/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/jmq.pub -RWTTPlFarK9CxKifnLaNOIOUFvwOeENkTo5VgTSXNTvE8VypfHmlHZjqDGEg0sIFnmICcnNIiSrFSbvCLUcsThssSzwCPwZNRQk= -SHA256 (Pkgfile) = 0d081d53d71af0c78c1a4b0bb1e6c61399ef01e96f585b1fb117f9cda727b02b -SHA256 (.footprint) = 2d4d7cf72a8c1bb02b93ff22065fe62c709ab6b90523f4d703ed75dbc255a79d +RWTTPlFarK9CxDwtwLX8SYnjT84ocIAItUzV2R7qDcaXajOzhRqt8ex2Cv6Mkn90U49uSrHwscwjLcfseHiAIRtWP+ASiG1m6AI= +SHA256 (Pkgfile) = eb86632789c2f62a3eada604f5076a73d88b032a0f7aab061bf1eee20bd1a3bb +SHA256 (.footprint) = 0dc6a71ae8eae95ccd94eb97fcee76b857ab4b825a35f92721437caebaa904f7 SHA256 (labwc-0.6.5.tar.gz) = 7c56627c8098cf8b78ae0b045ff208f2815ba0a6cbab0c4a6a71128bafb81ff5 diff --git a/labwc/Pkgfile b/labwc/Pkgfile index a15a3f6..53c3061 100644 --- a/labwc/Pkgfile +++ b/labwc/Pkgfile @@ -2,7 +2,7 @@ # URL: https://github.com/labwc/labwc/ # Maintainer: John McQuah, jmcquah at disroot dot org # Depends on: wlroots pango -# Optional: xorg-xwayland +# Optional: xorg-xwayland scdoc name=labwc version=0.6.5 @@ -10,15 +10,17 @@ release=1 source=(https://github.com/$name/$name/archive/$version/$name-$version.tar.gz) build() { - prt-get isinst xorg-xwayland || PKGMK_LABWC="-D xwayland=disabled" + PKGMK_LABWC=(--prefix=/usr + --wrap-mode=nodownload + -Db_pie=true + -Db_lto=true) + prt-get isinst xorg-xwayland || PKGMK_LABWC+=(-Dxwayland=disabled) + prt-get isinst scdoc && PKGMK_LABWC+=(-Dman-pages=enabled) \ + || PKGMK_LABWC+=(-Dman-pages=disabled) - cd $name-* + cd $name-$version mkdir -p bld - meson setup bld --prefix=/usr $PKGMK_LABWC \ - --wrap-mode=nodownload \ - -Dman-pages=enabled \ - -Db_lto=true \ - -Db_pie=true + meson setup bld ${PKGMK_LABWC[@]} ninja -C bld -j ${JOBS:-1} DESTDIR=$PKG ninja -C bld install