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

masterpiece: Fix masterpiece build

Browse Source 
The patch change fixes SQLite crashes at start.
This commit is contained in:
Josef Gajdusek
2014-12-05 16:16:23 +01:00
parent 017724d650
commit 81b54bfc9a
2 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
haiku-apps/masterpiece/masterpiece-r742.recipe
View File

@@ -27,12 +27,12 @@ REQUIRES="
haiku$secondaryArchSuffix >= $haikuVersion
lib:libsqlite3$secondaryArchSuffix
lib:liblayout
lib:libpython2.6
lib:libpython2.7
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel >= $haikuVersion
devel:libsqlite3$secondaryArchSuffix
devel:libpython2.6
devel:libpython2.7
"
BUILD_PREREQUIRES="
makefile_engine

20
haiku-apps/masterpiece/patches/masterpiece-r742.patch
View File

@@ -1,6 +1,20 @@
diff -Pur masterpiece/CommonFunctions.cpp masterpiece-haiku/CommonFunctions.cpp
--- masterpiece/CommonFunctions.cpp 2014-12-05 16:06:41.210736548 +0100
+++ masterpiece-haiku/CommonFunctions.cpp 2014-12-05 16:10:44.720736102 +0100
@@ -287,8 +287,8 @@
int sqlValue;
BString tmpString;
sqlErrMsg = 0;
- BString tmpPath = GetAppDirPath(); // for testing purposes, use local one.
- //BString tmpPath = GetUserDirPath(); // for publish purposes, use real location
+ //BString tmpPath = GetAppDirPath(); // for testing purposes, use local one.
+ BString tmpPath = GetUserDirPath(); // for publish purposes, use real location
if(tmpPath != "-15")
{
tmpPath += "/MasterPiece.db";
diff -Pur masterpiece/Makefile masterpiece-haiku/Makefile
--- masterpiece/Makefile 1970-01-01 00:00:00.000000000 +0000
+++ masterpiece-haiku/Makefile 2013-12-31 20:32:00.608960512 +0000
--- masterpiece/Makefile 1970-01-01 01:00:00.000000000 +0100
+++ masterpiece-haiku/Makefile 2014-12-05 16:09:36.420736227 +0100
@@ -0,0 +1,146 @@
+## BeOS Generic Makefile v2.5 ##
+
@@ -73,7 +87,7 @@ diff -Pur masterpiece/Makefile masterpiece-haiku/Makefile
+#                naming scheme you need to specify the path to the library
+#                and it's name
+#                library: my_lib.a entry: my_lib.a or path/my_lib.a
+LIBS=root be sqlite3 $(STDCPPLIBS) python2.6 tracker
+LIBS=root be sqlite3 $(STDCPPLIBS) python2.7 tracker
+
+#        specify additional paths to directories following the standard
+#        libXXX.so or libXXX.a naming scheme. You can specify full paths