From 6bb6454fb88db74f30e1792d3a69b4d05eca23d2 Mon Sep 17 00:00:00 2001 From: Logen Kain Date: Thu, 13 Nov 2014 23:43:05 -0600 Subject: [PATCH 1/6] New package: stfl-0.23 --- common/shlibs | 1 + srcpkgs/stfl/files/stfl-void.patch | 52 ++++++++++++++++++++++++++++++ srcpkgs/stfl/template | 25 ++++++++++++++ 3 files changed, 78 insertions(+) create mode 100644 srcpkgs/stfl/files/stfl-void.patch create mode 100644 srcpkgs/stfl/template diff --git a/common/shlibs b/common/shlibs index 4641aaaf9c..26d5881c05 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1821,3 +1821,4 @@ libfm-qt5.so.1 libfm-qt5-0.8.0_1 libqtermwidget5.so.0 qtermwidget-0.6.0_1 libnpth.so.0 npth-1.1_1 libglfw.so.3 glfw-3.0.4_1 +libstfl.so.0 stfl-0.23_1 diff --git a/srcpkgs/stfl/files/stfl-void.patch b/srcpkgs/stfl/files/stfl-void.patch new file mode 100644 index 0000000000..9e88a369ca --- /dev/null +++ b/srcpkgs/stfl/files/stfl-void.patch @@ -0,0 +1,52 @@ +diff -rupN orig-stfl-0.21/Makefile.cfg stfl-0.23/Makefile.cfg +--- orig-stfl-0.21/Makefile.cfg 2009-05-31 13:20:39.000000000 -0500 ++++ stfl-0.23/Makefile.cfg 2014-11-13 22:42:41.460682486 -0600 +@@ -19,11 +19,11 @@ + # + + export libdir ?= lib +-export prefix ?= /usr/local ++export prefix ?= /usr + export DESTDIR ?= / + + ifneq ($(shell spl-config --cflags 2>/dev/null),) +-FOUND_SPL = 1 ++FOUND_SPL = 0 + else + FOUND_SPL = 0 + endif +@@ -35,19 +35,19 @@ FOUND_SWIG = 0 + endif + + ifneq ($(shell perl -le 'print 1' 2>/dev/null),) +-FOUND_PERL5 = 1 ++FOUND_PERL5 = 0 + else + FOUND_PERL5 = 0 + endif + + ifneq ($(shell python -c 'print 1' 2>/dev/null),) +-FOUND_PYTHON = 1 ++FOUND_PYTHON = 0 + else + FOUND_PYTHON = 0 + endif + + ifneq ($(shell ruby -e 'puts 1' 2>/dev/null),) +-FOUND_RUBY = 1 ++FOUND_RUBY = 0 + else + FOUND_RUBY = 0 + endif +diff -rupN orig-stfl-0.21/stfl_internals.h stfl-0.23/stfl_internals.h +--- orig-stfl-0.21/stfl_internals.h 2014-04-25 06:36:07.000000000 -0500 ++++ stfl-0.23/stfl_internals.h 2014-11-13 22:41:38.413685526 -0600 +@@ -28,7 +28,7 @@ extern "C" { + #endif + + #include "stfl.h" +-#include ++#include + #include + + struct stfl_widget_type; diff --git a/srcpkgs/stfl/template b/srcpkgs/stfl/template new file mode 100644 index 0000000000..d004686df4 --- /dev/null +++ b/srcpkgs/stfl/template @@ -0,0 +1,25 @@ +# Template file for 'stfl' +pkgname=stfl +version=0.23 +revision=1 +build_style=gnu-makefile +hostmakedepends="swig patch" +makedepends="ncurses-devel" +depends="ncurses" +short_desc="Curses-based widget set for text terminals" +maintainer="Logen K " +license="GPL-3" +homepage="http://www.clifford.at/stfl/" +distfiles="http://www.clifford.at/${pkgname}/${pkgname}-${version}.tar.gz" +checksum=e75ed8427905ad50faf43ed5fefd0cf7b16ee0c1ca87e15d33e360bb92aedfde + +post_extract(){ + patch -Np1 -i ${FILESDIR}/stfl-void.patch + +} +do_build(){ + LDFLAGS="" +} +post_install(){ + ln -sf libstfl.so.${version} ${DESTDIR}/usr/lib/libstfl.so.0 +} From 87e602b5443d65fb00f0f833df2567d949751843 Mon Sep 17 00:00:00 2001 From: Logen Kain Date: Fri, 14 Nov 2014 16:13:25 -0600 Subject: [PATCH 2/6] stfl: added -devel --- srcpkgs/stfl-devel | 1 + srcpkgs/stfl/template | 11 +++++++++++ 2 files changed, 12 insertions(+) create mode 120000 srcpkgs/stfl-devel diff --git a/srcpkgs/stfl-devel b/srcpkgs/stfl-devel new file mode 120000 index 0000000000..6389891f57 --- /dev/null +++ b/srcpkgs/stfl-devel @@ -0,0 +1 @@ +stfl/ \ No newline at end of file diff --git a/srcpkgs/stfl/template b/srcpkgs/stfl/template index d004686df4..48b21438d2 100644 --- a/srcpkgs/stfl/template +++ b/srcpkgs/stfl/template @@ -23,3 +23,14 @@ do_build(){ post_install(){ ln -sf libstfl.so.${version} ${DESTDIR}/usr/lib/libstfl.so.0 } + +# Devel +stfl-devel_package() { + depends="stfl>=${version}_${revision} $makedepends" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" + } +} From 241ff55e7bc1ffcd5bdba4e39daadd7e8a9405eb Mon Sep 17 00:00:00 2001 From: Logen Kain Date: Fri, 14 Nov 2014 16:19:59 -0600 Subject: [PATCH 3/6] stfl: updated template --- srcpkgs/stfl/template | 1 + 1 file changed, 1 insertion(+) diff --git a/srcpkgs/stfl/template b/srcpkgs/stfl/template index 48b21438d2..ffa464fb44 100644 --- a/srcpkgs/stfl/template +++ b/srcpkgs/stfl/template @@ -32,5 +32,6 @@ stfl-devel_package() { vmove usr/include vmove usr/lib/pkgconfig vmove "usr/lib/*.so" + vmove "usr/lib/*.a" } } From 40621d5c8a885dca40c0db0ca4dd9448d9d7ba9a Mon Sep 17 00:00:00 2001 From: Logen Kain Date: Fri, 14 Nov 2014 16:33:15 -0600 Subject: [PATCH 4/6] stfl: switched to tabs --- srcpkgs/stfl/template | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/srcpkgs/stfl/template b/srcpkgs/stfl/template index ffa464fb44..89e5cf3501 100644 --- a/srcpkgs/stfl/template +++ b/srcpkgs/stfl/template @@ -14,24 +14,24 @@ distfiles="http://www.clifford.at/${pkgname}/${pkgname}-${version}.tar.gz" checksum=e75ed8427905ad50faf43ed5fefd0cf7b16ee0c1ca87e15d33e360bb92aedfde post_extract(){ - patch -Np1 -i ${FILESDIR}/stfl-void.patch + patch -Np1 -i ${FILESDIR}/stfl-void.patch } do_build(){ - LDFLAGS="" + LDFLAGS="" } post_install(){ - ln -sf libstfl.so.${version} ${DESTDIR}/usr/lib/libstfl.so.0 + ln -sf libstfl.so.${version} ${DESTDIR}/usr/lib/libstfl.so.0 } # Devel stfl-devel_package() { - depends="stfl>=${version}_${revision} $makedepends" - short_desc+=" - development files" - pkg_install() { - vmove usr/include - vmove usr/lib/pkgconfig - vmove "usr/lib/*.so" - vmove "usr/lib/*.a" - } + depends="stfl>=${version}_${revision} $makedepends" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" + vmove "usr/lib/*.a" + } } From af24a3da4d934ffcb81d1d47df0354375fcf2112 Mon Sep 17 00:00:00 2001 From: Logen Kain Date: Fri, 14 Nov 2014 16:37:56 -0600 Subject: [PATCH 5/6] stfl: changed empty string to unset --- srcpkgs/stfl/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/stfl/template b/srcpkgs/stfl/template index 89e5cf3501..6cde428130 100644 --- a/srcpkgs/stfl/template +++ b/srcpkgs/stfl/template @@ -18,7 +18,7 @@ post_extract(){ } do_build(){ - LDFLAGS="" + unset LDFLAGS } post_install(){ ln -sf libstfl.so.${version} ${DESTDIR}/usr/lib/libstfl.so.0 From 5e7a802b80de8798b982851f363a81640ebba20c Mon Sep 17 00:00:00 2001 From: Logen Kain Date: Sun, 16 Nov 2014 10:06:34 -0600 Subject: [PATCH 6/6] stfl: fixed depends and patch --- srcpkgs/stfl/{files => patches}/stfl-void.patch | 12 ++++++------ srcpkgs/stfl/template | 7 +------ 2 files changed, 7 insertions(+), 12 deletions(-) rename srcpkgs/stfl/{files => patches}/stfl-void.patch (66%) diff --git a/srcpkgs/stfl/files/stfl-void.patch b/srcpkgs/stfl/patches/stfl-void.patch similarity index 66% rename from srcpkgs/stfl/files/stfl-void.patch rename to srcpkgs/stfl/patches/stfl-void.patch index 9e88a369ca..1458285e9d 100644 --- a/srcpkgs/stfl/files/stfl-void.patch +++ b/srcpkgs/stfl/patches/stfl-void.patch @@ -1,6 +1,6 @@ -diff -rupN orig-stfl-0.21/Makefile.cfg stfl-0.23/Makefile.cfg ---- orig-stfl-0.21/Makefile.cfg 2009-05-31 13:20:39.000000000 -0500 -+++ stfl-0.23/Makefile.cfg 2014-11-13 22:42:41.460682486 -0600 +diff -rupN Makefile.cfg Makefile.cfg +--- Makefile.cfg 2009-05-31 13:20:39.000000000 -0500 ++++ Makefile.cfg 2014-11-13 22:42:41.460682486 -0600 @@ -19,11 +19,11 @@ # @@ -38,9 +38,9 @@ diff -rupN orig-stfl-0.21/Makefile.cfg stfl-0.23/Makefile.cfg else FOUND_RUBY = 0 endif -diff -rupN orig-stfl-0.21/stfl_internals.h stfl-0.23/stfl_internals.h ---- orig-stfl-0.21/stfl_internals.h 2014-04-25 06:36:07.000000000 -0500 -+++ stfl-0.23/stfl_internals.h 2014-11-13 22:41:38.413685526 -0600 +diff -rupN stfl_internals.h stfl_internals.h +--- stfl_internals.h 2014-04-25 06:36:07.000000000 -0500 ++++ stfl_internals.h 2014-11-13 22:41:38.413685526 -0600 @@ -28,7 +28,7 @@ extern "C" { #endif diff --git a/srcpkgs/stfl/template b/srcpkgs/stfl/template index 6cde428130..c15baa7e25 100644 --- a/srcpkgs/stfl/template +++ b/srcpkgs/stfl/template @@ -3,9 +3,8 @@ pkgname=stfl version=0.23 revision=1 build_style=gnu-makefile -hostmakedepends="swig patch" +hostmakedepends="swig" makedepends="ncurses-devel" -depends="ncurses" short_desc="Curses-based widget set for text terminals" maintainer="Logen K " license="GPL-3" @@ -13,10 +12,6 @@ homepage="http://www.clifford.at/stfl/" distfiles="http://www.clifford.at/${pkgname}/${pkgname}-${version}.tar.gz" checksum=e75ed8427905ad50faf43ed5fefd0cf7b16ee0c1ca87e15d33e360bb92aedfde -post_extract(){ - patch -Np1 -i ${FILESDIR}/stfl-void.patch - -} do_build(){ unset LDFLAGS }