From a80d2b141f4116ff54ed1a5545f60f7435c5c34d Mon Sep 17 00:00:00 2001
From: Humdinger <humdingerb@gmail.com>
Date: Sat, 11 Mar 2017 18:15:11 +0100
Subject: [PATCH] Updated fRiss and Weather

Both needed to be rebuilt.

* fRiss:
 - improved DESCRIPTION
 - added REQUIRES
 - added BUILD_PREREQUIRES
 - made the conditional in BUILD work
 - builds on x86, but crashes

* Weather:
 - Updated to newer srcGitRev
---
 haiku-apps/friss/friss-0.8.0.recipe         | 41 +++++++++++++++++----
 haiku-apps/weather/weather-0.1.1_git.recipe | 10 ++---
 2 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/haiku-apps/friss/friss-0.8.0.recipe b/haiku-apps/friss/friss-0.8.0.recipe
index f199ff375..e5db26339 100644
--- a/haiku-apps/friss/friss-0.8.0.recipe
+++ b/haiku-apps/friss/friss-0.8.0.recipe
@@ -1,7 +1,27 @@
 SUMMARY="RSS and ATOM feeds reader"
-DESCRIPTION="
-FRiSS is a viewer for atom/rss/rdf feeds that can be run as a replicant.
-"
+DESCRIPTION="FRiSS is a live RSS (and other protocols) reader, shown as a \
+replicant on the desktop. The news items are clickable, and will open the \
+relevant news items in your favorite browser.
+
+Some features:
+
+- For every window there can be one or more URL's to feed from.
+- With buttons you can close the window, go to the next feed and refresh \
+the current feed.
+- If the number of items doesn't fit the replicant window, they can be \
+scrolled at a user definable speed.
+- It is possible to have more than one window open on your desktop.
+
+Configurable are:
+
+- URL's to feed from
+- Which URL's go in which feed window
+- Background color (transparent or a solid color)
+- Browser to open links in
+- Number of feeds to shown simultaneously
+- Update rate
+- Scroll items when they don't fit / scroll speed
+- Autostart on boot"
 HOMEPAGE="http://github.com/pulkomandy/fRiSS"
 LICENSE="MIT"
 COPYRIGHT="2004 Andreas Herzig (N3S)
@@ -9,26 +29,31 @@ COPYRIGHT="2004 Andreas Herzig (N3S)
 SOURCE_URI="https://github.com/pulkomandy/fRiSS/archive/v$portVersion.tar.gz"
 CHECKSUM_SHA256="d0e3d6a0fb3d52db6eff6ba354d24fc648aa2b4021238c3e2fe53800df04db91"
 SOURCE_DIR="fRiSS-$portVersion"
-REVISION="1"
+REVISION="2"
 ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
 	friss = $portVersion
 	app:fRiSS = $portVersion
 	"
+REQUIRES="
+	haiku
+	"
 
 BUILD_REQUIRES="
-	cmd:jam
-	cmd:gcc
 	haiku_devel
 	"
+BUILD_PREREQUIRES="
+	cmd:gcc
+	cmd:jam
+	"
 
 BUILD()
 {
-	if [ x86_gcc2 -ne $buildArchitecture ]; then
+	cd src
+	if [ $buildArchitecture != "x86_gcc2" ] ; then
 		sed -i 's/lstdc++.r4/lstdc++/' Jamfile
 	fi
-	cd src
 	jam
 }
 
diff --git a/haiku-apps/weather/weather-0.1.1_git.recipe b/haiku-apps/weather/weather-0.1.1_git.recipe
index c6e94a694..b950334b9 100644
--- a/haiku-apps/weather/weather-0.1.1_git.recipe
+++ b/haiku-apps/weather/weather-0.1.1_git.recipe
@@ -10,11 +10,11 @@ COPYRIGHT="2014 George White
 	2015 Przemysław Buczkowski
 	2015 Janus"
 LICENSE="MIT"
-REVISION="4"
-commit="2868142b1adb882c55f09c1454738741038f9d98"
-SOURCE_URI="https://github.com/HaikuArchives/Weather/archive/$commit.tar.gz"
-CHECKSUM_SHA256="aac002f942ef011b0a807fb7b2ff7d48e58ba93d0bb9dffc01933ec11686f0f2"
-SOURCE_DIR="Weather-$commit"
+REVISION="5"
+srcGitRev="26d694ceaebf993c775448c89640ad0fb9718d1e"
+SOURCE_URI="https://github.com/HaikuArchives/Weather/archive/$srcGitRev.tar.gz"
+CHECKSUM_SHA256="afeaa28690e19177015f77c1426ffc1d936880a2ce37c3f34ae0f333ad3dc858"
+SOURCE_DIR="Weather-$srcGitRev"
 
 ARCHITECTURES="x86 x86_gcc2 x86_64"