From 939242fcdf46dc60987f331c699e941de9125426 Mon Sep 17 00:00:00 2001 From: Markus Volk Date: Wed, 2 Apr 2025 07:57:08 +0200 Subject: [PATCH] add manpages support --- recipes-extended/uwsm/uwsm_git.bb | 6 +++--- recipes-gtk/swappy/swappy_git.bb | 7 ++----- recipes-gtk/swaync/swaync_git.bb | 22 ++++++++++------------ recipes-gtk/waybar/waybar_git.bb | 4 ++-- recipes-support/kanshi/kanshi_git.bb | 4 ++-- recipes-support/mako/mako_git.bb | 5 ++--- recipes-support/swayidle/swayidle_git.bb | 4 ++-- recipes-support/swaylock/swaylock_git.bb | 6 +++--- recipes-support/wlsunset/wlsunset_git.bb | 7 ++++--- recipes-support/wob/wob_git.bb | 4 ++-- recipes-wlroots/labwc/labwc_git.bb | 4 ++-- 11 files changed, 34 insertions(+), 39 deletions(-) diff --git a/recipes-extended/uwsm/uwsm_git.bb b/recipes-extended/uwsm/uwsm_git.bb index 5120a2f..134d1b1 100644 --- a/recipes-extended/uwsm/uwsm_git.bb +++ b/recipes-extended/uwsm/uwsm_git.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/Vladimir-csp/uwsm" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=0bcdc63de832340797303f320ae6af32" -inherit meson pkgconfig +inherit meson pkgconfig manpages EXTRA_OEMESON = "-Dpython-bin=${bindir}/python3" @@ -16,8 +16,8 @@ PV = "0.20.5" S = "${WORKDIR}/git" -PACKAGECONFIG ?= "man-pages" -PACKAGECONFIG[man-pages] = "-Dman-pages=enabled,-Dman-pages=disabled,scdoc-native" +PACKAGECONFIG ?= "" +PACKAGECONFIG[manpages] = "-Dman-pages=enabled,-Dman-pages=disabled,scdoc-native" PACKAGECONFIG[uuctl] = "-Duuctl=enabled,-Duuctl=disabled,,fuzzel" FILES:${PN} += "${datadir}/licenses" diff --git a/recipes-gtk/swappy/swappy_git.bb b/recipes-gtk/swappy/swappy_git.bb index 4813ad8..2face7b 100644 --- a/recipes-gtk/swappy/swappy_git.bb +++ b/recipes-gtk/swappy/swappy_git.bb @@ -11,7 +11,7 @@ DEPENDS = " \ RRECOMMENDS:${PN} = "grim slurp" -inherit meson gtk-icon-cache mime-xdg pkgconfig +inherit meson gtk-icon-cache mime-xdg pkgconfig manpages SRC_URI = " \ git://github.com/jtheoof/swappy.git;protocol=https;branch=master \ @@ -21,7 +21,4 @@ S = "${WORKDIR}/git" PV = "1.5.1" SRCREV = "a996b2cec65aadd04ded780f141b02c5bdfbeb32" -PACKAGECONFIG[man-pages] = "-Dman-pages=enabled,-Dman-pages=disabled,scdoc-native" - -PACKAGECONFIG ?= "man-pages" - +PACKAGECONFIG[manpages] = "-Dman-pages=enabled,-Dman-pages=disabled,scdoc-native" diff --git a/recipes-gtk/swaync/swaync_git.bb b/recipes-gtk/swaync/swaync_git.bb index 46a630d..dc2ecd1 100644 --- a/recipes-gtk/swaync/swaync_git.bb +++ b/recipes-gtk/swaync/swaync_git.bb @@ -23,23 +23,21 @@ S = "${WORKDIR}/git" PV = "0.10.1" SRCREV = "4275fa3915c12ad2731ff78027188b4b7ceaad64" -PACKAGECONFIG[bash] = "-Dbash-completions=true,-Dbash-completions=false" -PACKAGECONFIG[fish] = "-Dfish-completions=true,-Dfish-completions=false" -PACKAGECONFIG[man-pages] = "-Dman-pages=true,-Dman-pages=false,scdoc-native" -PACKAGECONFIG[scripting] = "-Dscripting=true,-Dscripting=false" -PACKAGECONFIG[systemd] = "-Dsystemd-service=true,-Dsystemd-service=false" -PACKAGECONFIG[zsh] = "-Dzsh-completions=true,-Dzsh-completions=false" - -PACKAGECONFIG ?= " \ - bash \ -" - -inherit meson pkgconfig vala +inherit meson pkgconfig vala manpages VALA_MESON_OPTION = "" EXTRA_OEMESON += "--buildtype release" +PACKAGECONFIG[bash] = "-Dbash-completions=true,-Dbash-completions=false" +PACKAGECONFIG[fish] = "-Dfish-completions=true,-Dfish-completions=false" +PACKAGECONFIG[manpages] = "-Dman-pages=true,-Dman-pages=false,scdoc-native" +PACKAGECONFIG[scripting] = "-Dscripting=true,-Dscripting=false" +PACKAGECONFIG[systemd] = "-Dsystemd-service=true,-Dsystemd-service=false" +PACKAGECONFIG[zsh] = "-Dzsh-completions=true,-Dzsh-completions=false" + +PACKAGECONFIG ?= "bash" + FILES:${PN} += "${datadir}" BBCLASSEXTEND = "" diff --git a/recipes-gtk/waybar/waybar_git.bb b/recipes-gtk/waybar/waybar_git.bb index e63ee28..fabf641 100644 --- a/recipes-gtk/waybar/waybar_git.bb +++ b/recipes-gtk/waybar/waybar_git.bb @@ -34,7 +34,7 @@ DEPENDS += " \ wayland-protocols \ " -inherit meson pkgconfig features_check +inherit meson pkgconfig features_check manpages PACKAGECONFIG[libcxx] = "-Dlibcxx=true,-Dlibcxx=false,libcxx clang-tidy" PACKAGECONFIG[dbusmenu-gtk] = "-Ddbusmenu-gtk=enabled,-Ddbusmenu-gtk=disabled,libdbusmenu-gtk" @@ -43,7 +43,7 @@ PACKAGECONFIG[experimental] = "-Dexperimental=true,-Dexperimental=false" PACKAGECONFIG[jack] = "-Djack=enabled,-Djack=disabled,jack" PACKAGECONFIG[libinput] = "-Dlibinput=enabled,-Dlibinput=disabled,libinput" PACKAGECONFIG[logind] = "-Dlogind=enabled,-Dlogind=disabled,systemd" -PACKAGECONFIG[man_pages] = "-Dman-pages=enabled,-Dman-pages=disabled,scdoc-native" +PACKAGECONFIG[manpages] = "-Dman-pages=enabled,-Dman-pages=disabled,scdoc-native" PACKAGECONFIG[mpd] = "-Dmpd=enabled,-Dmpd=disabled,libmpdclient" PACKAGECONFIG[mpris] = "-Dmpris=enabled,-Dmpris=disabled,playerctl" PACKAGECONFIG[network] = "-Dlibnl=enabled,-Dlibnl=disabled,libnl" diff --git a/recipes-support/kanshi/kanshi_git.bb b/recipes-support/kanshi/kanshi_git.bb index 7feb345..15ef563 100644 --- a/recipes-support/kanshi/kanshi_git.bb +++ b/recipes-support/kanshi/kanshi_git.bb @@ -13,10 +13,10 @@ SRC_URI = " \ DEPENDS = "wayland wayland-native libscfg" -inherit meson pkgconfig features_check +inherit meson pkgconfig features_check manpages PACKAGECONFIG[ipc] = "-Dipc=enabled,-Dipc=disabled,libvarlink" -PACKAGECONFIG[man-pages] = "-Dman-pages=enabled,-Dman-pages=disabled,scdoc-native" +PACKAGECONFIG[manpages] = "-Dman-pages=enabled,-Dman-pages=disabled,scdoc-native" PACKAGECONFIG ?= " \ ipc \ diff --git a/recipes-support/mako/mako_git.bb b/recipes-support/mako/mako_git.bb index b3f6db7..16f37b6 100644 --- a/recipes-support/mako/mako_git.bb +++ b/recipes-support/mako/mako_git.bb @@ -24,18 +24,17 @@ RDEPENDS:${PN} = "dbus" RRECOMMENDS:${PN} = "jq" -inherit meson pkgconfig features_check +inherit meson pkgconfig features_check manpages PACKAGECONFIG[systemd] = ",,systemd" PACKAGECONFIG[sysvinit] = ",,elogind" -PACKAGECONFIG[man-pages] = ",,scdoc-native" +PACKAGECONFIG[manpages] = ",,scdoc-native" PACKAGECONFIG[icons] = ",,gdk-pixbuf" PACKAGECONFIG ?= " \ ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ ${@bb.utils.filter('DISTRO_FEATURES', 'sysvinit', d)} \ icons \ - man-pages \ " S = "${WORKDIR}/git" diff --git a/recipes-support/swayidle/swayidle_git.bb b/recipes-support/swayidle/swayidle_git.bb index 0d85df8..e98c628 100644 --- a/recipes-support/swayidle/swayidle_git.bb +++ b/recipes-support/swayidle/swayidle_git.bb @@ -22,11 +22,11 @@ S = "${WORKDIR}/git" PV = "1.8.0" SRCREV = "f554943bec003c2f70306123bd8db18465fcc3e4" -inherit meson pkgconfig features_check +inherit meson pkgconfig features_check manpages PACKAGECONFIG[systemd] = "-Dlogind-provider=systemd,,systemd" PACKAGECONFIG[sysvinit] = "-Dlogind-provider=elogind,,elogind" -PACKAGECONFIG[man-pages] = ",,scdoc-native" +PACKAGECONFIG[manpages] = ",,scdoc-native" PACKAGECONFIG ?= " \ ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ diff --git a/recipes-support/swaylock/swaylock_git.bb b/recipes-support/swaylock/swaylock_git.bb index 85fafaf..aade710 100644 --- a/recipes-support/swaylock/swaylock_git.bb +++ b/recipes-support/swaylock/swaylock_git.bb @@ -16,6 +16,8 @@ DEPENDS = " \ wayland-protocols \ " +inherit meson pkgconfig features_check manpages + SRC_URI = " \ git://github.com/swaywm/swaylock.git;protocol=https;branch=master \ " @@ -26,7 +28,7 @@ SRCREV = "bd2dfec9ae0111b1858d5fab44f0f4fac4117d07" PACKAGECONFIG[pam] = ",,libpam" PACKAGECONFIG[gdk-pixbuf] = ",,gdk-pixbuf" -PACKAGECONFIG[man-pages] = ",,scdoc-native" +PACKAGECONFIG[manpages] = ",,scdoc-native" PACKAGECONFIG ?= " \ gdk-pixbuf \ @@ -36,8 +38,6 @@ PACKAGECONFIG ?= " \ # Reproducibility issue. Fix me! CFLAGS:append = " -Wno-error=date-time" -inherit meson pkgconfig features_check - EXTRA_OEMESON += "--buildtype release" FILES:${PN} += "${datadir}" diff --git a/recipes-support/wlsunset/wlsunset_git.bb b/recipes-support/wlsunset/wlsunset_git.bb index 6161542..b645c18 100644 --- a/recipes-support/wlsunset/wlsunset_git.bb +++ b/recipes-support/wlsunset/wlsunset_git.bb @@ -14,17 +14,18 @@ DEPENDS += " \ wayland-protocols \ " +inherit meson pkgconfig features_check manpages + SRC_URI = "git://git.sr.ht/~kennylevinsen/wlsunset;protocol=https;nobranch=1" -PACKAGECONFIG[man-pages] = ",,scdoc-native" +PACKAGECONFIG[manpages] = ",,scdoc-native" + S = "${WORKDIR}/git" PV = "0.4.0" SRCREV = "634c8ebc53a31d4e5ed394f7950760deb5322102" -inherit meson pkgconfig features_check - EXTRA_OEMESON += "--buildtype release" BBCLASSEXTEND = "" diff --git a/recipes-support/wob/wob_git.bb b/recipes-support/wob/wob_git.bb index 1d1380e..5fa92c1 100644 --- a/recipes-support/wob/wob_git.bb +++ b/recipes-support/wob/wob_git.bb @@ -18,10 +18,10 @@ DEPENDS = " \ wayland-protocols \ " -inherit meson pkgconfig features_check +inherit meson pkgconfig features_check manpages PACKAGECONFIG[seccomp] = "-Dseccomp=enabled,-Dseccomp=disabled,libseccomp" -PACKAGECONFIG[man-pages] = "-Dman-pages=enabled,-Dman-pages=disabled,scdoc-native" +PACKAGECONFIG[manpages] = "-Dman-pages=enabled,-Dman-pages=disabled,scdoc-native" PACKAGECONFIG ??= "" diff --git a/recipes-wlroots/labwc/labwc_git.bb b/recipes-wlroots/labwc/labwc_git.bb index 216b4c6..710b472 100644 --- a/recipes-wlroots/labwc/labwc_git.bb +++ b/recipes-wlroots/labwc/labwc_git.bb @@ -39,11 +39,11 @@ SRCREV = "1fe4797a9d29b5094c9e38c336752d7f57ed593f" PV = "0.8.3" S = "${WORKDIR}/git" -inherit meson pkgconfig features_check gettext +inherit meson pkgconfig features_check gettext manpages PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'xwayland', d)}" -PACKAGECONFIG[man-pages] = "-Dman-pages=enabled,-Dman-pages=disabled,scdoc-native" +PACKAGECONFIG[manpages] = "-Dman-pages=enabled,-Dman-pages=disabled,scdoc-native" PACKAGECONFIG[xwayland] = "-Dxwayland=enabled,-Dxwayland=disabled,libxcb xcb-util-wm xcb-util-renderutil xwayland,xwayland" FILES:${PN} += "${datadir}"