diff --git a/srcpkgs/newsboat/patches/fix-cross.patch b/srcpkgs/newsboat/patches/fix-cross.patch new file mode 100644 index 00000000000..2423134926f --- /dev/null +++ b/srcpkgs/newsboat/patches/fix-cross.patch @@ -0,0 +1,29 @@ +diff --git a/Makefile b/Makefile +index 85fbf952..dc23be41 100644 +--- Makefile ++++ Makefile +@@ -196,13 +196,13 @@ doc/xhtml/faq.html: doc/faq.txt + echo "td > pre { margin: 0; white-space: pre-wrap; }" >> doc/xhtml/docbook-xsl.css + + doc/generate: doc/generate.cpp doc/split.h +- $(CXX) $(CXXFLAGS) -o doc/generate doc/generate.cpp ++ $(CXX_FOR_BUILD) $(CXXFLAGS_FOR_BUILD) -o doc/generate doc/generate.cpp + + doc/newsboat-cfgcmds.txt: doc/generate doc/configcommands.dsv + doc/generate doc/configcommands.dsv > doc/newsboat-cfgcmds.txt + + doc/generate2: doc/generate2.cpp +- $(CXX) $(CXXFLAGS) -o doc/generate2 doc/generate2.cpp ++ $(CXX_FOR_BUILD) $(CXXFLAGS_FOR_BUILD) -o doc/generate2 doc/generate2.cpp + + doc/newsboat-keycmds.txt: doc/generate2 doc/keycmds.dsv + doc/generate2 doc/keycmds.dsv > doc/newsboat-keycmds.txt +@@ -220,7 +220,7 @@ doc/podboat.1: doc/manpage-podboat.txt doc/chapter-podcasts.txt doc/podboat-cfgc + $(A2X) -f manpage doc/manpage-podboat.txt + + doc/gen-example-config: doc/gen-example-config.cpp doc/split.h +- $(CXX) $(CXXFLAGS) -o doc/gen-example-config doc/gen-example-config.cpp ++ $(CXX_FOR_BUILD) $(CXXFLAGS_FOR_BUILD) -o doc/gen-example-config doc/gen-example-config.cpp + + doc/example-config: doc/gen-example-config doc/configcommands.dsv + sed 's/+{backslash}"+/`\\"`/g' doc/configcommands.dsv | doc/gen-example-config > doc/example-config diff --git a/srcpkgs/newsboat/template b/srcpkgs/newsboat/template index 0acea502575..65c39a4791e 100644 --- a/srcpkgs/newsboat/template +++ b/srcpkgs/newsboat/template @@ -1,7 +1,8 @@ # Template file for 'newsboat' pkgname=newsboat -version=r2.14 +version=2.14.1 revision=1 +wrksrc="newsboat-r${version}" build_style=configure build_helper="rust" configure_script="./config.sh" @@ -16,24 +17,11 @@ maintainer="maxice8 " license="MIT" homepage="https://www.newsboat.org" changelog="https://raw.githubusercontent.com/newsboat/newsboat/master/CHANGELOG.md" -distfiles="https://github.com/newsboat/newsboat/archive/${version}.tar.gz" -checksum=57176071b0c777ddba237f95f684e36bf2ddf271e84ac5c9e3eec8f1afc0b133 +distfiles="https://github.com/newsboat/newsboat/archive/r${version}.tar.gz" +checksum=fb029e2da250f0fdefdd8d52b417b2c13f1b049675ca3718190e9d43defd6c69 CXXFLAGS=" -Wno-error=sign-compare" -if [ "$CROSS_BUILD" ]; then - LDFLAGS="-L./target/${RUST_TARGET}/release" -fi - -pre_configure() { - if [ "$CROSS_BUILD" ]; then - cd doc - g++ -o generate generate.cpp - g++ -o generate2 generate2.cpp - g++ -o gen-example-config gen-example-config.cpp - fi -} - do_check() { rm -f test/rss.cpp