From cbcb976abf6119fb5a9944967a628e81635a441c Mon Sep 17 00:00:00 2001 From: Gleb Posobin Date: Mon, 9 Dec 2013 19:43:39 +0400 Subject: [PATCH] Some more changes to Mr.Peeps recipe --- haiku-apps/mrpeeps/mrpeeps-1.2_beta.recipe | 10 ++++------ haiku-apps/mrpeeps/patches/MrPeeps-1.2_beta.patch | 13 +++++++++---- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/haiku-apps/mrpeeps/mrpeeps-1.2_beta.recipe b/haiku-apps/mrpeeps/mrpeeps-1.2_beta.recipe index fe9290f46..d6047a9bf 100644 --- a/haiku-apps/mrpeeps/mrpeeps-1.2_beta.recipe +++ b/haiku-apps/mrpeeps/mrpeeps-1.2_beta.recipe @@ -16,6 +16,8 @@ REQUIRES=" " BUILD_REQUIRES=" haiku_devel >= $haikuVersion + " +BUILD_PREREQUIRES=" cmd:gcc " PATCHES="MrPeeps-1.2_beta.patch" @@ -33,10 +35,6 @@ BUILD() INSTALL() { - mrPeepsDir=$appsDir/MrPeeps - mkdir -p $mrPeepsDir - [ -h $binDir ] || mkdir -p $binDir - cp -f ./MrPeeps $mrPeepsDir - ln -sfn $mrPeepsDir/MrPeeps $binDir/ - addAppDeskbarSymlink $mrPeepsDir/MrPeeps + cp -f ./MrPeeps $appsDir + addAppDeskbarSymlink $appsDir/MrPeeps } diff --git a/haiku-apps/mrpeeps/patches/MrPeeps-1.2_beta.patch b/haiku-apps/mrpeeps/patches/MrPeeps-1.2_beta.patch index ab4587221..069aa06a4 100644 --- a/haiku-apps/mrpeeps/patches/MrPeeps-1.2_beta.patch +++ b/haiku-apps/mrpeeps/patches/MrPeeps-1.2_beta.patch @@ -1,17 +1,22 @@ diff -Naur -x .git /boot/home/MrPeeps/src/ListData.h ./src/ListData.h --- /boot/home/MrPeeps/src/ListData.h 2013-12-01 19:17:49.441188352 +0400 -+++ ./src/ListData.h 2013-12-02 23:31:26.658767872 +0400 -@@ -3,6 +3,7 @@ ++++ ./src/ListData.h 2013-12-09 19:07:33.235667456 +0400 +@@ -3,10 +3,11 @@ #include #include +#include #include - #include "BStringList.h" +-#include "BStringList.h" #include + #include "BitmapDump.h" ++#include "BStringList.h" + + class PeepsListItem; + class GroupItem; diff -Naur -x .git /boot/home/MrPeeps/src/PeepsWindow.h ./src/PeepsWindow.h --- /boot/home/MrPeeps/src/PeepsWindow.h 2013-12-01 19:17:49.467927040 +0400 -+++ ./src/PeepsWindow.h 2013-12-02 23:32:59.641990656 +0400 ++++ ./src/PeepsWindow.h 2013-12-09 19:07:59.108789760 +0400 @@ -1,16 +1,18 @@ #ifndef PEEPSWINDOW_H #define PEEPSWINDOW_H