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

W6: recipe cleanup, switch to haikuarchives mirror, remove patch (#1410)

Browse Source
This commit is contained in:
miqlas
2017-06-11 21:34:46 +02:00
committed by waddlesplash
parent 61258b45c0
commit 0241a8f93d
2 changed files with 14 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
haiku-games/w6/patches/w6-1.7.patch
View File

@@ -1,53 +0,0 @@
diff -Naur W6Haiku/InfoView.cpp W6Haiku-haiku/InfoView.cpp
--- W6Haiku/InfoView.cpp 2008-08-16 02:57:03.065798144 +0000
+++ W6Haiku-haiku/InfoView.cpp 2013-01-13 11:59:46.657457152 +0000
@@ -280,7 +280,7 @@
sprintf(str2,_jour->month_name); strcat(str,str2);
sprintf(str2," %i, %i",_jour->month_counter, _jour->year); strcat(str,str2);
strcat(str,")");
- Window()->SetTitle(str);
+ //Window()->SetTitle(str);
//A l'ancienne
@@ -567,4 +567,4 @@
x->Close();
delete upBitmap;
delete downBitmap;
-}
\ No newline at end of file
+}
diff -Naur W6Haiku/W6.cpp W6Haiku-haiku/W6.cpp
--- W6Haiku/W6.cpp 2008-08-16 04:35:06.002359296 +0000
+++ W6Haiku-haiku/W6.cpp 2013-01-13 12:00:52.285736960 +0000
@@ -89,9 +89,9 @@
//classe qui tourne en permanence et qui fait les daypassed (et par conséquent, les battle etc.
- run_me = new Running(_country,_group,_politic,_weapon,_jour);
+ //run_me = new Running(_country,_group,_politic,_weapon,_jour);
runWin = new BWindow(BRect(0,0,0,0), "W6 time run", B_TITLED_WINDOW, B_NOT_RESIZABLE);
- runWin->AddChild(run_me); //sinon le pulse fonctionne pas...
+ //runWin->AddChild(run_me); //sinon le pulse fonctionne pas...
runWin->Lock();
runWin->Show(); //faut faire show pour lancer le pulse dans les views
runWin->Hide(); //quitte à hider la window ensuite
diff -Naur W6Haiku/makefile W6Haiku/makefil
e-new
--- W6Haiku/makefile 2014-01-09 17:29:39.128974848 +0100
+++ W6Haiku/makefile-new 2014-01-09 17:31:10.101974016 +0100
@@ -3,9 +3,12 @@
NAME := W6Haiku
TYPE := APP
SRCS := BarView.cpp BubbleHelper.cpp BuyWindow.cpp ChooseView.cpp ChooseWindow.cpp ColGrpView.cpp ColorWindow.cpp EditGrpWindow.cpp EditPolWindow.cpp EditWindow.cpp EditorGrpView.cpp EditorPolView.cpp EditorView.cpp FlagView.cpp GroupView.cpp GroupWindow.cpp HistoryView.cpp InfoView.cpp InfoWindow.cpp Init.cpp MapView.cpp OrderWindow.cpp PowerView.cpp Running.cpp SendWindow.cpp SpeedWindow.cpp StatusView.cpp TopView.cpp TxtView.cpp W6.cpp W6Window.cpp WeatherView.cpp attack.cpp classSound.cpp classSoundMaster.cpp country.cpp day.cpp group.cpp politic.cpp weapon.cpp
-LIBS := be media png tracker root translation
+LIBS := be media tracker root translation
OPTIMIZE := FULL
RSRCS := img.rsrc w6.rsrc
CC=g++#Additional makerules go here, use '#' to comment out lines
-include /boot/develop/etc/makefile-engine
+## include the makefile-engine
+DEVEL_DIRECTORY := \
+ $(shell findpaths -r "makefile_engine" B_FIND_PATH_DEVELOP_DIRECTORY)
+include $(DEVEL_DIRECTORY)/etc/makefile-engine

34
haiku-games/w6/w6-1.7.recipe
View File

@@ -4,18 +4,17 @@ with every single country on this planet including Swaziland (great hello to \
all of you Swaziland BeOS users). It has real data for every country in the \
world (at least in the 70's), including population, PNB etc.
Using the editor, you can let the computer play alone and turn it in kind of \
war simulation software.
"
HOMEPAGE="http://lema.link-u.com/be/"
SOURCE_URI="http://lema.link-u.com/be/W6Haiku.zip"
CHECKSUM_SHA256="6393cb0f4d31728d575ccfc70d5c40153c610024163487d2e46b8db4e8aa3c58"
SOURCE_URI_2="http://lema.link-u.com/be/W6forR5-with-sources.zip"
CHECKSUM_SHA256_2="0e12d3a80d668a6d86c4d2ea67aa1c18d7ece5f218d2512b36f96cdf3071bbdf"
REVISION="1"
LICENSE="Public Domain"
war simulation software."
HOMEPAGE="https://github.com/HaikuArchives/W6/"
COPYRIGHT="1998-1999 Santiago Lema"
LICENSE="MIT"
REVISION="2"
srcGitRev="bc2f91183e159804ef8ce3773bf562a132e1ebb7"
SOURCE_URI="https://github.com/HaikuArchives/W6/archive/$srcGitRev.tar.gz"
CHECKSUM_SHA256="91d11c2eeffd73684041615c9acbaaaedea29680eba553c3064bb394a582bc84"
SOURCE_DIR="W6-$srcGitRev"
ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
ARCHITECTURES="x86_gcc2 ?x86 x86_64"
PROVIDES="
w6 = $portVersion
@@ -23,9 +22,11 @@ PROVIDES="
"
REQUIRES="
haiku
lib:libpng
"
BUILD_REQUIRES="
haiku_devel
devel:libpng
"
BUILD_PREREQUIRES="
makefile_engine
@@ -33,24 +34,17 @@ BUILD_PREREQUIRES="
cmd:gcc
"
SOURCE_DIR="W6Haiku"
SOURCE_DIR_2="W6"
PATCHES="w6-1.7.patch"
BUILD()
{
cd sources
make $jobArgs
}
INSTALL()
{
ARCHITECTURE=$(echo $buildArchitecture | sed 's/_/-/g')
APPDIR=$appsDir/W6
mkdir -p $APPDIR
cp -a objects.$ARCHITECTURE-release/W6Haiku $APPDIR/W6
cp -r $sourceDir2/w6s $APPDIR
cp -r $sourceDir2/help $APPDIR
cp -r dist/* $APPDIR/
addAppDeskbarSymlink $APPDIR/W6
}