From 895a39b4d4109aef5ae69e72c9f6caf9f5a14801 Mon Sep 17 00:00:00 2001 From: Josef Gajdusek Date: Wed, 3 Dec 2014 16:47:13 +0100 Subject: [PATCH] minimizeall: Fix the recipe --- .../minimizeall/minimizeall-1.0.0.recipe | 18 ++++++++++-------- .../patches/minimizeall-1.0.0.patch | 13 +++++++++++++ 2 files changed, 23 insertions(+), 8 deletions(-) create mode 100644 haiku-apps/minimizeall/patches/minimizeall-1.0.0.patch diff --git a/haiku-apps/minimizeall/minimizeall-1.0.0.recipe b/haiku-apps/minimizeall/minimizeall-1.0.0.recipe index 96625e96d..68d3ed56b 100644 --- a/haiku-apps/minimizeall/minimizeall-1.0.0.recipe +++ b/haiku-apps/minimizeall/minimizeall-1.0.0.recipe @@ -6,9 +6,9 @@ standalone app that minimizes the whole app, and a replicant for your Deskbar. \ Both do the same: Minimize all your apps! " HOMEPAGE="https://github.com/HaikuArchives/MinimizeAll/" -SRC_URI="git://github.com/HaikuArchives/MinimizeAll.git#12fefdf26131375f695693a680bf01edb35d57a9" +SRC_URI="git://github.com/HaikuArchives/MinimizeAll.git#5f61ffe08a0e832d6f5308c9fecccbbb573972f8" -REVISION="1" +REVISION="2" COPYRIGHT=" 2001-2008 Werner Freytag @@ -17,7 +17,7 @@ COPYRIGHT=" LICENSE="MIT" -ARCHITECTURES="x86_gcc2 x86 ?x86_64" +ARCHITECTURES="x86_gcc2 x86 x86_64" PROVIDES=" minimizeall = $portVersion @@ -36,14 +36,16 @@ BUILD_PREREQUIRES=" BUILD_REQUIRES=" haiku_devel >= $haikuVersion " + +PATCHES="minimizeall-1.0.0.patch" + BUILD() { - cd trunk mkdir -p bin # Step 1 - Building the app cd app - gcc -o ../bin/MinimizeAll -lbe main.cpp ../minimize.cpp + gcc -o ../bin/MinimizeAll -lbe -lstdc++ main.cpp ../minimize.cpp rc -o ../bin/MinimizeAll.rsrc Application.rdef xres -o ../bin/MinimizeAll ../bin/MinimizeAll.rsrc mimeset -f ../bin/MinimizeAll @@ -51,7 +53,7 @@ BUILD() # Step 2 - The DeskBar AddOn! cd "deskbar add-on" - gcc -o ../bin/DeskbarAddOn -lbe DeskbarView.cpp ../minimize.cpp + gcc -o ../bin/DeskbarAddOn -lbe -lstdc++ DeskbarView.cpp ../minimize.cpp rc -o ../bin/DeskbarAddOn.rsrc DeskbarAddOn.rdef xres -o ../bin/DeskbarAddOn ../bin/DeskbarAddOn.rsrc mimeset -f ../bin/DeskbarAddOn @@ -62,8 +64,8 @@ BUILD() INSTALL() { mkdir -p $appsDir/MinimizeAll - cp trunk/bin/MinimizeAll $appsDir/MinimizeAll/MinimizeAll - cp trunk/bin/DeskbarAddOn $appsDir/MinimizeAll/DeskbarAddOn + cp bin/MinimizeAll $appsDir/MinimizeAll/MinimizeAll + cp bin/DeskbarAddOn $appsDir/MinimizeAll/DeskbarAddOn addAppDeskbarSymlink $appsDir/MinimizeAll/MinimizeAll mkdir -p "$dataDir/deskbar/menu/Desktop applets" symlinkRelative -s "$appsDir/MinimizeAll/DeskbarAddOn" \ diff --git a/haiku-apps/minimizeall/patches/minimizeall-1.0.0.patch b/haiku-apps/minimizeall/patches/minimizeall-1.0.0.patch new file mode 100644 index 000000000..97b55c63d --- /dev/null +++ b/haiku-apps/minimizeall/patches/minimizeall-1.0.0.patch @@ -0,0 +1,13 @@ +diff --git a/minimize.cpp b/minimize.cpp +index cf3d1e1..c263d01 100644 +--- a/minimize.cpp ++++ b/minimize.cpp +@@ -20,6 +20,8 @@ + #include + #include + ++using std::vector; ++ + // wird irgendwo vom BeOS definiert (stammt aus Tracker source) + void do_minimize_team(BRect zoomRect, team_id team, bool zoom); + void do_bring_to_front_team(BRect zoomRect, team_id app, bool zoom);