diff --git a/app-text/sword/sword-1.7.3.recipe b/app-text/sword/sword-1.7.3.recipe index 836e1dd43..1ea0242ac 100644 --- a/app-text/sword/sword-1.7.3.recipe +++ b/app-text/sword/sword-1.7.3.recipe @@ -1,24 +1,28 @@ -SUMMARY="the biblical text research engine" - +SUMMARY="The biblical text research engine" DESCRIPTION="The SWORD Project is the CrossWire Bible Society's free Bible \ software project. Its purpose is to create cross-platform open-source tools-- \ covered by the GNU General Public License-- that allow programmers and Bible \ societies to write new Bible software more quickly and easily. We also create \ Bible study software for all readers, students, scholars, and translators of \ -the Bible, and have a growing collection of over 200 texts in over 50 languages -" - +the Bible, and have a growing collection of over 200 texts in over 50 languages." HOMEPAGE="http://www.crosswire.org/sword" LICENSE="GNU GPL v2" -COPYRIGHT="Copyright 1998-2014 CrossWire Bible Society" +COPYRIGHT="1998-2014 CrossWire Bible Society" SRC_URI="http://www.crosswire.org/ftpmirror/pub/sword/source/v1.7/sword-1.7.3.tar.gz" CHECKSUM_SHA256="5a3d87ff155d5ecb0cfec052ba333b2b74d9273e2cc66fb1ca75747dfd8ea9ea" -REVISION="1" -ARCHITECTURES="x86_gcc2 x86" +REVISION="3" +ARCHITECTURES="x86 ?x86_64" +if [ $effectiveTargetArchitecture != x86_gcc2 ]; then + # x86_gcc2 is fine as primary target architecture as long as we're building + # for a different secondary architecture. + ARCHITECTURES="$ARCHITECTURES x86_gcc2" +else + ARCHITECTURES="$ARCHITECTURES !x86_gcc2" +fi SECONDARY_ARCHITECTURES="x86" PROVIDES=" - libsword$secondaryArchSuffix = $portVersion + sword$secondaryArchSuffix = $portVersion cmd:diatheke$secondaryArchSuffix = $portVersion cmd:imp2gbs$secondaryArchSuffix = $portVersion cmd:imp2ld$secondaryArchSuffix = $portVersion @@ -36,7 +40,11 @@ PROVIDES=" cmd:vs2osisreftxt$secondaryArchSuffix = $portVersion cmd:xml2gbs$secondaryArchSuffix = $portVersion lib:libsword$secondaryArchSuffix = $portVersion - lib:libsword$secondaryArchSuffix = $portVersion + " + +PROVIDES_devel=" + sword${secondaryArchSuffix}_devel = $portVersion + devel:libsword$secondaryArchSuffix = $portVersion " REQUIRES=" @@ -44,7 +52,12 @@ REQUIRES=" lib:libcurl$secondaryArchSuffix lib:libssl$secondaryArchSuffix lib:libcrypto$secondaryArchSuffix - lib:libz$libcrypto$secondaryArchSuffix + lib:libz$secondaryArchSuffix + " + +REQUIRES_devel=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + sword$secondaryArchSuffix == $portVersion base " BUILD_REQUIRES=" @@ -66,7 +79,6 @@ BUILD_PREREQUIRES=" BUILD() { - echo true runConfigure ./configure --without-conf --without-clucene make $jobArgs } @@ -74,4 +86,10 @@ BUILD() INSTALL() { make $jobArgs install + + prepareInstalledDevelLibs \ + libsword + + packageEntries devel \ + $developDir } diff --git a/dev-libs/exiv2/exiv2-0.24.recipe b/dev-libs/exiv2/exiv2-0.24.recipe new file mode 100644 index 000000000..c3a556817 --- /dev/null +++ b/dev-libs/exiv2/exiv2-0.24.recipe @@ -0,0 +1,73 @@ +SUMMARY="Exiv2 is a C++ library and a command line utility to manage image metadata." +DESCRIPTION="Exiv2 provides fast and easy read and write access to the Exif, IPTC and XMP metadata of images \ +in various formats. Exiv2 is available as free software and with a commercial \ +license, and is used in many projects." +HOMEPAGE="http://www.exiv2.org/" +COPYRIGHT=" + 2004-2013 Andreas Huggel + 2009 Brad Schick + " +LICENSE="GNU GPL v2" +SRC_URI="http://www.exiv2.org/exiv2-0.24.tar.gz" +CHECKSUM_SHA256="f4a443e6c7fb9d9f5e787732f76969a64c72c4c04af69b10ed57f949c2dfef8e" +REVISION="1" +ARCHITECTURES="x86" +if [ $effectiveTargetArchitecture != x86_gcc2 ]; then + ARCHITECTURES="x86_gcc2 $ARCHITECTURES" +else + ARCHITECTURES="!x86_gcc2 $ARCHITECTURES" +fi +SECONDARY_ARCHITECTURES="x86" + +PATCHES="exiv2-0.24.patch" + +PROVIDES=" + exiv2$secondaryArchSuffix = $portVersion + cmd:exiv2$secondaryArchSuffix = $portVersion + lib:libexiv2$secondaryArchSuffix = $portVersion + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libexpat$secondaryArchSuffix + lib:libz$secondaryArchSuffix + " +BUILD_REQUIRES=" + devel:libexpat$secondaryArchSuffix + devel:libz$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:gcc$secondaryArchSuffix + cmd:autoconf + cmd:make + cmd:awk # required by configure + cmd:find # required by libtool + " + +BUILD() { + cd config + autoconf + cp configure .. + cd .. + + runConfigure ./configure + make $jobArgs +} + +INSTALL() { + make install + + prepareInstalledDevelLibs libexiv2 + fixPkgconfig + + packageEntries devel \ + $developDir +} + +PROVIDES_devel=" + exiv2${secondaryArchSuffix}_devel = $portVersion + devel:libexiv2${secondaryArchSuffix} = $portVersion + " +REQUIRES_devel=" + exiv2$secondaryArchSuffix == $portVersion base + " diff --git a/dev-libs/exiv2/patches/exiv2-0.24.patch b/dev-libs/exiv2/patches/exiv2-0.24.patch new file mode 100644 index 000000000..3c2cafa2f --- /dev/null +++ b/dev-libs/exiv2/patches/exiv2-0.24.patch @@ -0,0 +1,12 @@ +diff -ur exiv2-0.24-orig/config/configure.ac exiv2-0.24/config/configure.ac +--- exiv2-0.24-orig/config/configure.ac 2013-07-24 02:47:31.008126464 +0000 ++++ exiv2-0.24/config/configure.ac 2014-12-06 10:53:18.091488256 +0000 +@@ -212,6 +212,8 @@ + case "$host_os" in + *mingw* | *cygwin*) + LDFLAGS="$LDFLAGS -no-undefined -lpsapi" ;; ++*beos* | *haiku*) ++ ;; + *) + LDFLAGS="$LDFLAGS -ldl" ;; + esac diff --git a/haiku-apps/armyknife/armyknife-4.3.0.recipe b/haiku-apps/armyknife/armyknife-4.3.0.recipe index 7a1f5a111..07dc07ec6 100644 --- a/haiku-apps/armyknife/armyknife-4.3.0.recipe +++ b/haiku-apps/armyknife/armyknife-4.3.0.recipe @@ -29,6 +29,8 @@ BUILD_PREREQUIRES=" cmd:ld$secondaryArchSuffix cmd:make cmd:unzip + cmd:find + cmd:xargs " BUILD() diff --git a/haiku-apps/capitalbe/capitalbe-1.0.recipe b/haiku-apps/capitalbe/capitalbe-1.0.recipe deleted file mode 100644 index 79d1ad151..000000000 --- a/haiku-apps/capitalbe/capitalbe-1.0.recipe +++ /dev/null @@ -1,46 +0,0 @@ -SUMMARY="A finance manager for Haiku." -DESCRIPTION="Capital Be is a finance manager for Haiku. Easily track where your money is \ -going. View reports, reconcile accounts and more! Like other programs \ -published by the same author, Capital Be focuses on keeping easy jobs easy and \ -making tough ones easier." -HOMEPAGE="http://github.com/HaikuArchives/CapitalBe" -SRC_URI="git://github.com/HaikuArchives/CapitalBe.git#eb8d7f92bbaa1594dddeb07c64f90442de106a3e" -REVISION="2" -LICENSE="MIT" -COPYRIGHT="2009 DarkWyrm (Jon Yoder)" -ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" - -PROVIDES=" - capitalbe = $portVersion - app:capitalbe = $portVersion - " - -REQUIRES=" - haiku >= $haikuVersion - " - -BUILD_REQUIRES=" - haiku_devel >= $haikuVersion - devel:libsqlite3 - " - -BUILD_PREREQUIRES=" - cmd:gcc - " - -BUILD() -{ - g++ -lbe -ltracker -ltranslation -lsqlite3 src/*.cpp -o capitalbe - rc -o capitalbe.rsrc src/capitalbe.rdef - xres -o capitalbe capitalbe.rsrc - mimeset -f capitalbe -} - -INSTALL() -{ - mkdir -p $appsDir/capitalbe - mkdir -p $appsDir/capitalbe/helpfiles - cp -r src/helpfiles/* $appsDir/capitalbe/helpfiles/ - mv capitalbe $appsDir/capitalbe/capitalbe - addAppDeskbarSymlink $appsDir/capitalbe/capitalbe "Capital Be" -} diff --git a/haiku-apps/capitalbe/capitalbe-1.1.recipe b/haiku-apps/capitalbe/capitalbe-1.1.recipe new file mode 100644 index 000000000..2b3010364 --- /dev/null +++ b/haiku-apps/capitalbe/capitalbe-1.1.recipe @@ -0,0 +1,51 @@ +SUMMARY="A finance manager for Haiku" +DESCRIPTION="CapitalBe is a finance manager for Haiku. Easily track \ +where your money is going. View reports, reconcile accounts and more! \ +Like other programs published by the same author, Capital Be focuses \ +on keeping easy jobs easy and making tough ones easier." +HOMEPAGE="http://github.com/HaikuArchives/CapitalBe" +SRC_URI="https://github.com/HaikuArchives/CapitalBe/archive/v1.1.tar.gz" +CHECKSUM_SHA256="e6e5ab26a372e79bbc1ac2eb6d7018296b983409f65c0da634bb420de08adde9" +SOURCE_DIR="CapitalBe-$portVersion" +REVISION="1" +LICENSE="MIT" +COPYRIGHT="2009 DarkWyrm (Jon Yoder)" +ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" + +PROVIDES=" + capitalbe = $portVersion + app:CapitalBe = $portVersion + " + +REQUIRES=" + haiku >= $haikuVersion + lib:libsqlite3 + " + +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + devel:libsqlite3 + " + +BUILD_PREREQUIRES=" + cmd:gcc + cmd:make + cmd:mkdepend + makefile_engine + " + +BUILD() +{ + make $jobArgs OBJ_DIR=objects +} + +INSTALL() +{ + capitalBeDir=$appsDir/CapitalBe + mkdir -p $capitalBeDir + mkdir -p $capitalBeDir/helpfiles + cp -r src/helpfiles/* $capitalBeDir/helpfiles/ + + mv objects/CapitalBe $capitalBeDir/CapitalBe + addAppDeskbarSymlink $capitalBeDir/CapitalBe "CapitalBe" +} diff --git a/haiku-apps/coveredcalc/coveredcalc-1.10.0.recipe b/haiku-apps/coveredcalc/coveredcalc-1.10.0.recipe new file mode 100644 index 000000000..0e9852022 --- /dev/null +++ b/haiku-apps/coveredcalc/coveredcalc-1.10.0.recipe @@ -0,0 +1,45 @@ +SUMMARY="The desktop calculator which features a skin interface system." +DESCRIPTION="CoveredCalc is a desktop calculator whose look and feel is \ +flexibly customizable. It works on Windows, BeOS, and Haiku. In this \ +application the word \"cover\" means a set of files for its design, \ +instead of the commonly used word \"skin\"." +HOMEPAGE="https://code.google.com/p/coveredcalc" +SRC_URI_1="svn+http://coveredcalc.googlecode.com/svn/trunk@72" +SRC_URI_2="https://coveredcalc.googlecode.com/files/CoveredCalcBe1.10.0.zip" +CHECKSUM_SHA256_2="f5256c9cdb581c0246292005e9d3275586552bd4630b91e7372bd1903a94b669" +REVISION="1" +LICENSE="MIT" +ARCHITECTURES="x86_gcc2 ?x86" +COPYRIGHT="2008 hiron@with.memail.jp" + +PROVIDES=" + coveredcalc = $portVersion + app:CoveredCalc = $portVersion + " + +REQUIRES=" + haiku >= $haikuVersion + " + +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + cmd:make + cmd:gcc + cmd:xres + " + +BUILD() +{ + cd Sources/CoveredCalc/CoveredCalcBe + make release $jobArgs +} + +INSTALL() +{ + mkdir -p $appsDir/CoveredCalc/{NLS,Keymaps} + cp Sources/CoveredCalc/CoveredCalcBe/obj.release/CoveredCalc $appsDir/CoveredCalc + cp LangFiles/BeOS/* $appsDir/CoveredCalc/NLS + cp KeyMappings/BeOS/* $appsDir/CoveredCalc/Keymaps + cp -R ../../sources-2/CoveredCalc/Covers $appsDir/CoveredCalc + addAppDeskbarSymlink $appsDir/CoveredCalc/CoveredCalc +} diff --git a/haiku-apps/einsteinium/einsteinium-20141023.recipe b/haiku-apps/einsteinium/einsteinium-20141023.recipe new file mode 100644 index 000000000..e6867d7f3 --- /dev/null +++ b/haiku-apps/einsteinium/einsteinium-20141023.recipe @@ -0,0 +1,77 @@ +SUMMARY="Monitor applications and system services" +DESCRIPTION=" +Einsteinium provides smarter monitoring of applications and system services \ +for Haiku. It will restart applications and system services that quit or crash, \ +gather statistics on application usage and provide customizable ranked lists of \ +applications. +" +HOMEPAGE="https://sourceforge.net/projects/esforhaiku/" +SRC_URI="svn://svn.code.sf.net/p/esforhaiku/code/trunk#r79" +REVISION="1" +LICENSE="BSD (3-clause)" +COPYRIGHT="2010-2013 Brian Hill" + +ARCHITECTURES="x86_gcc2" + +PROVIDES=" + einsteinium = $portVersion + app:Einsteinium = $portVersion + cmd:einsteinium_engine = $portVersion + cmd:einsteinium_daemon = $portVersion + " + +REQUIRES=" + haiku >= $haikuVersion + lib:libsqlite3 + lib:libxml2 + " + +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + makefile_engine + devel:libsqlite3 + devel:libxml2 + cmd:mkdepend + cmd:g++ + cmd:gcc + cmd:make + " + +PATCH() +{ + cd src + for f in Engine Daemon Preferences Launcher; do + sed -e "s|/boot/develop|$(finddir B_SYSTEM_DEVELOP_DIRECTORY)|" \ + -e "s|/boot/common/include|$(finddir B_SYSTEM_HEADERS_DIRECTORY)|" -i $f/makefile + done +} + +BUILD() +{ + cd src + for f in Engine Daemon; do + pushd $f + make $jobArgs OBJ_DIR=. + popd + done + for f in Preferences Launcher; do + pushd $f + make $jobArgs + popd + done +} + +INSTALL() +{ + mkdir -p $binDir + mkdir -p $appsDir + mkdir -p $preferencesDir + cd src + + cp Engine/einsteinium_engine Daemon/einsteinium_daemon $binDir + cp Preferences/Einsteinium_Preferences $preferencesDir/Einsteinium + cp Launcher/Einsteinium_Launcher $appsDir/Einsteinium + + addPreferencesDeskbarSymlink $preferencesDir/Einsteinium + addAppDeskbarSymlink $appsDir/Einsteinium +} diff --git a/haiku-apps/jammin/jammin-0.1.0.recipe b/haiku-apps/jammin/jammin-0.1.0.recipe index 304c280be..22ebdf6a8 100644 --- a/haiku-apps/jammin/jammin-0.1.0.recipe +++ b/haiku-apps/jammin/jammin-0.1.0.recipe @@ -6,8 +6,8 @@ Jamfiles are also used for organizing targets— each Jamfile is a separate \ project that can be built independently from the other projects. " HOMEPAGE="https://github.com/HaikuArchives/JamMin" -SRC_URI="git+https://github.com/HaikuArchives/JamMin.git#681e87d6d4" -REVISION="2" +SRC_URI="git+https://github.com/HaikuArchives/JamMin.git#85ce20ccc0" +REVISION="3" COPYRIGHT="2003 Guido Casiraghi" LICENSE="MIT" @@ -33,11 +33,10 @@ REQUIRES=" haiku >= $haikuVersion " -PATCHES="jampatch-1.patch" - BUILD() { + cd source make OBJ_DIR=objects \ BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` } @@ -45,6 +44,6 @@ BUILD() INSTALL() { mkdir -p $appsDir - cp objects/JamApp $appsDir + cp source/objects/JamApp $appsDir addAppDeskbarSymlink $appsDir/JamApp } diff --git a/haiku-apps/jammin/patches/jampatch-1.patch b/haiku-apps/jammin/patches/jampatch-1.patch deleted file mode 100644 index ab7bb8b26..000000000 --- a/haiku-apps/jammin/patches/jampatch-1.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff --git a/JamMin.rdef b/JamMin.rdef -index 1707392..a46587d 100644 ---- a/JamMin.rdef -+++ b/JamMin.rdef -@@ -13,10 +13,7 @@ resource app_version { - variety = B_APPV_ALPHA, - internal = 0, - -- short_info = "The Jamfile Administrator", -- long_info = #'CSTR' array { -- -- } -+ short_info = "The Jamfile Administrator" - }; - - resource app_flags B_SINGLE_LAUNCH; -diff --git a/JamMinWindow.cpp b/JamMinWindow.cpp -index 2b0077f..2b3c9af 100644 ---- a/JamMinWindow.cpp -+++ b/JamMinWindow.cpp -@@ -1001,10 +1001,6 @@ JamMinWindow::IsSystemLibraryPath(BPath* libPath) - //if (ret == B_OK) { - if ( strcmp(libPath->Path(), path.Path()) == 0 ) return true; - //} -- ret = find_directory(B_COMMON_LIB_DIRECTORY, &path); -- if (ret == B_OK) { -- if ( strcmp(libPath->Path(), path.Path()) == 0 ) return true; -- } - - ret = find_directory(B_USER_LIB_DIRECTORY, &path); //the same as B_COMMON_LIB_DIRECTORY - if (ret == B_OK) { -diff --git a/makefile b/makefile -new file mode 100644 -index 0000000..8514e9d ---- /dev/null -+++ b/makefile -@@ -0,0 +1,14 @@ -+## JamMin makefile for Haiku OS ## -+ -+NAME= JamApp -+ -+TYPE= APP -+ -+SRCS= TargetSettingsWin.cpp TargetConfig.cpp main.cpp LinkerSettingsView.cpp JMOpenFilePanel.cpp JamMinWindow.cpp JamMinApp.cpp JamFile.cpp IncludeSettingsView.cpp GeneralSettingsView.cpp CompilerSettingsView.cpp -+RDEFS= JamMin.rdef -+LIBS= be stdc++.r4 root tracker -+OPTIMIZE= FULL -+WARNINGS = ALL -+ -+## include makefile engine -+include $(BUILDHOME)/etc/makefile-engine diff --git a/haiku-apps/masterpiece/masterpiece-r742.recipe b/haiku-apps/masterpiece/masterpiece-r742.recipe index 9ca293bb2..eee731325 100644 --- a/haiku-apps/masterpiece/masterpiece-r742.recipe +++ b/haiku-apps/masterpiece/masterpiece-r742.recipe @@ -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 diff --git a/haiku-apps/masterpiece/patches/masterpiece-r742.patch b/haiku-apps/masterpiece/patches/masterpiece-r742.patch index 664639a2f..0d5103c15 100644 --- a/haiku-apps/masterpiece/patches/masterpiece-r742.patch +++ b/haiku-apps/masterpiece/patches/masterpiece-r742.patch @@ -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 diff --git a/haiku-apps/organizer/organizer-0.1.recipe b/haiku-apps/organizer/organizer-0.1.recipe index 6504f3d25..d5f850172 100644 --- a/haiku-apps/organizer/organizer-0.1.recipe +++ b/haiku-apps/organizer/organizer-0.1.recipe @@ -5,8 +5,8 @@ An organizer that helps you keep track on your appointments, notes and stuff. COPYRIGHT="2013 Marius Stene" LICENSE="Public Domain" HOMEPAGE="https://github.com/HaikuArchives/Organizer" -SRC_URI="git+https://github.com/HaikuArchives/Organizer#a534f0e992" -REVISION="2" +SRC_URI="git+https://github.com/HaikuArchives/Organizer#32196761f4" +REVISION="3" ARCHITECTURES="x86_gcc2 x86 ?x86_64" @@ -21,6 +21,8 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + devel:libGL makefile_engine cmd:gcc cmd:make @@ -31,13 +33,9 @@ REQUIRES=" haiku >= $haikuVersion " -PATCHES="organizer-0.1.patch" - USER_SETTINGS_FILES=" settings/fSub directory" -PATCHES="organizer-0.1.patchset" - BUILD() { cd Source diff --git a/haiku-apps/organizer/patches/organizer-0.1.patchset b/haiku-apps/organizer/patches/organizer-0.1.patchset deleted file mode 100644 index 3bf5d9b7d..000000000 --- a/haiku-apps/organizer/patches/organizer-0.1.patchset +++ /dev/null @@ -1,562 +0,0 @@ -From 9c4c954831ab5388dfc2bd18b1a220ca8b6e3b47 Mon Sep 17 00:00:00 2001 -From: Chris Roberts -Date: Mon, 2 Dec 2013 18:52:50 -0700 -Subject: applying patch organizer-0.1.patch - - -diff --git a/Source/App/Secret/glView.cpp b/Source/App/Secret/glView.cpp -index 96ef6c5..931e9a6 100644 ---- a/Source/App/Secret/glView.cpp -+++ b/Source/App/Secret/glView.cpp -@@ -22,7 +22,7 @@ - // Constructor/destructor - TutGLView::TutGLView( Wind *owner_wind, BRect frame, const char *name, - int32 mode, int32 flags ) -- : BGLView( frame, const_cast( name ), mode, flags, -+ : BGLView( frame, name, mode, flags, - BGL_RGB | BGL_DOUBLE | BGL_DEPTH ), - pad_x( 1.0 ), - pad_y(-2.0), -@@ -131,7 +131,7 @@ void TutGLView::ErrorCallback( GLenum err ) - // out. You'll have to run the application from a Terminal to see - // these. - fprintf( stderr, "Unexpected error occured (%ld):\n", err ); -- fprintf( stderr, "\t%s\n", gluErrorString( err ) ); -+ //fprintf( stderr, "\t%s\n", gluErrorString( err ) ); - } - - void TutGLView::Render( void ) -@@ -164,7 +164,7 @@ void TutGLView::gInit( void ) - glMatrixMode( GL_PROJECTION ); - glLoadIdentity(); - BRect r = Bounds(); -- gluPerspective( 45.0, r.Width() / r.Height(), 0.1, 100.0 ); -+ //gluPerspective( 45.0, r.Width() / r.Height(), 0.1, 100.0 ); - glMatrixMode( GL_MODELVIEW ); - } - -@@ -178,7 +178,7 @@ void TutGLView::gReshape( int width, int height ) - glViewport( 0, 0, width, height ); - glMatrixMode( GL_PROJECTION ); - glLoadIdentity(); -- gluPerspective( 45.0, (float)width/(float)height, 0.1, 100.0 ); -+ //gluPerspective( 45.0, (float)width/(float)height, 0.1, 100.0 ); - glMatrixMode( GL_MODELVIEW ); - } - -diff --git a/Source/App/calenderView.cpp b/Source/App/calenderView.cpp -index 54f6930..d72b47e 100644 ---- a/Source/App/calenderView.cpp -+++ b/Source/App/calenderView.cpp -@@ -55,7 +55,7 @@ mCalender->SetDay(mCalender->ThisDay()); - //Load Settings - MSave load("load"); - --find_directory(B_COMMON_SETTINGS_DIRECTORY, &Path); -+find_directory(B_SYSTEM_SETTINGS_DIRECTORY, &Path); - String.SetTo(Path.Path()); - String.Append(SAVE_SETTINGS_PATH); - Path.SetTo(String.String()); -diff --git a/Source/App/editScriptView.cpp b/Source/App/editScriptView.cpp -index a4df6d3..70a2cd4 100644 ---- a/Source/App/editScriptView.cpp -+++ b/Source/App/editScriptView.cpp -@@ -145,7 +145,7 @@ BString tempString2; - BString tempString3; - BString FilePath; - --find_directory(B_COMMON_SETTINGS_DIRECTORY, &fPath); -+find_directory(B_SYSTEM_SETTINGS_DIRECTORY, &fPath); - tempString.SetTo(fPath.Path()); - tempString.Append(SAVE_HISTORY_PATH); - fPath = tempString.String(); -@@ -183,7 +183,7 @@ BPath Path; - int ItemNumber = 1; - MSave Save("Save"); - --find_directory(B_COMMON_SETTINGS_DIRECTORY, &Path); -+find_directory(B_SYSTEM_SETTINGS_DIRECTORY, &Path); - tempString.SetTo(Path.Path()); - tempString.Append(SAVE_HISTORY_PATH); - for (int a = 1; a <= INT_MAXFILES; a++) -diff --git a/Source/App/editWindow.cpp b/Source/App/editWindow.cpp -index 6684829..1feb57e 100644 ---- a/Source/App/editWindow.cpp -+++ b/Source/App/editWindow.cpp -@@ -302,7 +302,7 @@ BString FilePath; - MSave Save("save"); - if(!strcmp(fPath.String(), "")) - { -- find_directory(B_COMMON_SETTINGS_DIRECTORY, &Path); -+ find_directory(B_SYSTEM_SETTINGS_DIRECTORY, &Path); - fPath.SetTo(Path.Path()); - fPath.Append(SAVE_NOTE_PATH); - Path = fPath.String(); -@@ -359,7 +359,7 @@ BEntry Entry("/boot/home"); - MSave Save("save"); - if(!strcmp(fPath.String(), "")) - { -- find_directory(B_COMMON_SETTINGS_DIRECTORY, &Path); -+ find_directory(B_SYSTEM_SETTINGS_DIRECTORY, &Path); - fPath.SetTo(Path.Path()); - fPath.Append(SAVE_NOTE_PATH); - Path = fPath.String(); -@@ -430,7 +430,7 @@ BEntry Entry("/boot/home"); - MSave Save("save"); - if(!strcmp(fPath.String(), "")) - { -- find_directory(B_COMMON_SETTINGS_DIRECTORY, &Path); -+ find_directory(B_SYSTEM_SETTINGS_DIRECTORY, &Path); - fPath.SetTo(Path.Path()); - fPath.Append(SAVE_HISTORY_PATH); - Path = fPath.String(); -@@ -509,7 +509,7 @@ BString FilePath; - MSave Save("save"); - if(!strcmp(fPath.String(), "")) - { -- find_directory(B_COMMON_SETTINGS_DIRECTORY, &Path); -+ find_directory(B_SYSTEM_SETTINGS_DIRECTORY, &Path); - fPath.SetTo(Path.Path()); - fPath.Append(SAVE_NOTE_PATH); - Path = fPath.String(); -diff --git a/Source/App/exportWindow.cpp b/Source/App/exportWindow.cpp -index 1ed3d33..0db456b 100644 ---- a/Source/App/exportWindow.cpp -+++ b/Source/App/exportWindow.cpp -@@ -114,7 +114,7 @@ BPath Path; - BEntry Entry("/boot/home"); - MSave Load("Load"); - --find_directory(B_COMMON_SETTINGS_DIRECTORY, &Path); -+find_directory(B_SYSTEM_SETTINGS_DIRECTORY, &Path); - fFolderPath.SetTo(Path.Path()); - fFolderPath.Append(SAVE_NOTE_PATH); - -diff --git a/Source/App/mWindow.cpp b/Source/App/mWindow.cpp -index 597f4ad..426bf83 100644 ---- a/Source/App/mWindow.cpp -+++ b/Source/App/mWindow.cpp -@@ -339,7 +339,7 @@ void mWindow::GetSettingsPath(BPath *path) - { - BPath Path; - BString string; --find_directory(B_COMMON_SETTINGS_DIRECTORY, &Path); -+find_directory(B_SYSTEM_SETTINGS_DIRECTORY, &Path); - string.SetTo(Path.Path()); - string.Append(SAVE_SETTINGS_PATH); - path->SetTo(string.String()); -@@ -358,7 +358,7 @@ BString tempString4; - BString FilePath; - BEntry Entry("/boot/home"); - --find_directory(B_COMMON_SETTINGS_DIRECTORY, &fPath); -+find_directory(B_SYSTEM_SETTINGS_DIRECTORY, &fPath); - tempString.SetTo(fPath.Path()); - tempString.Append(SAVE_NOTE_PATH); - fPath = tempString.String(); -diff --git a/Source/App/main.cpp b/Source/App/main.cpp -index 88a0269..aaf47e6 100644 ---- a/Source/App/main.cpp -+++ b/Source/App/main.cpp -@@ -11,7 +11,7 @@ int main(int32 argc, char** argv) - BPath path; - BString tmp; - MSave savefile("savefile"); --find_directory(B_COMMON_SETTINGS_DIRECTORY, &path); -+find_directory(B_SYSTEM_SETTINGS_DIRECTORY, &path); - tmp.SetTo(path.Path()); - tmp.Append(SAVE_SETTINGS_PATH); - path.SetTo(tmp.String()); -@@ -62,7 +62,7 @@ RunNotification = true; - \Notes - *********************************************/ - //Make sure all the folders are there --find_directory(B_COMMON_SETTINGS_DIRECTORY, &path); -+find_directory(B_SYSTEM_SETTINGS_DIRECTORY, &path); - //Make fSub folder - tmp.SetTo("mkdir "); - tmp.Append(path.Path()); -@@ -364,7 +364,7 @@ void mApp::MessageReceived(BMessage *message) - BString tempString; - BString tempString2; - BPath Path; -- find_directory(B_COMMON_SETTINGS_DIRECTORY, &Path); -+ find_directory(B_SYSTEM_SETTINGS_DIRECTORY, &Path); - tempString.SetTo(path.Path()); - tempString.Append(SAVE_SETTINGS_PATH); - save.FindString(tempString.String(), SAVE_FILE_NAME, NAME_EXEC_DIR, &tempString2, "M_ERROR"); -@@ -476,7 +476,7 @@ int32 - mApp::CheckForUpdateThread_static(void *data) - { - mApp *check4updates = (mApp *)data; -- check4updates->CheckForUpdateThread(); -+ //check4updates->CheckForUpdateThread(); - return 0; - } - -@@ -577,7 +577,7 @@ BEntry Entry("/boot/home"); - tmpString << _mWindow->_CalenderView->mCalender->ThisYear(); - _mWindow->Unlock(); - -- find_directory(B_COMMON_SETTINGS_DIRECTORY, &Path); -+ find_directory(B_SYSTEM_SETTINGS_DIRECTORY, &Path); - FolderPath.SetTo(Path.Path()); - FolderPath << SAVE_NOTE_PATH; - for (int a = 1; a <= INT_MAXFILES; a++) -@@ -631,7 +631,7 @@ BEntry Entry("/boot/home"); - if (NowMinute == TodayMinute && NowHour == TodayHour) - { - Save.FindString(FolderPath.String(), FileName.String(), SAVE_FILE_NOTE, &tmpString, "M_ERROR"); -- find_directory(B_COMMON_SETTINGS_DIRECTORY, &Path); -+ find_directory(B_SYSTEM_SETTINGS_DIRECTORY, &Path); - FolderPath.SetTo(Path.Path()); - FolderPath << SAVE_PATH_PART_1 << SAVE_PATH_PART_2; - FileName.SetTo("TempRunScript"); -diff --git a/Source/App/makefile b/Source/App/makefile -index 40cc7b6..dd0b811 100644 ---- a/Source/App/makefile -+++ b/Source/App/makefile -@@ -29,7 +29,7 @@ LIBS= root \ - translation \ - fSub - DEFINES= --LIBPATHS= ../../lib -+LIBPATHS= ../lib - - SYSTEM_INCLUDE_PATHS = - LOCAL_INCLUDE_PATHS = -diff --git a/Source/App/obsolete/Language.cpp b/Source/App/obsolete/Language.cpp -index 0c23228..89aa24b 100644 ---- a/Source/App/obsolete/Language.cpp -+++ b/Source/App/obsolete/Language.cpp -@@ -201,7 +201,7 @@ void mWindow::SetSettingsPath(BPath *path) - { - BPath Path; - BString string; --find_directory(B_COMMON_SETTINGS_DIRECTORY, &Path); -+find_directory(B_SYSTEM_SETTINGS_DIRECTORY, &Path); - string.SetTo(Path.Path()); - string.Append(SAVE_SETTINGS_PATH); - path->SetTo(string.String()); -diff --git a/Source/App/preferencesView.cpp b/Source/App/preferencesView.cpp -index 4b45894..e5ad788 100644 ---- a/Source/App/preferencesView.cpp -+++ b/Source/App/preferencesView.cpp -@@ -49,7 +49,7 @@ AddChild(mSettingsBox); - - MSave load("load"); - --find_directory(B_COMMON_SETTINGS_DIRECTORY, &Path); -+find_directory(B_SYSTEM_SETTINGS_DIRECTORY, &Path); - String.SetTo(Path.Path()); - String.Append(SAVE_SETTINGS_PATH); - Path.SetTo(String.String()); -diff --git a/Source/App/preferencesWindow.cpp b/Source/App/preferencesWindow.cpp -index f93ebfa..7b0f391 100644 ---- a/Source/App/preferencesWindow.cpp -+++ b/Source/App/preferencesWindow.cpp -@@ -39,7 +39,7 @@ void PreferencesWindow::MessageReceived(BMessage *message) - BPath Path; - BString String; - -- find_directory(B_COMMON_SETTINGS_DIRECTORY, &Path); -+ find_directory(B_SYSTEM_SETTINGS_DIRECTORY, &Path); - String.SetTo(Path.Path()); - String.Append(SAVE_SETTINGS_PATH); - String.Append(SAVE_FILE_NAME); -diff --git a/Source/lib/makefile b/Source/lib/makefile -index 0e9b9fb..0758c08 100644 ---- a/Source/lib/makefile -+++ b/Source/lib/makefile -@@ -1,4 +1,4 @@ --NAME= ../../../lib/libfSub.so -+NAME= ../libfSub.so - TYPE= SHARED - SRCS= Bitmap.cpp \ - Bubble.cpp \ --- -1.8.3.4 - - -From f6aca393df0895574cec3aac1c03cda254085b84 Mon Sep 17 00:00:00 2001 -From: Chris Roberts -Date: Mon, 2 Dec 2013 19:16:30 -0700 -Subject: Misc fixes - - -diff --git a/Source/App/Constants.h b/Source/App/Constants.h -index 3e709f9..6d1172e 100644 ---- a/Source/App/Constants.h -+++ b/Source/App/Constants.h -@@ -6,7 +6,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include -diff --git a/Source/App/Secret/glView.cpp b/Source/App/Secret/glView.cpp -index 931e9a6..11cb5e7 100644 ---- a/Source/App/Secret/glView.cpp -+++ b/Source/App/Secret/glView.cpp -@@ -7,7 +7,7 @@ - #include "glWindow.h" - - #include --#include -+//#include - #include - #include - #include -diff --git a/Source/App/exportWindow.cpp b/Source/App/exportWindow.cpp -index 0db456b..5971456 100644 ---- a/Source/App/exportWindow.cpp -+++ b/Source/App/exportWindow.cpp -@@ -210,7 +210,7 @@ fContent << "\n"; - fSaveTo.Append("/"); - fSaveTo.Append(_ExportView->mFileNameControl->Text()); - FILE* file = fopen(fSaveTo.String(), "w"); --cout << fSaveTo.String() << endl; -+std::cout << fSaveTo.String() << std::endl; - fprintf(file, fContent.String()); - fclose(file); - } -diff --git a/Source/App/main.cpp b/Source/App/main.cpp -index aaf47e6..aa6d86d 100644 ---- a/Source/App/main.cpp -+++ b/Source/App/main.cpp -@@ -409,16 +409,16 @@ void mApp::MessageReceived(BMessage *message) - //----------------------------------------------------------------- - void mApp::RefsReceived(BMessage *message) - { --cout << "REFS RECIEVED!! " << endl; -+std::cout << "REFS RECIEVED!! " << std::endl; - //Get Filepanelpath - int32 count = 0; - uint32 type = 0; - message->GetInfo("refs", &type, &count); --cout << "type is " << type << "count is " << count << endl; -+std::cout << "type is " << type << "count is " << count << std::endl; - for (int32 i = 0; i < count; i++) - { - entry_ref ref; -- cout << " asd its " << i << endl; -+ std::cout << " asd its " << i <FindRef("refs", i, &ref) == B_NO_ERROR) - { - BEntry entry(&ref); -@@ -432,12 +432,12 @@ cout << "type is " << type << "count is " << count << endl; - } - else - { -- cout << "2_" << endl; -+ std::cout << "2_" << std::endl; - } - } - else - { -- cout << "1_" << endl; -+ std::cout << "1_" << std::endl; - } - } - } -diff --git a/Source/App/makefile b/Source/App/makefile -index dd0b811..7db6791 100644 ---- a/Source/App/makefile -+++ b/Source/App/makefile -@@ -20,9 +20,8 @@ SRCS=aboutWindow.cpp \ - Secret/glView.cpp \ - Secret/glWindow.cpp - RSRCS= Project.rsrc --LIBS= root \ -- be \ -- stdc++.r4 \ -+LIBS= be \ -+ $(STDCPPLIBS) \ - game \ - GL \ - tracker \ -@@ -38,7 +37,7 @@ DRIVER_PATH = - APP_VERSION = - DEBUGGER = - LINKER_FLAGS = --COMPILER_FLAGS = -+CFLAGS= -fpermissive - SYMBOLS = - WARNINGS = - -diff --git a/Source/lib/Alert.cpp b/Source/lib/Alert.cpp -index b079d5e..1de9b04 100644 ---- a/Source/lib/Alert.cpp -+++ b/Source/lib/Alert.cpp -@@ -52,7 +52,7 @@ Button1_Text.SetTo(button1_text); - - - _SetupEverything(); --cout << "Setup everything" << endl; -+std::cout << "Setup everything" << std::endl; - } - - //----------------------------------------------------------------- -@@ -124,7 +124,7 @@ SetTitle(Alert_Name.String()); - } - else - { -- cout << "only one button" << endl; -+ std::cout << "only one button" << std::endl; - TempFrame.Set(ButtonPostItsFrame3.left, ButtonPostItsFrame3.top, ButtonPostItsFrame3.right, ButtonPostItsFrame3.bottom); - } - if (fButton3Enabled) -@@ -143,7 +143,7 @@ SetTitle(Alert_Name.String()); - } - else - { -- cout << "Only two buttons" << endl; -+ std::cout << "Only two buttons" << std::endl; - TempFrame.Set(ButtonPostItsFrame3.left, ButtonPostItsFrame3.top, ButtonPostItsFrame3.right, ButtonPostItsFrame3.bottom); - } - AlertButton2 = new BButton(TempFrame, "AlertButton2", Button2_Text.String(), new BMessage(MSG_BUTTON2)); -@@ -153,7 +153,7 @@ SetTitle(Alert_Name.String()); - //3 - if (fButton3Enabled) - { -- cout << "OMG, three buttons" << endl; -+ std::cout << "OMG, three buttons" << std::endl; - TempFrame.Set(ButtonPostItsFrame3.left, ButtonPostItsFrame3.top, ButtonPostItsFrame3.right, ButtonPostItsFrame3.bottom); - AlertButton3 = new BButton(TempFrame, "AlertButton3", Button3_Text.String(), new BMessage(MSG_BUTTON3)); - AlertButton3->MakeDefault(true); -diff --git a/Source/lib/Alert.h b/Source/lib/Alert.h -index ae91d88..8b87263 100644 ---- a/Source/lib/Alert.h -+++ b/Source/lib/Alert.h -@@ -6,7 +6,7 @@ - #include - #include - #include --#include -+#include - - #define MSG_BUTTON1 '1001' - #define MSG_BUTTON2 '1002' -diff --git a/Source/lib/Bubble.h b/Source/lib/Bubble.h -index 6c0e3e9..7b13a91 100644 ---- a/Source/lib/Bubble.h -+++ b/Source/lib/Bubble.h -@@ -6,7 +6,7 @@ - #include - #include - #include --#include -+#include - - - class _EXPORT MBubble -diff --git a/Source/lib/Calender.cpp b/Source/lib/Calender.cpp -index 2918439..5d2a89f 100644 ---- a/Source/lib/Calender.cpp -+++ b/Source/lib/Calender.cpp -@@ -266,7 +266,7 @@ _SetBoxBounds(); - //We dont take your false dates around here - if (fYear < 2000 || fMonthNumber > 12 || fMonthNumber < 1 || fDayNumber > 31 || fDayNumber < 1) - { -- cout << "Date doesnt exist" << endl; -+ std::cout << "Date doesnt exist" << std::endl; - } - //If American style, add one more day (they are stupid and begin the week with a sunday) - if (fCalenderIsAmericaStyle) -diff --git a/Source/lib/Calender.h b/Source/lib/Calender.h -index c9aacb1..0c62dc5 100644 ---- a/Source/lib/Calender.h -+++ b/Source/lib/Calender.h -@@ -9,7 +9,7 @@ - #include - #include - #include --#include -+#include - - // Project Includes ------------------------------------------------------------ - -@@ -122,4 +122,4 @@ BString fDayNumberString; - - }; - --#endif -\ No newline at end of file -+#endif -diff --git a/Source/lib/CustomListItem.h b/Source/lib/CustomListItem.h -index d252ad1..9609697 100644 ---- a/Source/lib/CustomListItem.h -+++ b/Source/lib/CustomListItem.h -@@ -9,7 +9,7 @@ - #include - #include - #include --#include -+#include - - //----------------------- Global includes ---------------------- - -diff --git a/Source/lib/Postit.h b/Source/lib/Postit.h -index 84a9650..2eb8c58 100644 ---- a/Source/lib/Postit.h -+++ b/Source/lib/Postit.h -@@ -6,7 +6,7 @@ - #include - #include - #include --#include -+#include - - #define MSG_BUTTON1 '1001' - #define MSG_BUTTON2 '1002' -diff --git a/Source/lib/Save.h b/Source/lib/Save.h -index c3604a8..a7770b3 100644 ---- a/Source/lib/Save.h -+++ b/Source/lib/Save.h -@@ -6,7 +6,7 @@ - #include - #include - #include --#include -+#include - - - class _EXPORT MSave : public BMessage { -@@ -130,4 +130,4 @@ class _EXPORT MSave : public BMessage { - - }; - --#endif -\ No newline at end of file -+#endif -diff --git a/Source/lib/makefile b/Source/lib/makefile -index 0758c08..04c355e 100644 ---- a/Source/lib/makefile -+++ b/Source/lib/makefile -@@ -7,9 +7,8 @@ SRCS= Bitmap.cpp \ - FlickerFreeStringView.cpp \ - Postit.cpp \ - Save.cpp --LIBS= root \ -- be \ -- stdc++.r4 -+LIBS= be \ -+ $(STDCPPLIBS) - RSRCS= - DEFINES= - LIBPATHS= -@@ -21,7 +20,7 @@ DRIVER_PATH = - APP_VERSION = - DEBUGGER = - LINKER_FLAGS = --COMPILER_FLAGS = -+CFLAGS= -fpermissive - SYMBOLS = - WARNINGS = - --- -1.8.3.4 - diff --git a/haiku-apps/peek/peek-20140206.recipe b/haiku-apps/peek/peek-20140206.recipe new file mode 100644 index 000000000..40d499dfc --- /dev/null +++ b/haiku-apps/peek/peek-20140206.recipe @@ -0,0 +1,47 @@ +SUMMARY="Image browser" +DESCRIPTION=" +Peek is a free image browser and viewer with the aim of of being small, fast, \ +efficient, very functional and intuitive. +" +HOMEPAGE="https://github.com/HaikuArchives/Peek" +SRC_URI="git+https://github.com/HaikuArchives/Peek.git#ce06fe5" +REVISION="1" +COPYRIGHT="2001 Durand John Miller" +LICENSE="BSD (3-clause)" + +ARCHITECTURES="x86_gcc2" + +PROVIDES=" + peek = $portVersion + app:Peek = $portVersion + " + +REQUIRES=" + haiku >= $haikuVersion + " + +BUILD_PREREQUIRES=" + makefile_engine + cmd:mkdepend + cmd:make + cmd:gcc + cmd:g++ + " + +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + " + +BUILD() +{ + cd source + make $jobArgs OBJ_DIR=objects +} + +INSTALL() +{ + mkdir -p $appsDir/Peek + cp source/objects/Peek $appsDir/Peek/Peek + cp -r languages $appsDir/Peek/ + addAppDeskbarSymlink $appsDir/Peek/Peek +} diff --git a/haiku-apps/resourceedit/resourceedit-1.0_git.recipe b/haiku-apps/resourceedit/resourceedit-1.0_git.recipe new file mode 100644 index 000000000..d1b8a0cc2 --- /dev/null +++ b/haiku-apps/resourceedit/resourceedit-1.0_git.recipe @@ -0,0 +1,46 @@ +SUMMARY="Graphical RSRC resource editor" +DESCRIPTION="An editor for binary resource files (.rsrc) that get compiled \ +into an application and can then be used within the application." +HOMEPAGE="https://github.com/HaikuArchives/ResourceEdit" +LICENSE="MIT" +COPYRIGHT="2012-2013 Tri-Edge AI" +SRC_URI="https://github.com/HaikuArchives/ResourceEdit/archive/8c3f779d08525ed1e607627213278436a0502125.tar.gz" +CHECKSUM_SHA256="848b4e6d8a30737793d858d95360d33219efa615635b0b79c845bc4b78f6a64b" +SOURCE_DIR="ResourceEdit-8c3f779d08525ed1e607627213278436a0502125" +REVISION="1" + +ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" + +PROVIDES=" + resourceedit = $portVersion + app:ResourceEdit = $portVersion + " + +REQUIRES=" + haiku >= $haikuVersion + " + +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + " +BUILD_PREREQUIRES=" + makefile_engine + cmd:gcc + cmd:ld + cmd:make + cmd:mkdepend + " + +BUILD() +{ + cd source + make $jobArgs OBJ_DIR=objects +} + +INSTALL() +{ + cd source + mkdir -p $appsDir + cp objects/ResourceEdit $appsDir + addAppDeskbarSymlink $appsDir/ResourceEdit +} diff --git a/haiku-apps/resourceedit/resourceedit-1.recipe b/haiku-apps/resourceedit/resourceedit-1.recipe deleted file mode 100644 index 76bd028e5..000000000 --- a/haiku-apps/resourceedit/resourceedit-1.recipe +++ /dev/null @@ -1,52 +0,0 @@ -DESCRIPTION=" -This is an editor for resource files (.rsrc), binary files that get compiled \ -into an application and can then be accessed by that application. -" -SUMMARY="Resource editor" -HOMEPAGE="https://github.com/HaikuArchives/ResourceEdit" -LICENSE="MIT" -COPYRIGHT="2012-2013 Tri-Edge AI" -SRC_URI="git+https://github.com/HaikuArchives/ResourceEdit.git#1873c33591e2d2ccb3dccb692c175e9f10a0e450" -REVISION="1" - -ARCHITECTURES="!x86 ?x86_64" -if [ $effectiveTargetArchitecture != x86_gcc2 ]; then - # x86_gcc2 is fine as primary target architecture as long as we're building - # for a different secondary architecture. - ARCHITECTURES="$ARCHITECTURES x86_gcc2" -else - ARCHITECTURES="$ARCHITECTURES !x86_gcc2" -fi -SECONDARY_ARCHITECTURES="!x86" - -PROVIDES=" - resourceedit$secondaryArchSuffix = $portVersion - app:ResourceEdit = $portVersion - " - -REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion - " -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion - " -BUILD_PREREQUIRES=" - makefile_engine - cmd:gcc$secondaryArchSuffix - cmd:ld$secondaryArchSuffix - cmd:make - cmd:mkdepend - " - -BUILD() -{ - make -} - -INSTALL() -{ - # supports "x86" architecture only - mkdir $appsDir - cp objects.x86-gcc4-release/ResourceEdit $appsDir - addAppDeskbarSymlink $appsDir/ResourceEdit -} diff --git a/haiku-apps/timecop/timecop-0.61.recipe b/haiku-apps/timecop/timecop-0.61.recipe new file mode 100644 index 000000000..a292964a7 --- /dev/null +++ b/haiku-apps/timecop/timecop-0.61.recipe @@ -0,0 +1,47 @@ +SUMMARY="TimeCop helps you collect statistics about your computer working" +DESCRIPTION=" +You want to know, how much time you spend in front of your computer? +You want to know, how often your computer crashes? + +So you can use TimeCop to write a protocol of your computer sessions. +" +HOMEPAGE="http://www.augusta.de/michael/BeOS/TimeCop/index.us.html" +SRC_URI="git://github.com/HaikuArchives/TimeCop.git#ee79c42895" +REVISION="2" +LICENSE="GNU GPL v2" +COPYRIGHT="Copyright Michael Pieper" +ARCHITECTURES="x86_gcc2 x86 !ppc" +CHECKSUM_SHA256="d384c22c8768298fb1d9ea60fbdb8e7f7e440c00bae44c37e7507f20c4fe6a94" + +REQUIRES=" + haiku >= $haikuVersion +" + +PROVIDES=" + cmd:TimeCop_daemon = $portVersion + app:TimeCop = $portVersion +" + +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion +" + +BUILD_PREREQUIRES=" + cmd:make + cmd:gcc +" + +BUILD() +{ + make +} + +INSTALL() +{ + mkdir -p $binDir + mkdir -p $appsDir + cp -a $sourceDir/bin/TimeCop_daemon $binDir/TimeCop_daemon + cp -a $sourceDir/bin/TimeCop $appsDir/TimeCop + + addAppDeskbarSymlink $appsDir/TimeCop +} diff --git a/sys-devel/arm_none_eabi_gcc/arm_none_eabi_gcc-4.8.2_2014_03_20.recipe b/sys-devel/arm_none_eabi_gcc/arm_none_eabi_gcc-4.8.4.recipe similarity index 92% rename from sys-devel/arm_none_eabi_gcc/arm_none_eabi_gcc-4.8.2_2014_03_20.recipe rename to sys-devel/arm_none_eabi_gcc/arm_none_eabi_gcc-4.8.4.recipe index 34695a5f5..bee70d846 100644 --- a/sys-devel/arm_none_eabi_gcc/arm_none_eabi_gcc-4.8.2_2014_03_20.recipe +++ b/sys-devel/arm_none_eabi_gcc/arm_none_eabi_gcc-4.8.4.recipe @@ -4,11 +4,10 @@ Compiler for ARM processors. " HOMEPAGE="http://gcc.gnu.org" -srcGitRev="c20a732df8f8b6d0f32c872817f3a0498a5c4761" -SRC_URI="https://github.com/haiku/buildtools/archive/$srcGitRev.tar.gz" -CHECKSUM_SHA256="6d3b677cd8ef777bf6fb3186a15b5122e46345595a996370325c758b3d8a4ab6" +SRC_URI="svn://gcc.gnu.org/svn/gcc/branches/ARM/embedded-4_8-branch" SRC_FILENAME="$portVersionedName.tar.gz" -REVISION="2" +PATCHES="arm_none_eabi_gcc-$portVersion.patchset" +REVISION="1" LICENSE=" GNU GPL v2 GNU LGPL v2 @@ -47,6 +46,9 @@ REQUIRES=" BUILD_REQUIRES=" cmd:${targetU}_as$secondaryArchSuffix ${targetU}_newlib$secondaryArchSuffix + devel:libgmp$secondaryArchSuffix + devel:libmpfr$secondaryArchSuffix + devel:libmpc$secondaryArchSuffix " BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel >= $haikuVersion @@ -65,8 +67,6 @@ BUILD_PREREQUIRES=" cmd:xargs " -SOURCE_DIR="buildtools-$srcGitRev/gcc" - sourceDir=$(pwd) relativeInstallDir="develop/tools/${targetArch}" installDir="$prefix/$relativeInstallDir" @@ -97,6 +97,7 @@ BUILD() --docdir=$docDir --disable-nls --disable-libssp --with-gnu-ld \ --enable-languages=c,c++ --enable-lto --enable-frame-pointer \ --enable-multilib --disable-shared \ + --with-multilib-list=armv6-m,armv7-m,armv7e-m,armv7-r \ --with-newlib --with-sysroot=$installDir \ --with-native-system-header-dir=/include \ --with-pkgversion=$(echo $portVersion | cut -c 7-) --target=$targetArch diff --git a/sys-devel/arm_none_eabi_gcc/patches/arm_none_eabi_gcc-4.8.4.patchset b/sys-devel/arm_none_eabi_gcc/patches/arm_none_eabi_gcc-4.8.4.patchset new file mode 100644 index 000000000..11b29c31a --- /dev/null +++ b/sys-devel/arm_none_eabi_gcc/patches/arm_none_eabi_gcc-4.8.4.patchset @@ -0,0 +1,22 @@ +From e0f435a01b68a41b06602dcf4b302d7ad7f3974f Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Fri, 5 Dec 2014 18:05:55 +0100 +Subject: Hardcoded -lm. + + +diff --git a/gcc/Makefile.in b/gcc/Makefile.in +index 56b7baa..c9eedf6 100644 +--- a/gcc/Makefile.in ++++ b/gcc/Makefile.in +@@ -3969,7 +3969,7 @@ $(genprogerr:%=build/gen%$(build_exeext)): $(BUILD_ERRORS) + genprog = $(genprogerr) check checksum condmd + + # These programs need libs over and above what they get from the above list. +-build/genautomata$(build_exeext) : BUILD_LIBS += -lm ++#build/genautomata$(build_exeext) : BUILD_LIBS += -lm + + # These programs are not linked with the MD reader. + build/gengtype$(build_exeext) : build/gengtype-lex.o build/gengtype-parse.o \ +-- +1.8.3.4 + diff --git a/sys-devel/arm_none_eabi_gcc_nolibc/arm_none_eabi_gcc_nolibc-4.8.2_2014_03_20.recipe b/sys-devel/arm_none_eabi_gcc_nolibc/arm_none_eabi_gcc_nolibc-4.8.4.recipe similarity index 90% rename from sys-devel/arm_none_eabi_gcc_nolibc/arm_none_eabi_gcc_nolibc-4.8.2_2014_03_20.recipe rename to sys-devel/arm_none_eabi_gcc_nolibc/arm_none_eabi_gcc_nolibc-4.8.4.recipe index a297b698a..6d61d526e 100644 --- a/sys-devel/arm_none_eabi_gcc_nolibc/arm_none_eabi_gcc_nolibc-4.8.2_2014_03_20.recipe +++ b/sys-devel/arm_none_eabi_gcc_nolibc/arm_none_eabi_gcc_nolibc-4.8.4.recipe @@ -4,10 +4,9 @@ Compiler for ARM processors. " HOMEPAGE="http://gcc.gnu.org" -srcGitRev="c20a732df8f8b6d0f32c872817f3a0498a5c4761" -SRC_URI="https://github.com/haiku/buildtools/archive/$srcGitRev.tar.gz" -CHECKSUM_SHA256="6d3b677cd8ef777bf6fb3186a15b5122e46345595a996370325c758b3d8a4ab6" +SRC_URI="svn://gcc.gnu.org/svn/gcc/branches/ARM/embedded-4_8-branch" SRC_FILENAME="$portVersionedName.tar.gz" +PATCHES="arm_none_eabi_gcc_nolibc-$portVersion.patchset" REVISION="1" LICENSE=" GNU GPL v2 @@ -43,9 +42,15 @@ REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion cmd:${targetU}_as$secondaryArchSuffix lib:libstdc++$secondaryArchSuffix + lib:libgmp$secondaryArchSuffix + lib:libmpfr$secondaryArchSuffix + lib:libmpc$secondaryArchSuffix " BUILD_REQUIRES=" cmd:${targetU}_as$secondaryArchSuffix + devel:libgmp$secondaryArchSuffix + devel:libmpfr$secondaryArchSuffix + devel:libmpc$secondaryArchSuffix " BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel >= $haikuVersion @@ -64,8 +69,6 @@ BUILD_PREREQUIRES=" cmd:xargs " -SOURCE_DIR="buildtools-$srcGitRev/gcc" - sourceDir=$(pwd) relativeInstallDir="develop/tools/${targetArch}" installDir="$prefix/$relativeInstallDir" @@ -96,6 +99,7 @@ BUILD() --docdir=$docDir --disable-nls --disable-libssp --with-gnu-ld \ --enable-languages=c,c++ --enable-lto --enable-frame-pointer \ --enable-multilib --disable-shared \ + --with-multilib-list=armv6-m,armv7-m,armv7e-m,armv7-r \ --without-headers --with-newlib \ --with-sysroot=$installDir \ --with-native-system-header-dir=/include \ diff --git a/sys-devel/arm_none_eabi_gcc_nolibc/patches/arm_none_eabi_gcc_nolibc-4.8.2_2014_03_20.patchset b/sys-devel/arm_none_eabi_gcc_nolibc/patches/arm_none_eabi_gcc_nolibc-4.8.2_2014_03_20.patchset new file mode 100644 index 000000000..11b29c31a --- /dev/null +++ b/sys-devel/arm_none_eabi_gcc_nolibc/patches/arm_none_eabi_gcc_nolibc-4.8.2_2014_03_20.patchset @@ -0,0 +1,22 @@ +From e0f435a01b68a41b06602dcf4b302d7ad7f3974f Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Fri, 5 Dec 2014 18:05:55 +0100 +Subject: Hardcoded -lm. + + +diff --git a/gcc/Makefile.in b/gcc/Makefile.in +index 56b7baa..c9eedf6 100644 +--- a/gcc/Makefile.in ++++ b/gcc/Makefile.in +@@ -3969,7 +3969,7 @@ $(genprogerr:%=build/gen%$(build_exeext)): $(BUILD_ERRORS) + genprog = $(genprogerr) check checksum condmd + + # These programs need libs over and above what they get from the above list. +-build/genautomata$(build_exeext) : BUILD_LIBS += -lm ++#build/genautomata$(build_exeext) : BUILD_LIBS += -lm + + # These programs are not linked with the MD reader. + build/gengtype$(build_exeext) : build/gengtype-lex.o build/gengtype-parse.o \ +-- +1.8.3.4 + diff --git a/sys-libs/arm_none_eabi_newlib/arm_none_eabi_newlib-2.1.0.recipe b/sys-libs/arm_none_eabi_newlib/arm_none_eabi_newlib-2.1.0.recipe index 5d11ea2a2..ba683bc56 100644 --- a/sys-libs/arm_none_eabi_newlib/arm_none_eabi_newlib-2.1.0.recipe +++ b/sys-libs/arm_none_eabi_newlib/arm_none_eabi_newlib-2.1.0.recipe @@ -35,7 +35,7 @@ COPYRIGHT=" 2009 ARM Ltd 2008 Ed Schouten " -REVISION="1" +REVISION="2" ARCHITECTURES="" if [ $effectiveTargetArchitecture != x86_gcc2 ]; then @@ -77,7 +77,7 @@ BUILD() cd $objectsDir runConfigure $sourceDir/configure --target=arm-none-eabi \ - --prefix=$installDir + --prefix=$installDir --disable-newlib-supplied-syscalls make }