diff options
| author | Olivier Mauras <olivier@mauras.ch> | 2015-03-18 08:49:11 +0100 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-03-18 10:04:23 +0000 |
| commit | 293fd35238b5964344a38e5ec9b9553ffcadeaae (patch) | |
| tree | fc3e81e49546703599dca2848249398a9419fc7e /testing/spectrwm | |
| parent | 836b5591850530326923a0bcbbb95c592fa8b6ba (diff) | |
| download | aports-293fd35238b5964344a38e5ec9b9553ffcadeaae.tar.bz2 aports-293fd35238b5964344a38e5ec9b9553ffcadeaae.tar.xz | |
testing/spectrwm: Replaced %1023c by %1023s for musl compatibility
Diffstat (limited to 'testing/spectrwm')
| -rw-r--r-- | testing/spectrwm/0001-musl-fix.patch | 43 | ||||
| -rw-r--r-- | testing/spectrwm/APKBUILD | 42 |
2 files changed, 70 insertions, 15 deletions
diff --git a/testing/spectrwm/0001-musl-fix.patch b/testing/spectrwm/0001-musl-fix.patch new file mode 100644 index 0000000000..3353af5eb8 --- /dev/null +++ b/testing/spectrwm/0001-musl-fix.patch @@ -0,0 +1,43 @@ +From 213170ebcee0ad963c5671a012993df3204d992b Mon Sep 17 00:00:00 2001 +From: Olivier Mauras <olivier@mauras.ch> +Date: Wed, 18 Mar 2015 08:29:43 +0100 +Subject: [PATCH] Fix musl + +--- + spectrwm.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/spectrwm.c b/spectrwm.c +index b01ed60..cc16e87 100644 +--- a/spectrwm.c ++++ b/spectrwm.c +@@ -8244,7 +8244,7 @@ setconfvalue(const char *selector, const char *value, int flags) + return (0); + + bzero(s, sizeof s); +- if (sscanf(value, "ws[%d]:%1023c", &ws_id, s) != 2) ++ if (sscanf(value, "ws[%d]:%1023s", &ws_id, s) != 2) + errx(1, "invalid entry, should be 'ws[<idx>]:name'"); + ws_id--; + if (ws_id < 0 || ws_id >= workspace_limit) +@@ -8365,7 +8365,7 @@ setautorun(const char *selector, const char *value, int flags) + return (0); + + bzero(s, sizeof s); +- if (sscanf(value, "ws[%d]:%1023c", &ws_id, s) != 2) ++ if (sscanf(value, "ws[%d]:%1023s", &ws_id, s) != 2) + errx(1, "invalid autorun entry, should be 'ws[<idx>]:command'"); + ws_id--; + if (ws_id < 0 || ws_id >= workspace_limit) +@@ -8435,7 +8435,7 @@ setlayout(const char *selector, const char *value, int flags) + return (0); + + bzero(s, sizeof s); +- if (sscanf(value, "ws[%d]:%d:%d:%d:%d:%1023c", ++ if (sscanf(value, "ws[%d]:%d:%d:%d:%d:%1023s", + &ws_id, &mg, &ma, &si, &ar, s) != 6) + errx(1, "invalid layout entry, should be 'ws[<idx>]:" + "<master_grow>:<master_add>:<stack_inc>:<always_raise>:" +-- +2.2.1 + diff --git a/testing/spectrwm/APKBUILD b/testing/spectrwm/APKBUILD index e0e1769c7e..a4a1632bc7 100644 --- a/testing/spectrwm/APKBUILD +++ b/testing/spectrwm/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=spectrwm pkgver=2.6.2 -pkgrel=0 +pkgrel=1 pkgdesc="A small dynamic tiling window manager for X11" url="https://opensource.conformal.com/wiki/spectrwm" arch="all" @@ -12,28 +12,40 @@ depends_dev="xorg-server-dev libxrandr-dev libxcursor-dev libxft-dev xcb-util-de makedepends="$depends_dev bsd-compat-headers" install="" subpackages="$pkgname-doc" -source="https://opensource.conformal.com/snapshots/$pkgname/$pkgname-$pkgver.tgz" +source="https://opensource.conformal.com/snapshots/$pkgname/$pkgname-$pkgver.tgz 0001-musl-fix.patch" _builddir=$srcdir/$pkgname-$pkgver prepare() { - cd "$_builddir/linux" - sed -i 's#^PREFIX.*#PREFIX ?= /usr#' Makefile + # Apply patches + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done + + # Fix $PREFIX + cd "$_builddir/linux" + sed -i 's#^PREFIX.*#PREFIX ?= /usr#' Makefile } build() { - cd "$_builddir/linux" - make + cd "$_builddir/linux" + make } package() { - cd "$_builddir/linux" - make DESTDIR="$pkgdir" install || return 1 - # Copy sample scripts and conf - mkdir "$pkgdir"/usr/share/$pkgname - cp ../*.sh "$pkgdir"/usr/share/$pkgname - cp ../*.conf "$pkgdir"/usr/share/$pkgname + cd "$_builddir/linux" + make DESTDIR="$pkgdir" install || return 1 + # Copy sample scripts and conf + mkdir "$pkgdir"/usr/share/$pkgname + cp ../*.sh "$pkgdir"/usr/share/$pkgname + cp ../*.conf "$pkgdir"/usr/share/$pkgname } -md5sums="eba7cba0c85706435657f744bf9086bc spectrwm-2.6.2.tgz" -sha256sums="eb9b33ee05b0625d59607f886d9ba7f0723bd863b503d66bdb592f5461c59459 spectrwm-2.6.2.tgz" -sha512sums="f1962df679ca07ca7d8c68a2d0b88331eda5c7cd35ecf1a5a63687984c1c67ef48fffb4e29d273fb1ccef9c9bb77a5ab12a09ef27b1d97abdc87dc20f38717f5 spectrwm-2.6.2.tgz" +md5sums="eba7cba0c85706435657f744bf9086bc spectrwm-2.6.2.tgz +4b909368b341f50ecabf50be032fe141 0001-musl-fix.patch" +sha256sums="eb9b33ee05b0625d59607f886d9ba7f0723bd863b503d66bdb592f5461c59459 spectrwm-2.6.2.tgz +4c6ccdc4cf99a982fba4763236c236d0aaf1e21f52dd3b4cfb73c888110d19bb 0001-musl-fix.patch" +sha512sums="f1962df679ca07ca7d8c68a2d0b88331eda5c7cd35ecf1a5a63687984c1c67ef48fffb4e29d273fb1ccef9c9bb77a5ab12a09ef27b1d97abdc87dc20f38717f5 spectrwm-2.6.2.tgz +316d1d0dd834077f33d48a6f07f9e06094490a0737041cd63fad12e9dbba78a72fd357f64196e496b99cb9b7df65bbc55075cfefb0b0afad841bd456a15e718c 0001-musl-fix.patch" |