From 41f72f3204054fe9a9b6aac8ba9f340beb405f62 Mon Sep 17 00:00:00 2001 From: Jef Roosens Date: Sun, 2 Jan 2022 10:39:19 +0100 Subject: [PATCH 1/8] Added first version of PKGBUILD --- .gitignore | 3 +++ PKGBUILD | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ config.mk | 2 +- 3 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 PKGBUILD diff --git a/.gitignore b/.gitignore index 9d8af76..8068c9a 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,6 @@ st *.rej *.orig +src/ +pkg/ +*.tar* diff --git a/PKGBUILD b/PKGBUILD new file mode 100644 index 0000000..08c7be7 --- /dev/null +++ b/PKGBUILD @@ -0,0 +1,53 @@ +# Maintainer: Jef Roosens + +pkgname=jjr-st +pkgver=1.0.0 +pkgrel=1 +pkgdesc="My build of the st terminal" +arch=("x86_64") + +url="https://git.rustybever.be/Chewing_Bever/st" +license=("MIT") + +depends=("libxft") +makedepends=("clang") +provides=("st") +conflicts=("st" "st-git") + +source=("arg.h" "boxdraw.c" "boxdraw.o" "boxdraw_data.h" "config.def.h" "config.h" "config.mk" "hb.c" "hb.h" "hb.o" "LICENSE" "Makefile" "st.1" "st.c" "st.h" "st.info" "win.h" "x.c" "x.o" "README") +md5sums=('7a0155e070d14041f69ca4466aad18bf' + '67a7923385b308ab714a66a81e2803f5' + '977a6000f83c90e69b2dde8288128dcf' + '54322cef62604ce8c288b3d2d20f1baa' + 'ce86c3890ce6cc520f7d895c44089a7e' + '34a60a679fdc80ab649982ca014b8883' + '1b17a98e945baec7837087e219df4ec1' + 'f6fcbd03c6f1013e4f592278bf96086d' + '704b67624d026f76577ce51d021ef00a' + 'b581e688384ca1f3d93c18e6933e3f9d' + '04c3ca13a702147c62db90f556c5b3ca' + '84025d924d1ddf176f8dc028bc5f6453' + 'bafec1da6c9f80fffd25dd5a85004b42' + 'ef77a180cc99be9226e8296e5ae3ada5' + '4f1e1612b1e43442b34bb0fb44254af0' + '0cbfe790d927cce15ae8e658de03f8aa' + 'ab9cbb2f172fd88c3c0d8a87eb7bd666' + '63ed863d96f9571cbdb50664b3e70001' + '661a69b61e9da7b94bb0e4abd22fe365' + 'd344c31a3b60c2a3ba1c84b914dd2509') + +build() { + make +} + +package() { + local installopts='--mode 0644 -D --target-directory' + local shrdir="$pkgdir/usr/share" + local licdir="$shrdir/licenses/$pkgname" + local docdir="$shrdir/doc/$pkgname" + make PREFIX=/usr DESTDIR="$pkgdir" install + install $installopts "$licdir" "LICENSE" + install $installopts "$docdir" "README" + # install $installopts "$docdir" README.terminfo.rst + # install $installopts "$shrdir/$pkgname" "$_sourcedir/st.info" +} diff --git a/config.mk b/config.mk index 8adb05d..0ff59fc 100644 --- a/config.mk +++ b/config.mk @@ -34,4 +34,4 @@ STLDFLAGS = $(LIBS) $(LDFLAGS) # `$(PKG_CONFIG) --libs freetype2` # compiler and linker -# CC = c99 +CC = clang From 4551a969c1be3e66747608fe7b8a3df479907d92 Mon Sep 17 00:00:00 2001 From: Jef Roosens Date: Sun, 2 Jan 2022 11:00:02 +0100 Subject: [PATCH 2/8] Added CI configuration --- .woodpecker.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 .woodpecker.yml diff --git a/.woodpecker.yml b/.woodpecker.yml new file mode 100644 index 0000000..40740c6 --- /dev/null +++ b/.woodpecker.yml @@ -0,0 +1,26 @@ +when: + branch: master + event: push + +pipeline: + build: + image: 'archlinux:latest' + commands: + # Update packages + - pacman -Syu --needed --noconfirm base-devel + # Create non-root user to perform build & switch to their home + - groupadd -g 1000 builder + - useradd -mg builder builder + - chown -R builder:builder "$PWD" + - "echo 'builder ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers" + - su builder + # Build the package + - MAKEFLAGS="-j$(nproc)" makepkg -s --noconfirm --needed + + publish: + image: 'archlinux:latest' + commands: + # Publish the package + - 'curl -F "file=@$(ls *.pkg*)" -H "X-API-KEY: $API_KEY" https://pkgs.rustybever.be/api/publish' + secrets: + - api_key From db273781b24612c8d1f2c852468bdd77d313b6e2 Mon Sep 17 00:00:00 2001 From: Jef Roosens Date: Sun, 2 Jan 2022 11:02:36 +0100 Subject: [PATCH 3/8] Updated ci restrictions --- .woodpecker.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 40740c6..c27bbef 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -1,5 +1,6 @@ +branches: master + when: - branch: master event: push pipeline: From 7e1c68f25d9f08687a94eeef8d7f8ffd0d14b911 Mon Sep 17 00:00:00 2001 From: Hiltjo Posthuma Date: Sun, 2 Jan 2022 12:15:45 +0100 Subject: [PATCH 4/8] FAQ: fix a typo, patch -> path --- FAQ | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/FAQ b/FAQ index 0f9609d..969b195 100644 --- a/FAQ +++ b/FAQ @@ -29,8 +29,8 @@ you can manually run `tic -sx st.info`. ## I would like to have utmp and/or scroll functionality by default -You can add the absolute patch of both programs in your config.h -file. You only have to modify the value of utmp and scroll variables. +You can add the absolute path of both programs in your config.h file. You only +have to modify the value of utmp and scroll variables. ## Why doesn't the Del key work in some programs? From 7fb0c0cc681f36be2ad12091ef93a41671f32738 Mon Sep 17 00:00:00 2001 From: Hiltjo Posthuma Date: Fri, 7 Jan 2022 12:39:57 +0100 Subject: [PATCH 5/8] bump version to 0.8.5 --- config.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.mk b/config.mk index c070a4a..4c4c5d5 100644 --- a/config.mk +++ b/config.mk @@ -1,5 +1,5 @@ # st version -VERSION = 0.8.4 +VERSION = 0.8.5 # Customize below to fit your system From c6cb2bc12d58db74e43d02e1a0b718f8b1dddf1a Mon Sep 17 00:00:00 2001 From: Jef Roosens Date: Fri, 7 Jan 2022 21:58:15 +0100 Subject: [PATCH 6/8] Changed to right PKGBUILD version --- PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PKGBUILD b/PKGBUILD index 08c7be7..4c43b8a 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Jef Roosens pkgname=jjr-st -pkgver=1.0.0 +pkgver=0.8.4 pkgrel=1 pkgdesc="My build of the st terminal" arch=("x86_64") From 2210dbf3fe852821dd5325003923328d067d34c6 Mon Sep 17 00:00:00 2001 From: Jef Roosens Date: Fri, 7 Jan 2022 21:59:17 +0100 Subject: [PATCH 7/8] Updated PKGBUILD version --- PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PKGBUILD b/PKGBUILD index 4c43b8a..2335256 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Jef Roosens pkgname=jjr-st -pkgver=0.8.4 +pkgver=0.8.5 pkgrel=1 pkgdesc="My build of the st terminal" arch=("x86_64") From c13646bbb8a6392cc657e5e282a9fb059240ff59 Mon Sep 17 00:00:00 2001 From: Jef Roosens Date: Fri, 7 Jan 2022 22:02:53 +0100 Subject: [PATCH 8/8] Updated md5sums --- PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PKGBUILD b/PKGBUILD index 2335256..f18944c 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -21,7 +21,7 @@ md5sums=('7a0155e070d14041f69ca4466aad18bf' '54322cef62604ce8c288b3d2d20f1baa' 'ce86c3890ce6cc520f7d895c44089a7e' '34a60a679fdc80ab649982ca014b8883' - '1b17a98e945baec7837087e219df4ec1' + 'db3ef406027a4e75e6ddb50b986caa52' 'f6fcbd03c6f1013e4f592278bf96086d' '704b67624d026f76577ce51d021ef00a' 'b581e688384ca1f3d93c18e6933e3f9d'