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

Fix several broken recipes due to "$(HOMEPAGE)" (#912)

Browse Source 
Added new version and removed the old one for beshare,
fix broken thing and reformat the style to follow guidelines:
- belife
- beshare
- catkeyseditor
- colors
- copynametoclipboard
- desknotes
- genesis_commander
This commit is contained in:
Raefaldhi Amartya Junior
2016-12-16 04:05:28 +07:00
committed by fbrosson
parent 58be167e71
commit 1f76cce1b0
9 changed files with 48 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
haiku-apps/belife/belife-1.0.0.recipe
View File

@@ -14,7 +14,10 @@ HOMEPAGE="https://github.com/HaikuArchives/BeLife"
COPYRIGHT="2006 Studio-33"
LICENSE="BeLife License"
REVISION="2"
SOURCE_URI="$(HOMEPAGE)/archive/96e31e8b4543723c7c8ea4a3d0c57c8cd52f82ca.tar.gz"
srcGitRev="96e31e8b4543723c7c8ea4a3d0c57c8cd52f82ca"
SOURCE_URI="$HOMEPAGE/archive/$srcGitRev.tar.gz"
CHECKSUM_SHA256="2566dc527e336277173179c7cce0771579257e19bbcd853377cd6112547a08d1"
SOURCE_DIR="BeLife-$srcGitRev"
ARCHITECTURES="x86 x86_gcc2"

24
haiku-apps/beshare/beshare-2.31.recipe → haiku-apps/beshare/beshare-2.32.recipe
View File

@@ -13,16 +13,15 @@ have to click \"refresh\" or anything first)
- BeShare supports any number of simultaneous uploads and downloads \
in parallel, but will serialize simultaneous file requests to any \
given host for efficiency."
COPYRIGHT="1999-2012 Jeremy Friesner"
LICENSE="
Public Domain
libsanta
"
HOMEPAGE="https://github.com/HaikuArchives/BeShare"
SOURCE_URI="$(HOMEPAGE)/archive/b721fcc.tar.gz"
SOURCE_URI_2="https://public.msli.com/lcs/muscle/muscle6.11.zip"
COPYRIGHT="1999-2012 Jeremy Friesner"
LICENSE="Public Domain
libsanta"
REVISION="1"
CHECKSUM_SHA256_2="7cf3c92095f46e5a0858852e7d387d11fdf8e1e95a4de26b5e68e8319a373340"
srcGitRev="2345e48664fddfff1d9a968d1da2a185dbbdb50c"
SOURCE_URI="$HOMEPAGE/archive/$srcGitRev.tar.gz"
CHECKSUM_SHA256="da4a7149793f2b4af72cbcb8ad009df45c8944b9194529e53b81d535ded8ccce"
SOURCE_DIR="BeShare-$srcGitRev"
ARCHITECTURES="!x86_gcc2 x86 ?x86_64"
SECONDARY_ARCHITECTURES="x86"
@@ -36,27 +35,26 @@ REQUIRES="
lib:libsanta$secondaryArchSuffix
lib:libz
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libsanta$secondaryArchSuffix
devel:libz$secondaryArchSuffix
#devel:muscle$secondaryArchSuffix
# devel:muscle$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:make
cmd:wget
makefile_engine
"
PATCHES="beshare-$portVersion.patchset"
BUILD()
{
ln -sf ../../sources-2/muscle muscle
./getMUSCLE.sh
cd source
make $jobArgs
#LOCAL_INCLUDE_PATHS=$includeDir/muscle
}
INSTALL()

129
haiku-apps/beshare/patches/beshare-2.31.patchset
View File

@@ -1,129 +0,0 @@
From 9e1f887507fd97d0b6939b1396a91c976ab7def5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Sat, 26 Jul 2014 19:45:13 +0200
Subject: Fix paths for writable directories (logs, downloads, shared)
BeShare had the bad habit of putting everything inside
it's own folder...
Now we should have:
~/config/var/log/BeShare/
~/BeShare downloads/
~/BeShare shared/
diff --git a/source/ChatWindow.cpp b/source/ChatWindow.cpp
index 2ee7eef..7b789b0 100644
--- a/source/ChatWindow.cpp
+++ b/source/ChatWindow.cpp
@@ -7,6 +7,7 @@
#include <Beep.h>
#include <Application.h>
+#include <FindDirectory.h>
#include <Roster.h>
#include <MessageFilter.h>
#include <StringView.h>
@@ -1166,22 +1167,32 @@ ChatWindow::AddBorderView(BView * v)
status_t
ChatWindow::GetAppSubdir(const char * subDirName, BDirectory & subDir, bool createIfNecessary) const
{
- app_info appInfo;
- be_app->GetAppInfo(&appInfo);
- BEntry appEntry(&appInfo.ref);
- appEntry.GetParent(&appEntry); // get the directory it's in
- BPath path(&appEntry);
- BPath subPath(&appEntry);
- subPath.Append(subDirName);
+ directory_which which = B_USER_DIRECTORY;
+ if (!strcmp(subDirName, "logs"))
+ which = B_USER_LOG_DIRECTORY;
+ BPath path;
+ status_t err;
+
+ err = find_directory(which, &path, true);
+ if (err != B_OK)
+ return err;
+
+ BDirectory baseDir(path.Path());
+ err = baseDir.InitCheck();
+ if (err != B_OK)
+ return err;
+
+ BString leaf("BeShare");
+ if (strcmp(subDirName, "logs"))
+ leaf << " " << subDirName;
// If the directory is already there, use it
- if (subDir.SetTo(subPath.Path()) == B_NO_ERROR) return B_NO_ERROR;
+ if (subDir.SetTo(&baseDir, leaf.String()) == B_NO_ERROR) return B_NO_ERROR;
// Directory not there? Shall we create it then?
if (createIfNecessary)
{
- BDirectory appDir(path.Path());
- if ((appDir.InitCheck() == B_NO_ERROR)&&(appDir.CreateDirectory(subDirName, &subDir) == B_NO_ERROR)) return B_NO_ERROR;
+ if (baseDir.CreateDirectory(leaf.String(), &subDir) == B_NO_ERROR) return B_NO_ERROR;
}
return B_ERROR; // oops, couldn't get it
}
--
2.2.2
From d30e751890d1a695805ca7abdfa537007441c5eb Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@gmail.com>
Date: Wed, 29 Apr 2015 21:02:17 +0200
Subject: Minor build fixes.
diff --git a/source/Makefile b/source/Makefile
index abb41d4..003b58f 100644
--- a/source/Makefile
+++ b/source/Makefile
@@ -140,7 +140,7 @@ LOCALES =
# use. For example, setting DEFINES to "DEBUG=1" will cause the compiler
# option "-DDEBUG=1" to be used. Setting DEFINES to "DEBUG" would pass
# "-DDEBUG" on the compiler's command line.
-DEFINES = MUSCLE_ENABLE_ZLIB_ENCODING \
+DEFINES = _BSD_SOURCE MUSCLE_ENABLE_ZLIB_ENCODING \
MUSCLE_AVOID_IPV6 \
MUSCLE_NO_EXCEPTIONS \
MUSCLE_USE_PTHREADS # \
diff --git a/source/ShareFileTransfer.cpp b/source/ShareFileTransfer.cpp
index 8a067e5..def3488 100644
--- a/source/ShareFileTransfer.cpp
+++ b/source/ShareFileTransfer.cpp
@@ -1631,7 +1631,7 @@ ShareFileTransfer::BeginTransfer()
if (startConnect) {
if (_mtt) {
if ((_mtt->StartInternalThread() == B_NO_ERROR)
- && (_mtt->AddNewConnectSession(_remoteHostName(), _remotePort, GetTransferSessionRef()) == B_NO_ERROR))
+ && (_mtt->AddNewConnectSession(_remoteHostName(), _remotePort, GetTransferSessionRef(), false) == B_NO_ERROR))
_isConnecting = true;
else
((ShareWindow*)Looper())->LogMessage(LOG_ERROR_MESSAGE, str(STR_ERROR_STARTING_DELAYED_CONNECT));
diff --git a/source/ShareNetClient.cpp b/source/ShareNetClient.cpp
index ab0a070..399a846 100644
--- a/source/ShareNetClient.cpp
+++ b/source/ShareNetClient.cpp
@@ -822,7 +822,7 @@ MessageReceived(const MessageRef & msgRef)
const char * fileName = GetPathClause(FILE_INFO_DEPTH, nodepath());
if ((_queryActive)&&(_sessionIDRegExp.Match(sessionID()))&&(_fileNameRegExp.Match(fileName)))
{
- MessageRef unpacked = InflateMessage(tempRef);
+ MessageRef unpacked = muscle::InflateMessage(tempRef);
if (unpacked()) ((ShareWindow *)Looper())->PutResult(sessionID(), fileName, (GetPathClause(USER_NAME_DEPTH, nodepath())[2] == 'r'), unpacked);
}
}
@@ -944,7 +944,7 @@ AddWatchedDirectory(const node_ref & dirNode, const BEntry & entry, thread_id *
nextpath += entryRef.name;
- MessageRef packed = DeflateMessage(nextFileRef, 9, true);
+ MessageRef packed = muscle::DeflateMessage(nextFileRef, 9, true);
if (packed())
{
uploadMsg()->AddMessage(nextpath(), packed);
--
2.2.2

5
haiku-apps/catkeyseditor/catkeyseditor-0.1.0.recipe
View File

@@ -10,7 +10,10 @@ HOMEPAGE="https://github.com/puckipedia/BeLocalized"
COPYRIGHT="2014-2015 Puck Meerburg"
LICENSE="MIT"
REVISION="1"
SOURCE_URI="git+https://github.com/puckipedia/BeLocalized#3fa4f550ee83a4b64c27571eb518270f9500791b"
scrGitRev="3fa4f550ee83a4b64c27571eb518270f9500791b"
SOURCE_URI="$HOMEPAGE/archive/$scrGitRev.tar.gz"
CHECKSUM_SHA256="054c0394572aa7e4c485e7f018544bc2431eaf12d6d64e0a578d5061d1cf00eb"
SOURCE_DIR="BeLocalized-$scrGitRev"
ARCHITECTURES="x86_gcc2 x86 ?x86_64"

5
haiku-apps/catkeyseditor/catkeyseditor-0.1.1.recipe
View File

@@ -10,7 +10,10 @@ HOMEPAGE="https://github.com/puckipedia/BeLocalized"
COPYRIGHT="2014-2015 Puck Meerburg"
LICENSE="MIT"
REVISION="1"
SOURCE_URI="$(HOMEPAGE)/archive/989904ff0181147e5fe7e205096f09e1cc4d8bdd.tar.gz"
scrGitRev="989904ff0181147e5fe7e205096f09e1cc4d8bdd"
SOURCE_URI="$HOMEPAGE/archive/$scrGitRev.tar.gz"
CHECKSUM_SHA256="894eab6f25b6f67afadea018b4ab9508af927cc7ddd349b4a924bc3ba832b6f6"
SOURCE_DIR="BeLocalized-$scrGitRev"
ARCHITECTURES="x86_gcc2 x86 ?x86_64"

11
haiku-apps/colors/colors-2.3.recipe
View File

@@ -14,7 +14,10 @@ COPYRIGHT="2001-2008 Werner Freytag
2009-2013 John Scipione"
LICENSE="MIT"
REVISION="2"
SOURCE_URI="$(HOMEPAGE)/archive/9d832d2c995f822e6386223cb36840743c7e886a.tar.gz"
srcGitRev="9d832d2c995f822e6386223cb36840743c7e886a"
SOURCE_URI="$HOMEPAGE/archive/$srcGitRev.tar.gz"
CHECKSUM_SHA256="05c5d19b6a29c532e32b11ce6ac805736eddca7348fbf3b917a60f31d29f454d"
SOURCE_DIR="Colors-$srcGitRev"
ARCHITECTURES="x86_gcc2 x86 ?x86_64"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
@@ -24,9 +27,13 @@ PROVIDES="
app:Colors = $portVersion
"
REQUIRES="
haiku${secondaryArchSuffix}
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
"
BUILD_PREREQUIRES="
haiku${secondaryArchSuffix}_devel
makefile_engine
cmd:gcc$secondaryArchSuffix
cmd:make

5
haiku-apps/copynametoclipboard/copynametoclipboard-1.0.1.recipe
View File

@@ -9,7 +9,10 @@ COPYRIGHT="2000 Werner Freytag
2012 Humdinger"
LICENSE="MIT"
REVISION="2"
SOURCE_URI="$(HOMEPAGE)/archive/1da1d52429db53f15c3debf817e982d9ce6346b4.tar.gz"
srcGitRev="1da1d52429db53f15c3debf817e982d9ce6346b4"
SOURCE_URI="$HOMEPAGE/archive/$srcGitRev.tar.gz"
CHECKSUM_SHA256="0da82ec16782e98a1d3ba3016cd0de29aded11213ed2a77b939c085693372a98"
SOURCE_DIR="CopyNameToClipboard-$srcGitRev"
ARCHITECTURES="x86_gcc2 x86 ?x86_64"

5
haiku-apps/desknotes/desknotes-1.1.recipe
View File

@@ -10,7 +10,10 @@ HOMEPAGE="https://github.com/HaikuArchives/DeskNotes"
COPYRIGHT="2000 Colin Stewart"
LICENSE="BSD (3-clause)"
REVISION="4"
SOURCE_URI="$(HOMEPAGE)/archive/e39a1cf592c5a51f49578dd5efe0bbb1c6d0f450.tar.gz"
srcGitRev="e39a1cf592c5a51f49578dd5efe0bbb1c6d0f450"
SOURCE_URI="$HOMEPAGE/archive/$srcGitRev.tar.gz"
CHECKSUM_SHA256="f72a78d1c39a7193c8dd404b066190f5fd9452b7c650f2eb31cf2a4c6bfdede5"
SOURCE_DIR="DeskNotes-$srcGitRev"
ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"

10
haiku-apps/genesis_commander/genesis_commander-0.42.recipe
View File

@@ -4,7 +4,10 @@ HOMEPAGE="https://github.com/HaikuArchives/GenesisCommander"
COPYRIGHT="2002-2004 Zsolt Prievara"
LICENSE="MIT"
REVISION="2"
SOURCE_URI="$(HOMEPAGE)/archive/a5d4ef1521787e48fc40186cc1374cffe40527f1.tar.gz"
srcGitRev="a5d4ef1521787e48fc40186cc1374cffe40527f1"
SOURCE_URI="$HOMEPAGE/archive/$srcGitRev.tar.gz"
CHECKSUM_SHA256="af9b44278203c0abcda6543d016ae2657ad347b6eaf533af1e85fca00f49f3d3"
SOURCE_DIR="GenesisCommander-$srcGitRev"
ARCHITECTURES="x86_gcc2 x86 !x86_64"
@@ -15,8 +18,11 @@ PROVIDES="
REQUIRES="
haiku$secondaryArchSuffix
"
BUILD_PREREQUIRES="
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
"
BUILD_PREREQUIRES="
cmd:gcc$secondaryArchSuffix
cmd:make
makefile_engine