diff --git a/haiku-apps/beam/beam-1.2.recipe b/haiku-apps/beam/beam-1.2.recipe index 6dfeefbf5..726157ff7 100644 --- a/haiku-apps/beam/beam-1.2.recipe +++ b/haiku-apps/beam/beam-1.2.recipe @@ -5,11 +5,13 @@ onwards) that aims to be fast, stable and feature-complete." HOMEPAGE="http://github.com/olta/beam" COPYRIGHT="2000-2014 Oliver Tappe" LICENSE="GNU GPL v2" -REVISION="3" +REVISION="4" commit="cf3f0a3cd3406cb166d9c4c5939b6809a413799c" SOURCE_URI="https://github.com/HaikuArchives/beam/archive/$commit.tar.gz" CHECKSUM_SHA256="06c414812be4cae36723433957e624f04926c2ad03bae1535cec1df19fb8f63a" SOURCE_DIR="Beam-$commit" +SOURCE_FILENAME=$SOURCE_DIR +PATCHES="beam-$portVersion.patchset" ARCHITECTURES="x86_gcc2 x86" diff --git a/haiku-apps/beam/patches/beam-1.2.patchset b/haiku-apps/beam/patches/beam-1.2.patchset new file mode 100644 index 000000000..01d96dc0e --- /dev/null +++ b/haiku-apps/beam/patches/beam-1.2.patchset @@ -0,0 +1,24 @@ +From 3d9e9848cb33b00b285a089c549dd824a8839cff Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Sun, 8 Oct 2017 10:16:27 +0200 +Subject: Fix crash + +Not sure why, but this ends up being called with be_control_look NULL +now. + +diff --git a/src-beam/BmToolbarButton.cpp b/src-beam/BmToolbarButton.cpp +index 490d5f9..4aa6d23 100644 +--- a/src-beam/BmToolbarButton.cpp ++++ b/src-beam/BmToolbarButton.cpp +@@ -236,7 +236,7 @@ void BmToolbarButton::Draw( BRect updateRect) { + + BRect rect(Bounds()); + #ifdef __HAIKU__ +- if (mHighlighted && IsEnabled()) { ++ if (be_control_look && mHighlighted && IsEnabled()) { + // draw higlighting border + uint32 flags = 0; + if (Value()) +-- +2.14.2 + diff --git a/haiku-apps/vision/patches/vision-0.9.8.patchset b/haiku-apps/vision/patches/vision-0.9.8.patchset deleted file mode 100644 index 2d681ee07..000000000 --- a/haiku-apps/vision/patches/vision-0.9.8.patchset +++ /dev/null @@ -1,22 +0,0 @@ -From 5da9556aed26defd6801501fedc6747d8b139cd7 Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Mon, 5 Dec 2016 16:44:44 +0000 -Subject: need libstdc++ - - -diff --git a/src/Makefile b/src/Makefile -index 30d8673..e401c79 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -111,7 +111,7 @@ RSRCS = - # - if your library does not follow the standard library naming scheme, - # you need to specify the path to the library and it's name. - # (e.g. for mylib.a, specify "mylib.a" or "path/mylib.a") --LIBS = be translation textencoding tracker network columnlistview -+LIBS = be translation textencoding tracker network columnlistview $(STDCPPLIBS) - - # Specify additional paths to directories following the standard libXXX.so - # or libXXX.a naming scheme. You can specify full paths or paths relative --- -2.10.2 - diff --git a/haiku-apps/vision/vision-0.10.0.recipe b/haiku-apps/vision/vision-0.10.0.recipe deleted file mode 100644 index 3f701c8c3..000000000 --- a/haiku-apps/vision/vision-0.10.0.recipe +++ /dev/null @@ -1,52 +0,0 @@ -SUMMARY="A fast and full-featured native IRC client for Haiku" -DESCRIPTION="Vision is an IRC (Internet Relay Chat) client, originally for \ -BeOS, now for Haiku. The goal of this project is to provide the Haiku \ -community with an elegant, fast, and--most importantly--stable client to \ -communicate with other users and make new friends around the world." -COPYRIGHT="1999-2017 The Vision Team" -LICENSE="MPL v1.1" -REVISION="1" -HOMEPAGE="https://github.com/HaikuArchives/Vision/" -SOURCE_URI="https://github.com/HaikuArchives/Vision/archive/$portVersion.tar.gz" -CHECKSUM_SHA256="9439b821493dff38ca08b69fa4f6281d936555437df0f746514939eb070510b7" -SOURCE_DIR="Vision-$portVersion" -ARCHITECTURES="x86_gcc2 x86 x86_64" - -PROVIDES=" - vision = $portVersion - app:Vision = $portVersion - " -REQUIRES=" - haiku - " - -BUILD_REQUIRES=" - haiku_devel - " -BUILD_PREREQUIRES=" - makefile_engine - cmd:make - cmd:g++ - cmd:ld - " - -USER_SETTINGS_FILES=" - settings/Vision directory - " - -BUILD() -{ - cd src - make $jobArgs - make bindcatalogs - cd .. -} - -INSTALL() -{ - visionDir=$appsDir/Vision - mkdir -p $appsDir - - cp -r dist $visionDir - addAppDeskbarSymlink $visionDir/Vision -} diff --git a/haiku-apps/vision/vision-0.10.1.recipe b/haiku-apps/vision/vision-0.10.1.recipe index 403e249b6..d07b6f857 100644 --- a/haiku-apps/vision/vision-0.10.1.recipe +++ b/haiku-apps/vision/vision-0.10.1.recipe @@ -5,7 +5,7 @@ community with an elegant, fast, and--most importantly--stable client to \ communicate with other users and make new friends around the world." COPYRIGHT="1999-2017 The Vision Team" LICENSE="MPL v1.1" -REVISION="3" +REVISION="4" HOMEPAGE="https://github.com/HaikuArchives/Vision/" SOURCE_URI="https://github.com/HaikuArchives/Vision/archive/$portVersion.tar.gz" CHECKSUM_SHA256="564adec08838427c934e35f5f35082bdccb5740c93522ceb4965287b81fe036c" diff --git a/haiku-apps/vision/vision-0.9.8.recipe b/haiku-apps/vision/vision-0.9.8.recipe deleted file mode 100644 index 731609245..000000000 --- a/haiku-apps/vision/vision-0.9.8.recipe +++ /dev/null @@ -1,52 +0,0 @@ -SUMMARY="An IRC client" -DESCRIPTION="Vision is an IRC (Internet Relay Chat) client, originally for \ -BeOS, now for Haiku. The goal of this project is to provide the Haiku \ -community with an elegant, fast, and--most importantly--stable client to \ -communicate with other users and make new friends around the world." -COPYRIGHT="1999-2015 The Vision Team" -LICENSE="MPL v1.1" -REVISION="3" -HOMEPAGE="https://github.com/HaikuArchives/Vision/" -SOURCE_URI="https://github.com/HaikuArchives/Vision/archive/$portVersion.tar.gz" -CHECKSUM_SHA256="276508a998b462c861e81e357720cb410ba6477566186d5ea10309adae239826" -SOURCE_DIR="Vision-$portVersion" -PATCHES="vision-$portVersion.patchset" -ARCHITECTURES="x86_gcc2 x86 x86_64" - -PROVIDES=" - vision = $portVersion - app:Vision = $portVersion - " -REQUIRES=" - haiku - " - -BUILD_REQUIRES=" - haiku_devel - " -BUILD_PREREQUIRES=" - makefile_engine - cmd:make - cmd:g++ - cmd:ld - " - -USER_SETTINGS_FILES=" - settings/Vision directory - " - -BUILD() -{ - cd src - make $jobArgs - cd .. -} - -INSTALL() -{ - visionDir=$appsDir/Vision - mkdir -p $appsDir - - cp -r dist $visionDir - addAppDeskbarSymlink $visionDir/Vision -} diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.6.2.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.6.2.recipe index f50fa6796..d75f8c0e5 100644 --- a/haiku-libs/haikuwebkit/haikuwebkit-1.6.2.recipe +++ b/haiku-libs/haikuwebkit/haikuwebkit-1.6.2.recipe @@ -12,7 +12,7 @@ LICENSE=" GNU LGPL v2.1 MIT " -REVISION="1" +REVISION="2" SOURCE_URI="https://github.com/haiku/webkit/archive/$portVersion.tar.gz" SOURCE_FILENAME="haikuwebkit-$portVersion.tar.gz" CHECKSUM_SHA256="82957f320f8a81c9ca5986550a1897ca706878647eab1eccc1bad302e38d22af" diff --git a/www-client/netsurf/netsurf-3.6.recipe b/www-client/netsurf/netsurf-3.6.recipe index 32d85bc87..2feb8ed45 100644 --- a/www-client/netsurf/netsurf-3.6.recipe +++ b/www-client/netsurf/netsurf-3.6.recipe @@ -9,7 +9,7 @@ developed, NetSurf is continually evolving and improving." HOMEPAGE="http://www.netsurf-browser.org/" COPYRIGHT="2003-2016 The NetSurf Browser project" LICENSE="GNU GPL v2" -REVISION="6" +REVISION="7" # Do NOT use the netsurf-all package. It contains a bunch of subprojects which # we build as separate packages so they can easily be used by other projects. SOURCE_URI="http://download.netsurf-browser.org/netsurf/releases/source/netsurf-$portVersion-src.tar.gz"