Date: Wednesday, July 10, 2019 @ 16:09:05 Author: eschwartz Revision: 488582
use samurai as replacement ninja implementation in all my packages samurai is <3 Modified: cinnamon-desktop/trunk/PKGBUILD cinnamon-menus/trunk/PKGBUILD cinnamon-session/trunk/PKGBUILD ksh/trunk/PKGBUILD nemo-extensions/trunk/PKGBUILD xed/trunk/PKGBUILD xreader/trunk/PKGBUILD ---------------------------------+ cinnamon-desktop/trunk/PKGBUILD | 6 +++--- cinnamon-menus/trunk/PKGBUILD | 6 +++--- cinnamon-session/trunk/PKGBUILD | 6 +++--- ksh/trunk/PKGBUILD | 8 +++++--- nemo-extensions/trunk/PKGBUILD | 6 +++--- xed/trunk/PKGBUILD | 6 +++--- xreader/trunk/PKGBUILD | 6 +++--- 7 files changed, 23 insertions(+), 21 deletions(-) Modified: cinnamon-desktop/trunk/PKGBUILD =================================================================== --- cinnamon-desktop/trunk/PKGBUILD 2019-07-10 16:02:42 UTC (rev 488581) +++ cinnamon-desktop/trunk/PKGBUILD 2019-07-10 16:09:05 UTC (rev 488582) @@ -10,7 +10,7 @@ url="https://github.com/linuxmint/${pkgname}"; license=('GPL' 'LGPL') depends=('accountsservice' 'gtk3' 'libxkbfile' 'libpulse') -makedepends=('meson' 'gobject-introspection' 'intltool') +makedepends=('meson' 'samurai' 'gobject-introspection' 'intltool') source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/${pkgver}.tar.gz" "config.patch") sha256sums=('e7e6e9aa6e5c5c04a8320cb97ef545700826d04fc34e0f50d140d2efa41941a1' @@ -29,11 +29,11 @@ cd "${srcdir}"/${pkgname}-${pkgver}/build meson --prefix=/usr --buildtype=plain .. - ninja + samu } package() { cd "${srcdir}"/${pkgname}-${pkgver}/build - DESTDIR="${pkgdir}" ninja install + DESTDIR="${pkgdir}" samu install } Modified: cinnamon-menus/trunk/PKGBUILD =================================================================== --- cinnamon-menus/trunk/PKGBUILD 2019-07-10 16:02:42 UTC (rev 488581) +++ cinnamon-menus/trunk/PKGBUILD 2019-07-10 16:09:05 UTC (rev 488582) @@ -9,7 +9,7 @@ url="https://github.com/linuxmint/${pkgname}"; license=('GPL' 'LGPL') depends=('glib2') -makedepends=('gobject-introspection' 'meson') +makedepends=('gobject-introspection' 'meson' 'samurai') source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/${pkgver}.tar.gz") sha256sums=('331bd599d7a863fa92329483637de159c25c57467305691f9768e675cd63f7c2') b2sums=('80cf245fb6b6d02f4a609d68f2b35252da22601d7f7f2f42dd28a5bc193b1d0cd332bc85251f9c2e43038069453b3e61456319f4f50166e86c32a95339d88e11') @@ -21,11 +21,11 @@ meson --prefix=/usr \ --buildtype=plain \ .. - ninja + samu } package(){ cd "${srcdir}"/${pkgname}-${pkgver}/build - DESTDIR="${pkgdir}" ninja install + DESTDIR="${pkgdir}" samu install } Modified: cinnamon-session/trunk/PKGBUILD =================================================================== --- cinnamon-session/trunk/PKGBUILD 2019-07-10 16:02:42 UTC (rev 488581) +++ cinnamon-session/trunk/PKGBUILD 2019-07-10 16:09:05 UTC (rev 488582) @@ -11,7 +11,7 @@ license=('GPL' 'LGPL') depends=('cinnamon-desktop' 'dbus-glib' 'libsm' 'libcanberra' 'xapps') optdepends=('cinnamon-translations: i18n') -makedepends=('meson' 'xtrans') +makedepends=('meson' 'samurai' 'xtrans') source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/${pkgver}.tar.gz") sha256sums=('bff38239942dc990ccb57c35bde43c19ebc8708284410de53c100e12c7005663') b2sums=('1d84e67690d95584a529c10462c2156a3ab3048a26a7e2f695584dcb66bb13c4a885e13e161e7e38a359f96ba7813c3f69209ced2fd02a30996d5773e3b2cda2') @@ -26,11 +26,11 @@ -Dwith-gconf=false \ -Dwith-docbook=false \ .. - ninja + samu } package() { cd "${srcdir}"/${pkgname}-${pkgver}/build - DESTDIR="${pkgdir}" ninja install + DESTDIR="${pkgdir}" samu install } Modified: ksh/trunk/PKGBUILD =================================================================== --- ksh/trunk/PKGBUILD 2019-07-10 16:02:42 UTC (rev 488581) +++ ksh/trunk/PKGBUILD 2019-07-10 16:09:05 UTC (rev 488582) @@ -8,7 +8,7 @@ arch=('x86_64') url="http://kornshell.org/"; license=('EPL') -makedepends=('meson') +makedepends=('meson' 'samurai') checkdepends=('ed' 'vi' 'expect' 'openbsd-netcat') provides=('ksh93') install=ksh.install @@ -19,6 +19,8 @@ 'SKIP') validpgpkeys=('4BF045ACC726FE4E9DFC1D7762213CE2D3CB82EA') # Siteshwar Vashisht <[email protected]> +export NINJA=/usr/bin/samu + build() { mkdir -p "${srcdir}"/ksh-${_pkgver}/build cd "${srcdir}"/ksh-${_pkgver}/build @@ -26,7 +28,7 @@ meson --prefix /usr \ --buildtype=plain \ .. - ninja + samu } check() { @@ -39,6 +41,6 @@ package() { cd "${srcdir}"/ksh-${_pkgver}/build - DESTDIR="${pkgdir}" ninja install + DESTDIR="${pkgdir}" samu install ln -s ksh "${pkgdir}"/usr/bin/ksh93 } Modified: nemo-extensions/trunk/PKGBUILD =================================================================== --- nemo-extensions/trunk/PKGBUILD 2019-07-10 16:02:42 UTC (rev 488581) +++ nemo-extensions/trunk/PKGBUILD 2019-07-10 16:09:05 UTC (rev 488582) @@ -27,7 +27,7 @@ _preview_deps=('cjs' 'clutter-gtk' 'clutter-gst' 'libmusicbrainz5' 'gtksourceview3' 'xreader') _python_deps=('python-gobject') _seahorse_deps=('libcryptui' 'libgnome-keyring') -makedepends=('intltool' 'gobject-introspection' 'meson') +makedepends=('intltool' 'gobject-introspection' 'meson' 'samurai') makedepends+=("${_preview_deps[@]}" "${_python_deps[@]}" "${_seahorse_deps[@]}") options=('!emptydirs') source=("${pkgbase}-${pkgver}.tar.gz::${url}/archive/${pkgver}.tar.gz") @@ -72,7 +72,7 @@ mkdir -p nemo-python/build pushd nemo-python/build meson --prefix=/usr --buildtype=plain .. - ninja + samu # # nemo-pastebin # cd nemo-pastebin @@ -116,7 +116,7 @@ depends+=("${_python_deps[@]}") cd "${srcdir}"/${pkgbase}-${pkgver}/${pkgname}/build - DESTDIR="${pkgdir}" ninja install + DESTDIR="${pkgdir}" samu install } package_nemo-seahorse(){ Modified: xed/trunk/PKGBUILD =================================================================== --- xed/trunk/PKGBUILD 2019-07-10 16:02:42 UTC (rev 488581) +++ xed/trunk/PKGBUILD 2019-07-10 16:09:05 UTC (rev 488582) @@ -10,7 +10,7 @@ license=('GPL') groups=('x-apps') depends=('gspell' 'gtksourceview3' 'libpeas' 'xapps') -makedepends=('meson' 'gobject-introspection' 'intltool' 'itstool') +makedepends=('meson' 'samurai' 'gobject-introspection' 'intltool' 'itstool') source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/${pkgver}.tar.gz") sha256sums=('a2e2208ad6f5be1b0835202e461628f81a246cb120bd8d37928e41cb72a82617') @@ -22,11 +22,11 @@ --libexecdir=lib/${pkgname} \ --buildtype=plain \ .. - ninja + samu } package(){ cd "${srcdir}"/${pkgname}-${pkgver}/build - DESTDIR="${pkgdir}" ninja install + DESTDIR="${pkgdir}" samu install } Modified: xreader/trunk/PKGBUILD =================================================================== --- xreader/trunk/PKGBUILD 2019-07-10 16:02:42 UTC (rev 488581) +++ xreader/trunk/PKGBUILD 2019-07-10 16:09:05 UTC (rev 488582) @@ -15,7 +15,7 @@ 'libspectre: support for dvi and ps files' 'mathjax: support for math in epub files' 'texlive-bin: support for dvi files') -makedepends=('meson' 'intltool' 'itstool' 'gobject-introspection' 'djvulibre' +makedepends=('meson' 'samurai' 'intltool' 'itstool' 'gobject-introspection' 'djvulibre' 'libgxps' 'libspectre' 'texlive-bin') source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/${pkgver}.tar.gz") sha256sums=('e5efc1ff17708513f22c6110f91ac60acb51e33ebb5a32372091944e1daaa7bf') @@ -36,11 +36,11 @@ -Dintrospection=true \ -Dhelp_files=true \ .. - ninja + samu } package(){ cd "${srcdir}"/${pkgname}-${pkgver}/build - DESTDIR="${pkgdir}" ninja install + DESTDIR="${pkgdir}" samu install }
