From ae73be344f02b0b3ea37fbf4192cb93d8444faa0 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 8 Apr 2020 23:44:22 +0200 Subject: [PATCH 1/2] nodejs-lts-10: fix build --- Manual.md | 24 ++++++++---------------- srcpkgs/nodejs-lts-10/template | 2 +- 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/Manual.md b/Manual.md index 92b57b1b2c2..ba2b1edb7b0 100644 --- a/Manual.md +++ b/Manual.md @@ -1960,29 +1960,21 @@ otherwise the `debug` packages won't have debugging symbols. Fork the voidlinux `void-packages` git repository on github and clone it: - $ git clone git@github.com:/void-packages.git - -You can now make your own commits to the `forked` repository: - - $ git add ... - $ git commit ... - $ git push ... + $ git clone git@github.com:/void-packages.git + +See [CONTRIBUTING.md](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md) +for information on how to format your commits and other tips for +contributing. To keep your forked repository always up to date, setup the `upstream` remote to pull in new changes: - - $ git remote add upstream git://github.com/void-linux/void-packages.git - $ git pull upstream master + + $ git remote add upstream git://github.com/void-linux/void-packages.git + $ git pull upstream master Once you've made changes to your `forked` repository you can submit a github pull request; see https://help.github.com/articles/fork-a-repo for more information. -For commit messages please use the following rules: - -- If you've imported a new package use `"New package: -"`. -- If you've updated a package use `": update to ."`. -- If you've removed a package use `": removed ..."`. -- If you've modified a package use `": ..."`. ## Help diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template index ea689c6e118..9c5bff96322 100644 --- a/srcpkgs/nodejs-lts-10/template +++ b/srcpkgs/nodejs-lts-10/template @@ -3,7 +3,7 @@ pkgname=nodejs-lts-10 version=10.19.0 revision=1 wrksrc="node-v${version}" -hostmakedepends="pkg-config python zlib-devel $(vopt_if icu icu-devel) +hostmakedepends="pkg-config python zlib-devel which $(vopt_if icu icu-devel) $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel) $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel) $(vopt_if cares c-ares-devel)" From 5f1782c97f3fc4354900ee2c3a5f4ce897469948 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 8 Apr 2020 23:40:49 +0200 Subject: [PATCH 2/2] botan: fix shlib entry in common/shlibs --- Manual.md | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/Manual.md b/Manual.md index 92b57b1b2c2..ba2b1edb7b0 100644 --- a/Manual.md +++ b/Manual.md @@ -1960,29 +1960,21 @@ otherwise the `debug` packages won't have debugging symbols. Fork the voidlinux `void-packages` git repository on github and clone it: - $ git clone git@github.com:/void-packages.git - -You can now make your own commits to the `forked` repository: - - $ git add ... - $ git commit ... - $ git push ... + $ git clone git@github.com:/void-packages.git + +See [CONTRIBUTING.md](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md) +for information on how to format your commits and other tips for +contributing. To keep your forked repository always up to date, setup the `upstream` remote to pull in new changes: - - $ git remote add upstream git://github.com/void-linux/void-packages.git - $ git pull upstream master + + $ git remote add upstream git://github.com/void-linux/void-packages.git + $ git pull upstream master Once you've made changes to your `forked` repository you can submit a github pull request; see https://help.github.com/articles/fork-a-repo for more information. -For commit messages please use the following rules: - -- If you've imported a new package use `"New package: -"`. -- If you've updated a package use `": update to ."`. -- If you've removed a package use `": removed ..."`. -- If you've modified a package use `": ..."`. ## Help