From 9fe58496ec64c385bb192891b25a030f1bdc86dd Mon Sep 17 00:00:00 2001 From: Gleb Posobin Date: Mon, 2 Dec 2013 22:33:29 +0400 Subject: [PATCH 1/3] Added Mr.Peeps port --- haiku-apps/mrpeeps/mrpeeps-1.2_beta.recipe | 44 +++++++++++++++++++ .../mrpeeps/patches/MrPeeps-1.2_beta.patch | 30 +++++++++++++ 2 files changed, 74 insertions(+) create mode 100644 haiku-apps/mrpeeps/mrpeeps-1.2_beta.recipe create mode 100644 haiku-apps/mrpeeps/patches/MrPeeps-1.2_beta.patch diff --git a/haiku-apps/mrpeeps/mrpeeps-1.2_beta.recipe b/haiku-apps/mrpeeps/mrpeeps-1.2_beta.recipe new file mode 100644 index 000000000..7f9b189fa --- /dev/null +++ b/haiku-apps/mrpeeps/mrpeeps-1.2_beta.recipe @@ -0,0 +1,44 @@ +SUMMARY="Easy to use powerful contact manager for haiku" +DESCRIPTION="MrPeeps is an app for managing People files that has more + features than other contact managers. For more info read README file" +HOMEPAGE="https://github.com/HaikuArchives/MrPeeps" +SRC_URI="git+https://github.com/HaikuArchives/MrPeeps#ce2e65" +LICENSE="MIT" +REVISION="1" +PROVIDES=" + MrPeeps = $portVersion + app:MrPeeps = $portVersion + cmd:MrPeeps = $portVersion + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + cmd:gcc + " +ARCHITECTURES="x86 x86_gcc2 x86_64" +PATCHES="MrPeeps-1.2_beta.patch" + +BUILD() +{ + cd src + cp Locale\ Support/* ./ + g++ -lbe -ltranslation -lroot AboutWindow.cpp BitmapDump.cpp \ + BitmapView.cpp BStringList.cpp DataView.cpp Formatting.cpp \ + IntroView.cpp ListData.cpp MrPeeps.cpp NewTextControl.cpp \ + PeepsItem.cpp PeepsWindow.cpp PeopleList.cpp LocaleRoster.cpp \ + Locale.cpp TextFile.cpp -o ../MrPeeps +} + +INSTALL() +{ + mrPeepsDir=$appsDir/MrPeeps + mkdir -p $mrPeepsDir + [ -h $binDir ] || mkdir -p $binDir + cp -f ./MrPeeps $mrPeepsDir + ln -sfn $mrPeepsDir/MrPeeps $binDir/ + addAppDeskbarSymlink $mrPeepsDir/MrPeeps +} + +COPYRIGHT="2003 DarkWyrm" diff --git a/haiku-apps/mrpeeps/patches/MrPeeps-1.2_beta.patch b/haiku-apps/mrpeeps/patches/MrPeeps-1.2_beta.patch new file mode 100644 index 000000000..d3971b4e2 --- /dev/null +++ b/haiku-apps/mrpeeps/patches/MrPeeps-1.2_beta.patch @@ -0,0 +1,30 @@ +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-01 20:25:27.129236992 +0400 +@@ -2,6 +2,7 @@ + #define LIST_DATA + + #include ++#include + #include + #include + #include "BStringList.h" +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-01 20:24:59.028573696 +0400 +@@ -8,6 +8,8 @@ + #include + #include + #include ++#include ++#include + #include "NewTextControl.h" + #include + #include "LocaleRoster.h" +@@ -117,4 +119,4 @@ + + #define TRANSLATE(x) gCurrentLocale->Translate(x).String() + +-#endif +\ No newline at end of file ++#endif From bb139026da64b40f0db67ece5b9e8ee8be3561ce Mon Sep 17 00:00:00 2001 From: Gleb Posobin Date: Mon, 2 Dec 2013 23:38:15 +0400 Subject: [PATCH 2/3] edit Mr.Peeps port a little bit --- haiku-apps/mrpeeps/mrpeeps-1.2_beta.recipe | 6 ++-- .../mrpeeps/patches/MrPeeps-1.2_beta.patch | 33 ++++++++++++++----- 2 files changed, 26 insertions(+), 13 deletions(-) diff --git a/haiku-apps/mrpeeps/mrpeeps-1.2_beta.recipe b/haiku-apps/mrpeeps/mrpeeps-1.2_beta.recipe index 7f9b189fa..fe9290f46 100644 --- a/haiku-apps/mrpeeps/mrpeeps-1.2_beta.recipe +++ b/haiku-apps/mrpeeps/mrpeeps-1.2_beta.recipe @@ -4,11 +4,12 @@ DESCRIPTION="MrPeeps is an app for managing People files that has more HOMEPAGE="https://github.com/HaikuArchives/MrPeeps" SRC_URI="git+https://github.com/HaikuArchives/MrPeeps#ce2e65" LICENSE="MIT" +COPYRIGHT="2003 DarkWyrm" REVISION="1" +ARCHITECTURES="x86 x86_gcc2 x86_64" PROVIDES=" MrPeeps = $portVersion app:MrPeeps = $portVersion - cmd:MrPeeps = $portVersion " REQUIRES=" haiku >= $haikuVersion @@ -17,7 +18,6 @@ BUILD_REQUIRES=" haiku_devel >= $haikuVersion cmd:gcc " -ARCHITECTURES="x86 x86_gcc2 x86_64" PATCHES="MrPeeps-1.2_beta.patch" BUILD() @@ -40,5 +40,3 @@ INSTALL() ln -sfn $mrPeepsDir/MrPeeps $binDir/ addAppDeskbarSymlink $mrPeepsDir/MrPeeps } - -COPYRIGHT="2003 DarkWyrm" diff --git a/haiku-apps/mrpeeps/patches/MrPeeps-1.2_beta.patch b/haiku-apps/mrpeeps/patches/MrPeeps-1.2_beta.patch index d3971b4e2..ab4587221 100644 --- a/haiku-apps/mrpeeps/patches/MrPeeps-1.2_beta.patch +++ b/haiku-apps/mrpeeps/patches/MrPeeps-1.2_beta.patch @@ -1,26 +1,41 @@ 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-01 20:25:27.129236992 +0400 -@@ -2,6 +2,7 @@ - #define LIST_DATA ++++ ./src/ListData.h 2013-12-02 23:31:26.658767872 +0400 +@@ -3,6 +3,7 @@ #include -+#include #include ++#include #include #include "BStringList.h" + #include 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-01 20:24:59.028573696 +0400 -@@ -8,6 +8,8 @@ ++++ ./src/PeepsWindow.h 2013-12-02 23:32:59.641990656 +0400 +@@ -1,16 +1,18 @@ + #ifndef PEEPSWINDOW_H + #define PEEPSWINDOW_H + +-#include +-#include +-#include +-#include #include ++#include ++#include #include #include -+#include -+#include - #include "NewTextControl.h" +-#include "NewTextControl.h" #include ++#include ++#include ++#include ++#include #include "LocaleRoster.h" ++#include "NewTextControl.h" + + class PeopleList; + class PeepsListItem; @@ -117,4 +119,4 @@ #define TRANSLATE(x) gCurrentLocale->Translate(x).String() From cbcb976abf6119fb5a9944967a628e81635a441c Mon Sep 17 00:00:00 2001 From: Gleb Posobin Date: Mon, 9 Dec 2013 19:43:39 +0400 Subject: [PATCH 3/3] 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