diff --git a/haiku-apps/dockbert/dockbert-1.0.2b1.recipe b/haiku-apps/dockbert/dockbert-1.0.2b1.recipe index a90b59b49..4673fa2cb 100644 --- a/haiku-apps/dockbert/dockbert-1.0.2b1.recipe +++ b/haiku-apps/dockbert/dockbert-1.0.2b1.recipe @@ -5,11 +5,12 @@ may have shortcuts organized in \"tabs\", a tab of the running apps and some \ other general eyecandy. " HOMEPAGE="https://github.com/HaikuArchives/DockBert" -SRC_URI="git+https://github.com/HaikuArchives/DockBert#057c54674d" +SRC_URI="https://github.com/HaikuArchives/DockBert/archive/722161cf8646b18eee2d00208fa649a0ebfe8d00.zip" +CHECKSUM_SHA256="704a8cde914b41219e60ef8fc375ab7847cae580b1265f1b9b84cbe294334cce" COPYRIGHT="2005 yellowTAB GmbH" LICENSE="BSD (3-clause)" -REVISION="3" +REVISION="4" ARCHITECTURES="x86_gcc2 x86 ?x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" @@ -34,18 +35,16 @@ BUILD_PREREQUIRES=" cmd:mkdepend " -PATCHES="dockbert-1.0.2b1.patchset" - BUILD() { - cd trunk + cd source make OBJ_DIR=objects \ BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` } INSTALL() -{ +{ mkdir -p $appsDir - cp -a trunk/objects/Dock $appsDir/Dock + cp -a source/objects/Dock $appsDir/Dock addAppDeskbarSymlink $appsDir/Dock } diff --git a/haiku-apps/dockbert/patches/dockbert-1.0.2b1.patchset b/haiku-apps/dockbert/patches/dockbert-1.0.2b1.patchset deleted file mode 100644 index f9355852c..000000000 --- a/haiku-apps/dockbert/patches/dockbert-1.0.2b1.patchset +++ /dev/null @@ -1,99 +0,0 @@ -From c7dd365b426c78ef62bfb1b1b8ba149e9b6a7afb Mon Sep 17 00:00:00 2001 -From: Chris Roberts -Date: Mon, 2 Dec 2013 18:12:54 -0700 -Subject: Fix makefile stdc++ libs - - -diff --git a/trunk/Makefile b/trunk/Makefile -index fa6193c..748e5fd 100644 ---- a/trunk/Makefile -+++ b/trunk/Makefile -@@ -60,7 +60,7 @@ RSRCS= dockbert.rsrc - # naming scheme you need to specify the path to the library - # and it's name - # library: my_lib.a entry: my_lib.a or path/my_lib.a --LIBS= be tracker stdc++.r4 locale localestub -+LIBS= be tracker $(STDCPPLIBS) localestub - - # specify additional paths to directories following the standard - # libXXX.so or libXXX.a naming scheme. You can specify full paths --- -1.8.3.4 - -From ba30e33f9dc36ff2a92ed950ccbdc30c0aa1d0f0 Mon Sep 17 00:00:00 2001 -From: Sergei Reznikov -Date: Tue, 28 Oct 2014 23:36:58 +0300 -Subject: [PATCH] Include strings.h - ---- - trunk/InnerPanel.cpp | 1 + - trunk/InnerPanelIcons.cpp | 1 + - trunk/PanelWindow.cpp | 1 + - trunk/PanelWindowView.cpp | 2 ++ - trunk/TrackerMenus.cpp | 1 + - 5 files changed, 6 insertions(+) - -diff --git a/trunk/InnerPanel.cpp b/trunk/InnerPanel.cpp -index 01e56e5..aecc924 100644 ---- a/trunk/InnerPanel.cpp -+++ b/trunk/InnerPanel.cpp -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include - - #include "PanelWindow.h" - #include "PanelWindowView.h" -diff --git a/trunk/InnerPanelIcons.cpp b/trunk/InnerPanelIcons.cpp -index e22d297..74c47b0 100644 ---- a/trunk/InnerPanelIcons.cpp -+++ b/trunk/InnerPanelIcons.cpp -@@ -12,6 +12,7 @@ - #include - #include - #include -+#include - #include - - #include "InnerPanelIcons.h" -diff --git a/trunk/PanelWindow.cpp b/trunk/PanelWindow.cpp -index 3905f87..2254d1a 100644 ---- a/trunk/PanelWindow.cpp -+++ b/trunk/PanelWindow.cpp -@@ -25,6 +25,7 @@ - #include "tracker_private.h" - - #include -+#include - #include - - #include -diff --git a/trunk/PanelWindowView.cpp b/trunk/PanelWindowView.cpp -index e620164..5230538 100644 ---- a/trunk/PanelWindowView.cpp -+++ b/trunk/PanelWindowView.cpp -@@ -15,6 +15,8 @@ - #include - #include - -+#include -+ - #include - - //#define USE_WINDOW_SHAPING /* BeOS Dano code*/ -diff --git a/trunk/TrackerMenus.cpp b/trunk/TrackerMenus.cpp -index ff603a4..80445ef 100644 ---- a/trunk/TrackerMenus.cpp -+++ b/trunk/TrackerMenus.cpp -@@ -19,6 +19,7 @@ - - - #include -+#include - - #include "FSUtils.h" - #include "Commands.h" --- -1.8.3.4 -