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

ftppositive: upstream switched to makefile.

Browse Source
This commit is contained in:
Jerome Duval
2017-01-26 21:32:11 +01:00
parent 7380291643
commit 2400702525
2 changed files with 7 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
haiku-apps/ftppositive/ftppositive-1.0.recipe
View File

@@ -4,12 +4,11 @@ FtpPositive is a simple graphical FTP client."
HOMEPAGE="https://github.com/HaikuArchives/FtpPositive" HOMEPAGE="https://github.com/HaikuArchives/FtpPositive"
COPYRIGHT="2007 momoziro" COPYRIGHT="2007 momoziro"
LICENSE="FtpPositive" LICENSE="FtpPositive"
REVISION="3" REVISION="4"
srcGitRev="442f47a22fdd9be8853522da1749755d343d9e60" srcGitRev="d24fa2609ccb2964e72fecdf7c2d0d7172cb6898"
SOURCE_URI="$HOMEPAGE/archive/$srcGitRev.tar.gz" SOURCE_URI="$HOMEPAGE/archive/$srcGitRev.tar.gz"
CHECKSUM_SHA256="86e199c59699bc9f0a00e47fc0f510934a23568e4a40d2405f428d0cecfb15a5" CHECKSUM_SHA256="b8bbae8d488871270f94488fee0e1eb023f6aacddeca7ba5ab4da3e7427deedb"
SOURCE_DIR="FtpPositive-$srcGitRev" SOURCE_DIR="FtpPositive-$srcGitRev"
PATCHES="ftppositive-$portVersion.patchset"
ARCHITECTURES="x86_gcc2 x86 x86_64" ARCHITECTURES="x86_gcc2 x86 x86_64"
@@ -25,22 +24,20 @@ BUILD_REQUIRES="
haiku_devel haiku_devel
" "
BUILD_PREREQUIRES=" BUILD_PREREQUIRES="
makefile_engine
cmd:gcc cmd:gcc
cmd:jam cmd:make
" "
BUILD() BUILD()
{ {
cd src cd src
jam make OBJ_DIR=objects
#too lazy to fix the jamfile
mimeset -f FtpPositive
} }
INSTALL() INSTALL()
{ {
mkdir -p $appsDir mkdir -p $appsDir
cp -a src/FtpPositive $appsDir cp -a src/objects/FtpPositive $appsDir
addAppDeskbarSymlink $appsDir/FtpPositive addAppDeskbarSymlink $appsDir/FtpPositive
} }

61
haiku-apps/ftppositive/patches/ftppositive-1.0.patchset
View File

@@ -1,61 +0,0 @@
From 895db8dd8a9ad84d40e485ae712c1b034bb56482 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Tue, 24 Jan 2017 18:34:26 +0100
Subject: gcc5 and x86_64 fixes
diff --git a/src/ColumnListView.cpp b/src/ColumnListView.cpp
index b167618..c73e859 100644
--- a/src/ColumnListView.cpp
+++ b/src/ColumnListView.cpp
@@ -464,7 +464,7 @@ BRow::BRow(float height)
BRow::~BRow()
{
while (true) {
- BField *field = (BField*) fFields.RemoveItem(0L);
+ BField *field = (BField*) fFields.RemoveItem((int32)0);
if (field == 0)
break;
@@ -772,7 +772,7 @@ BColumnListView::BColumnListView(BRect rect, const char *name, uint32 resizingMo
BColumnListView::~BColumnListView()
{
while (true) {
- BColumn *column = (BColumn*) fColumns.RemoveItem(0L);
+ BColumn *column = (BColumn*) fColumns.RemoveItem((int32)0);
if (column == 0)
break;
@@ -1933,7 +1933,7 @@ void TitleView::ComputeDragBoundries(BColumn *findColumn, BPoint )
void TitleView::DrawTitle(BView *view, BRect rect, BColumn *column, bool depressed)
{
BRect drawRect;
- rgb_color borderColor = mix_color(fMasterView->Color(B_COLOR_HEADER_BACKGROUND), make_color(0, 0, 0), 128);
+ rgb_color borderColor = ::mix_color(fMasterView->Color(B_COLOR_HEADER_BACKGROUND), make_color(0, 0, 0), 128);
rgb_color backgroundColor;
rgb_color bevelHigh;
@@ -1943,15 +1943,15 @@ void TitleView::DrawTitle(BView *view, BRect rect, BColumn *column, bool depress
drawRect = rect;
drawRect.InsetBy(2, 2);
if (depressed) {
- backgroundColor = mix_color(fMasterView->Color(B_COLOR_HEADER_BACKGROUND), make_color(0, 0, 0), 64);
- bevelHigh = mix_color(backgroundColor, make_color(0, 0, 0), 64);
- bevelLow = mix_color(backgroundColor, make_color(255, 255, 255), 128);
+ backgroundColor = ::mix_color(fMasterView->Color(B_COLOR_HEADER_BACKGROUND), make_color(0, 0, 0), 64);
+ bevelHigh = ::mix_color(backgroundColor, make_color(0, 0, 0), 64);
+ bevelLow = ::mix_color(backgroundColor, make_color(255, 255, 255), 128);
drawRect.left++;
drawRect.top++;
} else {
backgroundColor = fMasterView->Color(B_COLOR_HEADER_BACKGROUND);
- bevelHigh = mix_color(backgroundColor, make_color(255, 255, 255), 192);
- bevelLow = mix_color(backgroundColor, make_color(0, 0, 0), 64);
+ bevelHigh = ::mix_color(backgroundColor, make_color(255, 255, 255), 192);
+ bevelLow = ::mix_color(backgroundColor, make_color(0, 0, 0), 64);
drawRect.bottom--;
drawRect.right--;
}
--
2.10.2