mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-22 19:50:05 +02:00
trackergrep: patch is upstreamed.
This commit is contained in:
@@ -1,37 +0,0 @@
|
||||
From 01dc993ab9184cd9ae7e829ec4eb728f6c5c9964 Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Duval <jerome.duval@gmail.com>
|
||||
Date: Sat, 28 Jan 2017 13:28:14 +0100
|
||||
Subject: x86_64 build fix
|
||||
|
||||
|
||||
diff --git a/source/Makefile b/source/Makefile
|
||||
index bab2895..d81769e 100644
|
||||
--- a/source/Makefile
|
||||
+++ b/source/Makefile
|
||||
@@ -54,7 +54,7 @@ RSRCS =
|
||||
# - if your library does not follow the standard library naming scheme,
|
||||
# you need to specify the path to the library and it's name.
|
||||
# (e.g. for mylib.a, specify "mylib.a" or "path/mylib.a")
|
||||
-LIBS = be tracker textencoding
|
||||
+LIBS = be tracker textencoding $(STDCPPLIBS)
|
||||
|
||||
# Specify additional paths to directories following the standard libXXX.so
|
||||
# or libXXX.a naming scheme. You can specify full paths or paths relative
|
||||
diff --git a/source/Model.cpp b/source/Model.cpp
|
||||
index be454a6..63848f6 100644
|
||||
--- a/source/Model.cpp
|
||||
+++ b/source/Model.cpp
|
||||
@@ -292,8 +292,8 @@ void Model::FreeHistory(BList *items)
|
||||
}
|
||||
|
||||
|
||||
-status_t Model::OpenFile(BFile *file, char *name, uint32 openMode = B_READ_ONLY,
|
||||
- directory_which which = B_USER_SETTINGS_DIRECTORY, BVolume *volume = NULL)
|
||||
+status_t Model::OpenFile(BFile *file, char *name, uint32 openMode,
|
||||
+ directory_which which, BVolume *volume)
|
||||
{
|
||||
if (file == NULL)
|
||||
return B_ERROR;
|
||||
--
|
||||
2.10.2
|
||||
|
||||
@@ -8,11 +8,11 @@ HOMEPAGE="https://github.com/HaikuArchives/TrackerGrep"
|
||||
COPYRIGHT="1998-2006 Matthijs Hollemans
|
||||
2007 Jonas Sundström."
|
||||
LICENSE="MIT"
|
||||
REVISION="2"
|
||||
SOURCE_URI="https://github.com/HaikuArchives/TrackerGrep/archive/v$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="7b19601d48ae26bc54345c26914892ea6a8e54f131c5049ee5bb52523a950d81"
|
||||
SOURCE_DIR="TrackerGrep-$portVersion"
|
||||
PATCHES="trackergrep-$portVersion.patchset"
|
||||
REVISION="3"
|
||||
gitCommit="4b7b780c39eab07b316f6bb511b15919513b9324"
|
||||
SOURCE_URI="https://github.com/HaikuArchives/TrackerGrep/archive/$gitCommit.tar.gz"
|
||||
CHECKSUM_SHA256="f17598bf340c6e0f5073f6ce5b21a2bea157ee5c72b65d94f3bf1530366e2cae"
|
||||
SOURCE_DIR="TrackerGrep-$gitCommit"
|
||||
|
||||
ARCHITECTURES="x86_gcc2 x86 x86_64"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user