diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2015-04-09 06:06:51 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-04-09 06:34:03 +0000 |
| commit | f176f475caa80a0fc8e53b2ec88fca224209db39 (patch) | |
| tree | 6a4d8796b04320e24ac565ee9550cfb1479ba8ea /testing/stfl | |
| parent | d95472b0af3291ada78338e3dfb4d1399a4fdad9 (diff) | |
| download | aports-f176f475caa80a0fc8e53b2ec88fca224209db39.tar.bz2 aports-f176f475caa80a0fc8e53b2ec88fca224209db39.tar.xz | |
testing/stfl: upgrade to 0.24
Diffstat (limited to 'testing/stfl')
| -rw-r--r-- | testing/stfl/APKBUILD | 26 | ||||
| -rw-r--r-- | testing/stfl/ncurses.patch | 13 |
2 files changed, 24 insertions, 15 deletions
diff --git a/testing/stfl/APKBUILD b/testing/stfl/APKBUILD index d10829ec35..b85bad12a7 100644 --- a/testing/stfl/APKBUILD +++ b/testing/stfl/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=stfl -pkgver=0.22 +pkgver=0.24 pkgrel=0 pkgdesc="The Structured Terminal Forms Language/Library" url="http://www.clifford.at/stfl/" @@ -8,12 +8,11 @@ arch="all" license="LGPLv3+" depends="" depends_dev="" -makedepends="$depends_dev ncurses-dev libiconv-dev" +makedepends="$depends_dev ncurses-dev" install="" subpackages="$pkgname-dev" source="http://www.clifford.at/stfl/stfl-$pkgver.tar.gz - ncurses.patch - libs.patch" + ncurses.patch" _builddir="$srcdir"/stfl-$pkgver prepare() { @@ -28,21 +27,18 @@ prepare() { build() { cd "$_builddir" - make || return 1 + make prefix=/usr || return 1 } package() { cd "$_builddir" - make DESTDIR="$pkgdir" install || return 1 + make prefix=/usr DESTDIR="$pkgdir" install || return 1 rm -f "$pkgdir"/usr/lib/*.la "$pkgdir"/usr/lib/*.a } -md5sums="df4998f69fed15fabd702a25777f74ab stfl-0.22.tar.gz -43f04a9e6d1b544f6b60327b6d52b456 ncurses.patch -c97e5120af576056f7bd55121b35dea8 libs.patch" -sha256sums="2dddafd331e61ad04baf1251ccecb3a69feaf99880dd75155be8423c1cc55418 stfl-0.22.tar.gz -20d9acdde7da2fc03fa00cafdf3c689dfbd0131c085e12e6fbdc498ec6d37010 ncurses.patch -2cec3f9e649cdb096361acc8dc5cf77cb4007795c7450683a9f4cd22187d67f5 libs.patch" -sha512sums="dab2335ef00b65d00abda2a51fb5c667b48864b02ee82abee049f15fd9e2f272f21ec80d4a6cdbb5fc5882239ba28964912e4c0b641b2e83a7ab3bd7f94415bb stfl-0.22.tar.gz -2f31207d7fff88724a539ec7add1ad9f305e9adb36326acc6e42b6c27b0d93f74dc254b9f91c9b0ce0fb1d7d7c3d7d65defbc2086e9868108641df3a47e77166 ncurses.patch -def75440a498d592aa5ee7e3b8302f863ec4f01e6a08264db221c390acc92d1d38eec9032ec9abd1af469ea5622ac1f8caf9c0aaba1a9e81434ddab4631ace4e libs.patch" +md5sums="98c764ccc8f13ed05ea22559d7116b96 stfl-0.24.tar.gz +63198ddede520b856065c7f813effdf6 ncurses.patch" +sha256sums="d4a7aa181a475aaf8a8914a8ccb2a7ff28919d4c8c0f8a061e17a0c36869c090 stfl-0.24.tar.gz +851ddaa7835b9adc47528522f8a99fb504affd8b95e542c309b7cc8907d3ea4b ncurses.patch" +sha512sums="95df4574b1bc32d795751156dc5b93afbca3ba241607a3a55210c89dda61b9a26ad574bb5f729a0158c9052235dbf63d6c58b38e7f1061d14ab7062af6150fa0 stfl-0.24.tar.gz +d445b7bebd53ab23765f8386d8e69080df1cf95ca7368dee98594176e5a99f73d741a14e81af1500dc249c2a485574a5323d16fffa12536f7f3f20049b636de6 ncurses.patch" diff --git a/testing/stfl/ncurses.patch b/testing/stfl/ncurses.patch index c74252a144..215d35d024 100644 --- a/testing/stfl/ncurses.patch +++ b/testing/stfl/ncurses.patch @@ -1,3 +1,5 @@ +We need -D_XOPEN_SOURCE_EXTENDED for widechar in ncurses + diff --git a/stfl_internals.h b/stfl_internals.h index 3f9f45b..1559626 100644 --- a/stfl_internals.h @@ -11,3 +13,14 @@ index 3f9f45b..1559626 100644 #include <pthread.h> struct stfl_widget_type; +--- ./Makefile.orig ++++ ./Makefile +@@ -21,7 +21,7 @@ + include Makefile.cfg + + export CC = gcc -pthread +-export CFLAGS += -I. -Wall -Os -ggdb -D_GNU_SOURCE -fPIC ++export CFLAGS += -I. -Wall -Os -ggdb -D_GNU_SOURCE -D_XOPEN_SOURCE_EXTENDED -fPIC + export LDLIBS += -lncursesw + + SONAME := libstfl.so.0 |