From dcde736dd585972947027a484c62b671473dbcae Mon Sep 17 00:00:00 2001 From: ABevier Date: Mon, 6 Mar 2023 11:41:57 -0500 Subject: [PATCH 1/6] add watch --- .../gitlab.com/procps-ng/watch/package.yml | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 projects/gitlab.com/procps-ng/watch/package.yml diff --git a/projects/gitlab.com/procps-ng/watch/package.yml b/projects/gitlab.com/procps-ng/watch/package.yml new file mode 100644 index 0000000000..ee17f78d54 --- /dev/null +++ b/projects/gitlab.com/procps-ng/watch/package.yml @@ -0,0 +1,38 @@ +distributable: + url: https://gitlab.com/procps-ng/procps/-/archive/v{{ version }}/v{{ version }}.tar.gz + strip-components: 1 + +versions: + - 4.0.3 + +provides: + - bin/watch + +dependencies: + invisible-island.net/ncurses: '*' + +build: + dependencies: + tea.xyz/gx/cc: c99 + tea.xyz/gx/make: '*' + gnu.org/autoconf: '*' + gnu.org/automake: '*' + gnu.org/gettext: '*' + gnu.org/libtool: '*' + freedesktop.org/pkg-config: '*' + script: | + autoreconf -fiv + ./configure $ARGS + make src/watch + mkdir -p "{{ prefix }}"/bin + mv src/watch "{{ prefix }}"/bin + env: + ARGS: + - --disable-dependency-tracking + - --prefix={{ prefix }} + - --disable-nls + - --enable-watch8bit + +test: + script: | + watch --errexit --chgexit --interval 1 date From 8848ea6e6b0881b43847453621ea5ac557f5920d Mon Sep 17 00:00:00 2001 From: ABevier Date: Mon, 6 Mar 2023 11:50:13 -0500 Subject: [PATCH 2/6] clean up yml --- projects/gitlab.com/procps-ng/watch/package.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/projects/gitlab.com/procps-ng/watch/package.yml b/projects/gitlab.com/procps-ng/watch/package.yml index ee17f78d54..83b61f87b3 100644 --- a/projects/gitlab.com/procps-ng/watch/package.yml +++ b/projects/gitlab.com/procps-ng/watch/package.yml @@ -1,9 +1,9 @@ distributable: - url: https://gitlab.com/procps-ng/procps/-/archive/v{{ version }}/v{{ version }}.tar.gz - strip-components: 1 + url: https://gitlab.com/procps-ng/procps/-/archive/v{{ version }}/v{{ version }}.tar.gz + strip-components: 1 versions: - - 4.0.3 + - 4.0.3 provides: - bin/watch @@ -33,6 +33,5 @@ build: - --disable-nls - --enable-watch8bit -test: - script: | - watch --errexit --chgexit --interval 1 date +test: | + watch --errexit --chgexit --interval 1 date From a15d7724f2096112640d2edb776f028de3488d83 Mon Sep 17 00:00:00 2001 From: ABevier Date: Mon, 6 Mar 2023 11:58:24 -0500 Subject: [PATCH 3/6] try to fix deps --- projects/gitlab.com/procps-ng/watch/package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/gitlab.com/procps-ng/watch/package.yml b/projects/gitlab.com/procps-ng/watch/package.yml index 83b61f87b3..29fcf56e71 100644 --- a/projects/gitlab.com/procps-ng/watch/package.yml +++ b/projects/gitlab.com/procps-ng/watch/package.yml @@ -9,7 +9,7 @@ provides: - bin/watch dependencies: - invisible-island.net/ncurses: '*' + invisible-island.net/ncurses: 6 build: dependencies: From 9b3bd96f86e83f25e3bbd561053c64f4ab02f897 Mon Sep 17 00:00:00 2001 From: ABevier Date: Mon, 6 Mar 2023 14:29:20 -0500 Subject: [PATCH 4/6] ncurses dep --- projects/gitlab.com/procps-ng/watch/package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/gitlab.com/procps-ng/watch/package.yml b/projects/gitlab.com/procps-ng/watch/package.yml index 29fcf56e71..7b04d6fd1e 100644 --- a/projects/gitlab.com/procps-ng/watch/package.yml +++ b/projects/gitlab.com/procps-ng/watch/package.yml @@ -9,7 +9,7 @@ provides: - bin/watch dependencies: - invisible-island.net/ncurses: 6 + invisible-island.net/ncurses: '>=6.0' build: dependencies: From a1b1f970bdec3b55dcd6cceb6fe14b42380df4f1 Mon Sep 17 00:00:00 2001 From: ABevier Date: Mon, 6 Mar 2023 15:25:59 -0500 Subject: [PATCH 5/6] just test it differently --- projects/gitlab.com/procps-ng/watch/package.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/projects/gitlab.com/procps-ng/watch/package.yml b/projects/gitlab.com/procps-ng/watch/package.yml index 7b04d6fd1e..252da9d1ad 100644 --- a/projects/gitlab.com/procps-ng/watch/package.yml +++ b/projects/gitlab.com/procps-ng/watch/package.yml @@ -33,5 +33,6 @@ build: - --disable-nls - --enable-watch8bit +# FIXME: a more comprehensive test could be written with access to a TTY test: | - watch --errexit --chgexit --interval 1 date + watch -h From 0e40bf091890e04fad1dd8d8e550b194637becb6 Mon Sep 17 00:00:00 2001 From: ABevier Date: Mon, 6 Mar 2023 17:53:57 -0500 Subject: [PATCH 6/6] add comment --- projects/gitlab.com/procps-ng/watch/package.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/projects/gitlab.com/procps-ng/watch/package.yml b/projects/gitlab.com/procps-ng/watch/package.yml index 252da9d1ad..2ec404d15b 100644 --- a/projects/gitlab.com/procps-ng/watch/package.yml +++ b/projects/gitlab.com/procps-ng/watch/package.yml @@ -5,6 +5,8 @@ distributable: versions: - 4.0.3 +# Watch is broken out seperately from the rest of procps. While procps provides other +# useful tools they do not build on OSX and are part of almost every base distro already provides: - bin/watch