haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 12:10:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Paladin: update to current git repo.

Browse Source 
Recipe was based on an unspecified version. Now reference a specific
commit. Remove patch as it was upstreamed. Remove pars of the recipe
that were nuked from Paladin.
This commit is contained in:
Adrien Destugues
2014-10-22 20:49:40 +02:00
parent e4bd47f901
commit 95226ac95b
2 changed files with 1 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
haiku-apps/paladin/paladin-git.recipe → haiku-apps/paladin/paladin-20141022.recipe
View File

@@ -4,7 +4,7 @@ Paladin is an open source integrated development environment (IDE) modeled \
after BeOS' BeIDE.
"
HOMEPAGE="http://paladin.sourceforge.net"
SRC_URI="git://github.com/HaikuArchives/Paladin"
SRC_URI="git://github.com/HaikuArchives/Paladin#cec6b2dac93f495c5e472ce8a17862296d3c1d14"
REVISION="1"
LICENSE="MIT"
COPYRIGHT="2008-2010 DarkWyrm"
@@ -14,18 +14,8 @@ ARCHITECTURES="x86_gcc2 x86 x86_64"
PROVIDES="
paladin = $portVersion
app:paladin = $portVersion
paledit = $portVersion
app:paledit = $portVersion
symbolfinder = $portVersion
app:symbolfinder = $portVersion
libhekkel = $portVersion
lib:libhekkel = $portVersion
rez = $portVersion
cmd:rez = $portVersion
ccache = $portVersion
cmd:ccache = $portVersion
fastdep = 0.16
cmd:fastdep = 0.16
"
REQUIRES="
@@ -54,7 +44,6 @@ USER_SETTINGS_FILE="settings/Paladin_settings"
SOURCE_DIR="Paladin"
PATCHES="paladin-git.patchset"
BUILD()
{
./buildsuite.sh 1
@@ -66,17 +55,9 @@ INSTALL()
mkdir -p $libDir
mkdir -p $binDir
cp ccache/ccache $binDir
cp fastdep-0.16/fastdep $binDir
cp Paladin/Paladin $appsDir/Paladin/
cp PalEdit/rez/rez $binDir
cp PalEdit/generated/distro/PalEdit $appsDir/Paladin/
cp PalEdit/generated/distro/lib/libhekkel.so $libDir
cp -r PalEdit/generated/distro/Languages $appsDir/Paladin/
cp -r PalEdit/generated/distro/Extensions $appsDir/Paladin/
cp SymbolFinder/SymbolFinder $appsDir/Paladin/
addAppDeskbarSymlink $appsDir/Paladin/Paladin Paladin
addAppDeskbarSymlink $appsDir/Paladin/PalEdit PalEdit
addAppDeskbarSymlink $appsDir/Paladin/SymbolFinder SymbolFinder
}

48
haiku-apps/paladin/patches/paladin-git.patchset
View File

@@ -1,48 +0,0 @@
From cab97efc07e4a49f61d9ff9ca7864c193ad22a9e Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Mon, 2 Jun 2014 17:04:50 +0200
Subject: Fix build for atomic_add volatile changes.
diff --git a/Paladin/FindWindow.h b/Paladin/FindWindow.h
index f6aff2c..d1a8951 100644
--- a/Paladin/FindWindow.h
+++ b/Paladin/FindWindow.h
@@ -45,7 +45,7 @@ private:
thread_id fThreadID;
int8 fThreadMode;
- vint32 fThreadQuitFlag;
+ int32 fThreadQuitFlag;
BObjectList<BString> fFileList;
DPath fWorkingDir;
diff --git a/Paladin/Paladin.cpp b/Paladin/Paladin.cpp
index a09e30b..ed3c774 100644
--- a/Paladin/Paladin.cpp
+++ b/Paladin/Paladin.cpp
@@ -38,7 +38,7 @@ static int sReturnCode = 0;
static int32 sWindowCount = 0;
static BLocker sWindowLocker;
-volatile int32 gQuitOnZeroWindows = 1;
+int32 gQuitOnZeroWindows = 1;
void
RegisterWindow(void)
diff --git a/Paladin/Paladin.h b/Paladin/Paladin.h
index e3ee7a5..97bf312 100644
--- a/Paladin/Paladin.h
+++ b/Paladin/Paladin.h
@@ -45,7 +45,7 @@ void DeregisterWindow(void);
int32 CountRegisteredWindows(void);
BWindow *WindowForProject(Project *proj);
-extern volatile int32 gQuitOnZeroWindows;
+extern int32 gQuitOnZeroWindows;
#define APP_SIGNATURE "application/x-vnd.dw-Paladin"
--
1.8.3.4