From 82d09e800f69992efe50c58e18f9e3f2af83259b Mon Sep 17 00:00:00 2001 From: Rene Gollent Date: Wed, 30 Nov 2011 16:16:42 -0500 Subject: [PATCH 1/3] Style fix, no functional change. --- src/apps/debuganalyzer/gui/ListSelectionModel.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/apps/debuganalyzer/gui/ListSelectionModel.h b/src/apps/debuganalyzer/gui/ListSelectionModel.h index 9b29851aa0..eac40ef347 100644 --- a/src/apps/debuganalyzer/gui/ListSelectionModel.h +++ b/src/apps/debuganalyzer/gui/ListSelectionModel.h @@ -8,10 +8,9 @@ #include +#include #include -#include "Array.h" - class ListSelectionModel { public: From 3032f55d28eed2c4b315454681acb1ae4bac50e7 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Thu, 1 Dec 2011 10:39:32 +0100 Subject: [PATCH 2/3] Fix #8167: create compatibility symlink in /boot/home/config/be * instead of in /boot/home/config/settings/be, the compatibility link has to live directly in the config folder, as otherwise it doesn't help compatibility-wise at all ;-) --- build/jam/HaikuImage | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage index 842fcc93d6..2b9a9cdc14 100644 --- a/build/jam/HaikuImage +++ b/build/jam/HaikuImage @@ -360,7 +360,7 @@ AddDirectoryToHaikuImage home mail draft ; AddDirectoryToHaikuImage home mail in ; AddDirectoryToHaikuImage home mail out ; -AddSymlinkToHaikuImage home config settings : deskbar : be ; +AddSymlinkToHaikuImage home config : settings/deskbar : be ; # Deskbar Application links AddDirectoryToHaikuImage home config settings deskbar Applications ; DESKBAR_APPLICATIONS = ActivityMonitor CharacterMap CodyCam CDPlayer DeskCalc From e7be020ce59cd8a50dcb9a782b3b15cfa769396c Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Thu, 1 Dec 2011 15:45:48 +0100 Subject: [PATCH 3/3] Adjust GetBuildFile() to use correct cgit-URL. --- data/bin/installoptionalpackage | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/data/bin/installoptionalpackage b/data/bin/installoptionalpackage index 540ea0bfcf..f2a22dfd6d 100755 --- a/data/bin/installoptionalpackage +++ b/data/bin/installoptionalpackage @@ -399,10 +399,13 @@ function GetBuildFile() if ! [ -f ${baseDir}/${buildfile} ] ; then echo "Fetching ${buildfile} ..." cd ${baseDir} - local baseURL=http://dev.haiku-os.org/export/ - local revision=`uname -v | awk '{print $1}' | sed -e 's/r//'` - local url="${baseURL}${revision}/haiku/trunk/build/jam/${buildfile}" - wget -q ${url} || ErrorExit "...failed to download $buildfile" + local baseURL=http://cgit.haiku-os.org/haiku/plain + local revisionTag=`uname -v | awk '{print $1}' | sed -e 's/-.*//'` + # the sed invocation above drops potential dirty markers off the + # revision tag + local url="${baseURL}/build/jam/${buildfile}?id=${revisionTag}" + wget -q ${url} -O ${buildfile} \ + || ErrorExit "...failed to download $buildfile" fi }