From 664e3c050d9b7266e5a153501b79dcfb1f777a20 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Mon, 2 Dec 2013 17:05:32 +0100 Subject: [PATCH 01/15] gcc 4: Disable ASLR for the executables Makes pre-compiled headers work reliably. --- sys-devel/gcc/gcc-4.7.3_2013_08_12.recipe | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/sys-devel/gcc/gcc-4.7.3_2013_08_12.recipe b/sys-devel/gcc/gcc-4.7.3_2013_08_12.recipe index ce167030b..e8a2c5797 100644 --- a/sys-devel/gcc/gcc-4.7.3_2013_08_12.recipe +++ b/sys-devel/gcc/gcc-4.7.3_2013_08_12.recipe @@ -10,7 +10,7 @@ SRC_URI=" git+file://$portBaseDir/../binutils/download/BuildtoolsPM.git#2d0a2c6404ffae1a46eb7e74daab08099b45af2c git+git://github.com/haiku/BuildtoolsPM.git#2d0a2c6404ffae1a46eb7e74daab08099b45af2c " -REVISION="3" +REVISION="4" ARCHITECTURES="x86 x86_64" if [ $effectiveTargetArchitecture != x86_gcc2 ]; then # x86_gcc2 is fine as primary target architecture as long as we're building @@ -119,6 +119,21 @@ INSTALL() done strip --strip-debug lib/*.a + ### Disable ASLR ########################################## + + echo "Add SYS:ENV attribute to disable ASLR" + + cd $installDir + for f in bin/*; do + if [ -r "$f" ]; then + addattr SYS:ENV DISABLE_ASLR=1 $f + fi + done + for f in cc1 cc1plus collect2 lto1; do + addattr SYS:ENV DISABLE_ASLR=1 \ + lib/gcc/$effectiveTargetMachineTriple/*/$f + done + ### Symlinks ############################################## echo "Creating required symlinks" From 8e554bea728f05ba8f6675dd35fe5d382c1e8a97 Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Mon, 2 Dec 2013 23:18:26 +0100 Subject: [PATCH 02/15] Add recipe for Fortuna --- haiku-apps/fortuna/fortuna-1.0.0.recipe | 49 ++++++++++ .../fortuna/patches/fortuna-1.0.0.patch | 97 +++++++++++++++++++ 2 files changed, 146 insertions(+) create mode 100644 haiku-apps/fortuna/fortuna-1.0.0.recipe create mode 100644 haiku-apps/fortuna/patches/fortuna-1.0.0.patch diff --git a/haiku-apps/fortuna/fortuna-1.0.0.recipe b/haiku-apps/fortuna/fortuna-1.0.0.recipe new file mode 100644 index 000000000..8410ae72b --- /dev/null +++ b/haiku-apps/fortuna/fortuna-1.0.0.recipe @@ -0,0 +1,49 @@ +SUMMARY="A small GUI for showing the well known fortunes" + +DESCRIPTION=" + Fortuna is a nice-looking graphical program which displays a fortune when you open it. + Yeah, sure, there is already a fortune program, but it only shows from the command line, + you'll get a lot of repeats, it's quite a bit of work to install more, + and you have to muck around with your UserBootScript. Lots of messing around. + Then again, you can use Fortuna, which has none of this. + " # Taken from homepage + +HOMEPAGE="http://darkwyrm.beemulated.net/apps/fortuna.htm" +SRC_URI="git://github.com/HaikuArchives/Fortuna.git#eacb3689800064b948d3b943302b2d4bf18c9dbc" +REVISION="1" + +LICENSE="MIT" +COPYRIGHT="2006 DarkWyrm" + +ARCHITECTURES="x86 x86_gcc2" + +PATCHES="fortuna-1.0.0.patch" + +PROVIDES=" + fortuna = $portVersion + app:fortuna = $portVersion + " + +REQUIRES=" + haiku >= $haikuVersion + " + +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + cmd:gcc + cmd:xres + " + +BUILD() +{ + gcc -o Fortuna -lbe src/main.cpp src/FortuneWindow.cpp src/FortuneFunctions.cpp + xres -o Fortuna src/Fortuna.rsrc + mimeset -f Fortuna +} + +INSTALL() +{ + mkdir -p $appsDir/Fortuna + cp Fortuna $appsDir/Fortuna + addAppDeskbarSymlink $appsDir/Fortuna/Fortuna +} diff --git a/haiku-apps/fortuna/patches/fortuna-1.0.0.patch b/haiku-apps/fortuna/patches/fortuna-1.0.0.patch new file mode 100644 index 000000000..d3603b43b --- /dev/null +++ b/haiku-apps/fortuna/patches/fortuna-1.0.0.patch @@ -0,0 +1,97 @@ +diff --git a/src/FortuneFunctions.cpp b/src/FortuneFunctions.cpp +index 5fc031a..c083cee 100644 +--- a/src/FortuneFunctions.cpp ++++ b/src/FortuneFunctions.cpp +@@ -13,6 +13,11 @@ FortuneAccess::FortuneAccess(const char *folder) + SetFolder(folder); + } + ++FortuneAccess::FortuneAccess() ++{ ++ ++} ++ + FortuneAccess::~FortuneAccess(void) + { + MakeEmpty(); +diff --git a/src/FortuneFunctions.h b/src/FortuneFunctions.h +index 07cb8f5..85eb1e0 100644 +--- a/src/FortuneFunctions.h ++++ b/src/FortuneFunctions.h +@@ -8,6 +8,7 @@ class FortuneAccess + { + public: + FortuneAccess(const char *folder); ++ FortuneAccess(); + ~FortuneAccess(void); + + status_t SetFolder(const char *folder); +diff --git a/src/FortuneWindow.cpp b/src/FortuneWindow.cpp +index d79c7f5..0f3bcf8 100644 +--- a/src/FortuneWindow.cpp ++++ b/src/FortuneWindow.cpp +@@ -1,22 +1,30 @@ + #include "FortuneWindow.h" + #include +-#include +-#include +-#include + #include ++#include ++#include ++#include + #include ++#include ++#include + + #define M_GET_ANOTHER_FORTUNE 'gafn' + #define M_ABOUT_REQUESTED 'abrq' + + FortuneWindow::FortuneWindow(void) +- : BWindow(BRect(0,0,300,300),"Fortune",B_DOCUMENT_WINDOW,B_ASYNCHRONOUS_CONTROLS), +- fFortune("/boot/beos/etc/fortunes") ++ : BWindow(BRect(0,0,300,300),"Fortune",B_DOCUMENT_WINDOW,B_ASYNCHRONOUS_CONTROLS), ++ fFortune() + { ++ BPath path; ++ find_directory(B_SYSTEM_DATA_DIRECTORY, &path); ++ path.Append("fortunes"); ++ ++ fFortune.SetFolder(path.Path()); ++ + BView *back = new BView(Bounds(),"background",B_FOLLOW_ALL, B_WILL_DRAW); + back->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR)); + AddChild(back); +- ++ + BButton *close = new BButton(BRect(0,0,1,1),"closebutton","Close", + new BMessage(B_QUIT_REQUESTED), B_FOLLOW_RIGHT | B_FOLLOW_BOTTOM); + close->ResizeToPreferred(); +@@ -63,7 +71,9 @@ FortuneWindow::FortuneWindow(void) + { + fTextView->SetText("Fortuna had a problem getting a fortune.\n\n" + "Please make sure that you have installed fortune files to " +- "the folder /boot/beos/etc/fortunes."); ++ "the folder "); ++ fTextView->Insert(path.Path()); ++ fTextView->Insert("."); + } + + next->MakeFocus(true); +@@ -100,9 +110,15 @@ void FortuneWindow::MessageReceived(BMessage *msg) + } + else + { ++ BPath path; ++ find_directory(B_SYSTEM_DATA_DIRECTORY, &path); ++ path.Append("fortunes"); ++ + fTextView->SetText("Fortuna had a problem getting a fortune.\n\n" + "Please make sure that you have installed fortune files to " +- "the folder /boot/beos/etc/fortunes."); ++ "the folder "); ++ fTextView->Insert(path.Path()); ++ fTextView->Insert("."); + } + } + else From 8a30e597444a608075f8b92a42d76e1b76adb04f Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Mon, 2 Dec 2013 20:48:05 -0700 Subject: [PATCH 03/15] Overhaul the haiku-apps directory * Fixed PROVIDES/*REQUIRES entries * Added vcs hashes to the ports needing it in the SRC_URI * Made single executable apps install to the top level $appsDir * Added patches for gcc4 versions of most apps * Added patches for apps that couldn't build on any arch ( even though they were marked as working :( ) * Other misc fixes that I've forgotten already because I'm sick of looking at this directory --- haiku-apps/a_book/a_book-1.1.recipe | 24 +- haiku-apps/a_book/patches/a_book-1.1.patchset | 22 + haiku-apps/album/album-0.9.2.recipe | 47 +- haiku-apps/album/patches/album-0.9.2.patch | 13 - haiku-apps/album/patches/album-0.9.2.patchset | 45 ++ haiku-apps/backup/backup-0.0.1.recipe | 28 +- haiku-apps/bafx/bafx-0.0.1.recipe | 35 +- haiku-apps/bafx/patches/bafx-0.0.1.patchset | 22 + haiku-apps/beget/beget-1.2.3.recipe | 30 +- .../bepdf/bepdf-1.1.1~beta5_2013_04_28.recipe | 11 +- .../bescreencapture-1.9.1.recipe | 23 +- .../binary_clock/binary_clock-2.0.recipe | 24 +- haiku-apps/dockbert/dockbert-1.0.2b1.recipe | 26 +- .../patches/dockbert-1.0.2b1.patchset | 22 + .../documentviewer-0.3.2.recipe | 5 +- haiku-apps/filecropper/filecropper-1.recipe | 34 +- haiku-apps/ftppositive/ftppositive-1.0.recipe | 30 +- haiku-apps/hare/hare-beta1_git.recipe | 10 +- haiku-apps/jammin/jammin-0.1.0.recipe | 32 +- .../nightandday/nightsandday-0.1.2.recipe | 57 +- haiku-apps/organizer/organizer-0.1.recipe | 30 +- .../organizer/patches/organizer-0.1.patch | 258 -------- .../organizer/patches/organizer-0.1.patchset | 562 ++++++++++++++++++ haiku-apps/phantomlimb/phantomlimb-1.recipe | 73 ++- .../patches/querywatcher-1.4.patchset | 109 ++++ .../querywatcher/querywatcher-1.4.recipe | 35 +- haiku-apps/resourcer/resourcer-1.0.recipe | 46 +- ....0rc1.patch => runprogram-1.0rc1.patchset} | 34 +- .../runprogram/runprogram-1.0rc1.recipe | 20 +- haiku-apps/sum_it/sum_it-0.2beta.recipe | 31 +- haiku-apps/systeminfo/systeminfo-2.recipe | 45 +- .../patches/takenotes-1.0.0.patchset | 36 ++ haiku-apps/takenotes/takenotes-1.0.0.recipe | 29 +- .../patches/trackergrep-5.1.patchset | 49 ++ haiku-apps/trackergrep/trackergrep-5.1.recipe | 43 +- .../patches/ubertuber-0.9.7.patchset | 22 + haiku-apps/ubertuber/ubertuber-0.9.7.recipe | 22 +- haiku-apps/waveview/waveview-1.0.recipe | 40 +- 38 files changed, 1381 insertions(+), 643 deletions(-) create mode 100644 haiku-apps/a_book/patches/a_book-1.1.patchset delete mode 100644 haiku-apps/album/patches/album-0.9.2.patch create mode 100644 haiku-apps/album/patches/album-0.9.2.patchset create mode 100644 haiku-apps/bafx/patches/bafx-0.0.1.patchset create mode 100644 haiku-apps/dockbert/patches/dockbert-1.0.2b1.patchset delete mode 100644 haiku-apps/organizer/patches/organizer-0.1.patch create mode 100644 haiku-apps/organizer/patches/organizer-0.1.patchset create mode 100644 haiku-apps/querywatcher/patches/querywatcher-1.4.patchset rename haiku-apps/runprogram/patches/{runprogram-1.0rc1.patch => runprogram-1.0rc1.patchset} (57%) create mode 100644 haiku-apps/takenotes/patches/takenotes-1.0.0.patchset create mode 100644 haiku-apps/trackergrep/patches/trackergrep-5.1.patchset create mode 100644 haiku-apps/ubertuber/patches/ubertuber-0.9.7.patchset diff --git a/haiku-apps/a_book/a_book-1.1.recipe b/haiku-apps/a_book/a_book-1.1.recipe index ea824cf2b..6beaec2c8 100644 --- a/haiku-apps/a_book/a_book-1.1.recipe +++ b/haiku-apps/a_book/a_book-1.1.recipe @@ -1,14 +1,18 @@ -DESCRIPTION="A small calendar application with reminders. You can use this app to organize your time. The application supports the addition to each day tasks with the appropriate hours and browse all of them. Your job will be saved to a file when the application is closed." SUMMARY="A small calendar application with reminders." +DESCRIPTION=" +A small calendar application with reminders. You can use this app to +organize your time. The application supports the addition to each day +tasks with the appropriate hours and browse all of them. Your job will +be saved to a file when the application is closed." HOMEPAGE="https://github.com/HaikuArchives/A-Book" -SRC_URI="git+https://github.com/HaikuArchives/A-Book.git" -REVISION="1" +SRC_URI="git+https://github.com/HaikuArchives/A-Book.git#fe6c66c631" +REVISION="2" COPYRIGHT="2002 Maurice Michalski" LICENSE="MIT" -ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" +ARCHITECTURES="x86_gcc2 x86 ?x86_64" PROVIDES=" a_book = $portVersion @@ -19,22 +23,28 @@ REQUIRES=" haiku >= $haikuVersion " -BUILD_PREREQUIRES=" +BUILD_REQUIRES=" haiku_devel >= $haikuVersion + " + +BUILD_PREREQUIRES=" makefile_engine cmd:gcc cmd:make cmd:mkdepend " +PATCHES="a_book-1.1.patchset" + BUILD() { - make BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` + make OBJ_DIR=objects \ + BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` } INSTALL() { mkdir -p $appsDir - cp objects.x86-gcc2-release/A-Book $appsDir + cp -a objects/A-Book $appsDir addAppDeskbarSymlink $appsDir/A-Book } diff --git a/haiku-apps/a_book/patches/a_book-1.1.patchset b/haiku-apps/a_book/patches/a_book-1.1.patchset new file mode 100644 index 000000000..b126dbe85 --- /dev/null +++ b/haiku-apps/a_book/patches/a_book-1.1.patchset @@ -0,0 +1,22 @@ +From 2c7f24af4d3a0336d40a48155556527cdfc6362a Mon Sep 17 00:00:00 2001 +From: Chris Roberts +Date: Mon, 2 Dec 2013 17:30:53 -0700 +Subject: Fix makefile stdc++ libs + + +diff --git a/makefile b/makefile +index a28bcd4..1c0d18d 100644 +--- a/makefile ++++ b/makefile +@@ -56,7 +56,7 @@ RSRCS= + # 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=be ++LIBS=be $(STDCPPLIBS) + + # specify additional paths to directories following the standard + # libXXX.so or libXXX.a naming scheme. You can specify full paths +-- +1.8.3.4 + diff --git a/haiku-apps/album/album-0.9.2.recipe b/haiku-apps/album/album-0.9.2.recipe index 2418f3592..284b0c929 100644 --- a/haiku-apps/album/album-0.9.2.recipe +++ b/haiku-apps/album/album-0.9.2.recipe @@ -1,18 +1,20 @@ -SUMMARY="An image viewer/organiser designed for BeOS-compatible operating systems." -DESCRIPTION="Album is a file browsing and tagging utility for BeOS and compatibles. It -started out with a goal of the ultimate image organiser (code named Aberration), but ended -up as something much more modest and BeOS-specific. The idea is to have a work pad for -pictures from different locations where they can be previewed and tagged in one place. The -program is not limited to picture files and BFS (Be File System) volumes, although that -further limits whatever the usefulness since much of the functionality has to do with file +SUMMARY="An image viewer/organiser designed for BeOS-compatible systems." +DESCRIPTION=" +Album is a file browsing and tagging utility for BeOS and compatibles. +It started out with a goal of the ultimate image organiser (code +named Aberration), but ended up as something much more modest and +BeOS-specific. The idea is to have a work pad for pictures from +different locations where they can be previewed and tagged in one +place. The program is not limited to picture files and BFS (Be File +System) volumes, although that further limits whatever the usefulness +since much of the functionality has to do with file attributes." HOMEPAGE="http://users.volja.net/mkovac1/proj/album/" -SRC_URI="git://github.com/HaikuArchives/Album" -#CHECKSUM_MD5=" " +SRC_URI="git://github.com/HaikuArchives/Album#64aa3371a9" LICENSE="MIT" COPYRIGHT="2006-2009 by Matjaž Kovač" -REVISION="2" -ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" +REVISION="3" +ARCHITECTURES="x86_gcc2 x86 ?x86_64" PROVIDES=" Album = $portVersion app:Album = $portVersion @@ -22,34 +24,33 @@ REQUIRES=" haiku >= $haikuVersion " -BUILD_REQUIRES=" " +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion makefile_engine cmd:gcc cmd:make cmd:mkdepend " -PATCHES="album-0.9.2.patch" +PATCHES="album-0.9.2.patchset" + USER_SETTINGS_FILES=" settings/Album_settings " -SOURCE_DIR="$portVersionedName/src" - BUILD() { - make BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` + cd src + make OBJ_DIR=objects \ + BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` } INSTALL() { - albumDir=$appsDir/Album - mkdir -p $albumDir - - cp -a objects.x86-gcc2-debug/Album $albumDir - - addAppDeskbarSymlink $albumDir/Album + mkdir -p $appsDir + cp -a src/objects/Album $appsDir + addAppDeskbarSymlink $appsDir/Album } diff --git a/haiku-apps/album/patches/album-0.9.2.patch b/haiku-apps/album/patches/album-0.9.2.patch deleted file mode 100644 index 71f819683..000000000 --- a/haiku-apps/album/patches/album-0.9.2.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/MainWindow.cpp b/MainWindow.cpp -index 4fcb98a..66ed596 100644 ---- a/MainWindow.cpp -+++ b/MainWindow.cpp -@@ -142,7 +142,7 @@ MainWindow::MainWindow(BRect frame, const char *title): - - // Create a tempory repository for negotiated drops from image ditors etc. - BPath path; -- if (find_directory(B_COMMON_TEMP_DIRECTORY, &path) == B_OK) { -+ if (find_directory(B_SYSTEM_TEMP_DIRECTORY, &path) == B_OK) { - path.Append("Album"); - if (create_directory(path.Path(), 0x777) == B_OK) { - fRepository.SetTo(path.Path()); diff --git a/haiku-apps/album/patches/album-0.9.2.patchset b/haiku-apps/album/patches/album-0.9.2.patchset new file mode 100644 index 000000000..14fffeab6 --- /dev/null +++ b/haiku-apps/album/patches/album-0.9.2.patchset @@ -0,0 +1,45 @@ +From 47be97d358d8db50026e107d94a63d15f39e7fb1 Mon Sep 17 00:00:00 2001 +From: Chris Roberts +Date: Mon, 2 Dec 2013 17:23:41 -0700 +Subject: applying patch album-0.9.2.patch + + +diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp +index 4fcb98a..66ed596 100644 +--- a/src/MainWindow.cpp ++++ b/src/MainWindow.cpp +@@ -142,7 +142,7 @@ MainWindow::MainWindow(BRect frame, const char *title): + + // Create a tempory repository for negotiated drops from image ditors etc. + BPath path; +- if (find_directory(B_COMMON_TEMP_DIRECTORY, &path) == B_OK) { ++ if (find_directory(B_SYSTEM_TEMP_DIRECTORY, &path) == B_OK) { + path.Append("Album"); + if (create_directory(path.Path(), 0x777) == B_OK) { + fRepository.SetTo(path.Path()); +-- +1.8.3.4 + + +From 8f2c953908de0b0e23ae027802902072b153c686 Mon Sep 17 00:00:00 2001 +From: Chris Roberts +Date: Mon, 2 Dec 2013 17:27:22 -0700 +Subject: Fix makefile stdc++ libs + + +diff --git a/src/makefile b/src/makefile +index 02e892f..38f0454 100644 +--- a/src/makefile ++++ b/src/makefile +@@ -63,7 +63,7 @@ RSRCS= Album.rsrc + # 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 translation iptcdata ++LIBS=be translation iptcdata $(STDCPPLIBS) + + # specify additional paths to directories following the standard + # libXXX.so or libXXX.a naming scheme. You can specify full paths +-- +1.8.3.4 + diff --git a/haiku-apps/backup/backup-0.0.1.recipe b/haiku-apps/backup/backup-0.0.1.recipe index 83e7cdec1..7d4fbfc7e 100644 --- a/haiku-apps/backup/backup-0.0.1.recipe +++ b/haiku-apps/backup/backup-0.0.1.recipe @@ -1,38 +1,40 @@ -DESCRIPTION="backup - A backup application for Haiku" +DESCRIPTION="A backup application for Haiku" SUMMARY="A backup application for Haiku" +COPYRIGHT="2013 Alexander von Gluck IV" +LICENSE="MIT" HOMEPAGE="https://github.com/kallisti5/backup" -SRC_URI="git+https://github.com/kallisti5/backup" -REVISION="1" +SRC_URI="git+https://github.com/kallisti5/backup#34e156f64d" +REVISION="2" -ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" +ARCHITECTURES="x86_gcc2 x86 ?x86_64" PROVIDES=" backup = $portVersion app:backup = $portVersion " -BUILD_PREREQUIRES=" +BUILD_REQUIRES=" haiku_devel >= $haikuVersion + " + +BUILD_PREREQUIRES=" makefile_engine cmd:gcc cmd:make - cmd:mkdepend" + cmd:mkdepend + " PATCHES="backup-0.0.1.patch" -COPYRIGHT="2013 Alexander von Gluck IV" -LICENSE="MIT" - BUILD() { - make BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` + make OBJ_DIR=objects \ + BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` } INSTALL() { - architecture=$(echo $buildArchitecture | sed 's/_/-/g') mkdir -p $appsDir - cp objects.$architecture-release/backup $appsDir/Backup - + cp objects/backup $appsDir/Backup addAppDeskbarSymlink $appsDir/Backup } diff --git a/haiku-apps/bafx/bafx-0.0.1.recipe b/haiku-apps/bafx/bafx-0.0.1.recipe index b4d0ff8da..329a3494f 100644 --- a/haiku-apps/bafx/bafx-0.0.1.recipe +++ b/haiku-apps/bafx/bafx-0.0.1.recipe @@ -1,38 +1,39 @@ DESCRIPTION="BAfx is a file manager for Haiku." SUMMARY="A file manager for Haiku." HOMEPAGE="https://github.com/marbocub/BAfx" -SRC_URI="git+https://github.com/marbocub/BAfx" +SRC_URI="git+https://github.com/marbocub/BAfx#4b14a8ba4c" COPYRIGHT="2012 @marbocub" LICENSE="MIT" - -REVISION="1" - -ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" +REVISION="2" +ARCHITECTURES="x86_gcc2 x86 ?x86_64" PROVIDES=" bafx = $portVersion - app:bafx = $portVersion" + app:bafx = $portVersion + " + +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion makefile_engine cmd:gcc cmd:make - cmd:mkdepend" + cmd:mkdepend + " + +PATCHES="bafx-0.0.1.patchset" BUILD() { - make BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` + make OBJ_DIR=objects \ + BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` } INSTALL() { - architecture=$(echo $buildArchitecture | sed 's/_/-/g') - - cd objects.$architecture-release - - mkdir -p $appsDir/BAfx - cp -a BAfx $appsDir/BAfx - - addAppDeskbarSymlink $appsDir/BAfx/BAfx + mkdir -p $appsDir + cp -a objects/BAfx $appsDir + addAppDeskbarSymlink $appsDir/BAfx } diff --git a/haiku-apps/bafx/patches/bafx-0.0.1.patchset b/haiku-apps/bafx/patches/bafx-0.0.1.patchset new file mode 100644 index 000000000..f5c0c7ee4 --- /dev/null +++ b/haiku-apps/bafx/patches/bafx-0.0.1.patchset @@ -0,0 +1,22 @@ +From 7c5605074b639c6daa54275d1ced9720555da3d1 Mon Sep 17 00:00:00 2001 +From: Chris Roberts +Date: Mon, 2 Dec 2013 17:37:11 -0700 +Subject: Fix makefile stdc++ libs + + +diff --git a/Makefile b/Makefile +index 6f14782..50893a9 100755 +--- a/Makefile ++++ b/Makefile +@@ -56,7 +56,7 @@ RSRCS= + # 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= be ++LIBS= be $(STDCPPLIBS) + + # specify additional paths to directories following the standard + # libXXX.so or libXXX.a naming scheme. You can specify full paths +-- +1.8.3.4 + diff --git a/haiku-apps/beget/beget-1.2.3.recipe b/haiku-apps/beget/beget-1.2.3.recipe index 6eb28ba74..945cc8ed0 100644 --- a/haiku-apps/beget/beget-1.2.3.recipe +++ b/haiku-apps/beget/beget-1.2.3.recipe @@ -1,35 +1,38 @@ SUMMARY="A GUI frontend to the command-line downloader wget" -DESCRIPTION="BeGet is a easy-to-use download manager for the popular command line tool wget. -BeGet can also accept more than one link at the same time. BeGet saves your downloaded files to /home/Downloads +DESCRIPTION=" +BeGet is a easy-to-use download manager for the popular command line +tool wget. BeGet can also accept more than one link at the same time. +BeGet saves your downloaded files to /home/Downloads " HOMEPAGE="http://github.com/HaikuArchives/BeGet" -SRC_URI="git://github.com/HaikuArchives/BeGet" -REVISION="2" +SRC_URI="git://github.com/HaikuArchives/BeGet#fe8db7ccb6" +REVISION="3" LICENSE="GNU GPL v2" COPYRIGHT="1999-2001 Atsushi Takamatsu" -ARCHITECTURES="x86_gcc2 x86 x86_64" -SECONDARY_ARCHITECTURES="x86_gcc2 x86 x86_64" +ARCHITECTURES="x86_gcc2 !x86 !x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 !x86 !x86_64" PROVIDES=" beget = $portVersion app:beget = $portVersion -" + " + REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion cmd:wget$secondaryArchSuffix -" + " + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel >= $haikuVersion -" + " + BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion cmd:cmake cmd:make cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix -" -SOURCE_DIR="BeGet-master" + " BUILD() { @@ -40,7 +43,6 @@ BUILD() INSTALL() { mkdir -p $appsDir - cp BeGet $appsDir - + cp BeGet $appsDir addAppDeskbarSymlink $appsDir/BeGet } diff --git a/haiku-apps/bepdf/bepdf-1.1.1~beta5_2013_04_28.recipe b/haiku-apps/bepdf/bepdf-1.1.1~beta5_2013_04_28.recipe index 1298a0371..cf30e99b3 100644 --- a/haiku-apps/bepdf/bepdf-1.1.1~beta5_2013_04_28.recipe +++ b/haiku-apps/bepdf/bepdf-1.1.1~beta5_2013_04_28.recipe @@ -13,22 +13,25 @@ COPYRIGHT=" 1999-2000 Hubert Figuiere 2000-2010 Michael Pfeiffer" LICENSE="GNU GPL v2" -REVISION="1" +REVISION="2" ARCHITECTURES="x86_gcc2 x86" PROVIDES=" bepdf = $portVersion - cmd:BePDF = $portVersion + app:BePDF = $portVersion " + REQUIRES=" haiku >= $haikuVersion lib:liblayout " + BUILD_REQUIRES=" + haiku_devel >= $haikuVersion devel:liblayout " + BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion cmd:gcc cmd:jam cmd:htmldoc @@ -36,8 +39,6 @@ BUILD_PREREQUIRES=" cmd:sed " -SOURCE_DIR="$portVersionedName" - PATCHES="bepdf-1.1.1~beta5_2013_04_28.patchset" PATCH() diff --git a/haiku-apps/bescreencapture/bescreencapture-1.9.1.recipe b/haiku-apps/bescreencapture/bescreencapture-1.9.1.recipe index 05965ae52..a0bfb4b3a 100644 --- a/haiku-apps/bescreencapture/bescreencapture-1.9.1.recipe +++ b/haiku-apps/bescreencapture/bescreencapture-1.9.1.recipe @@ -14,39 +14,38 @@ LICENSE=" MIT " COPYRIGHT="2013 Stefano Ceccherini" -REVISION="1" -ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" +REVISION="2" +ARCHITECTURES="x86_gcc2 x86 ?x86_64" PROVIDES=" bescreencapture = $portVersion - cmd:bescreencapture = $portVersion + app:bescreencapture = $portVersion " REQUIRES=" haiku >= $haikuVersion " -BUILD_REQUIRES="" -BUILD_PREREQUIRES=" +BUILD_REQUIRES=" haiku_devel >= $haikuVersion + " + +BUILD_PREREQUIRES=" makefile_engine cmd:make cmd:gcc + cmd:mkdepend " -SOURCE_DIR="$portName-87886da2972fd4bbabb3fc5caae301c6dc14e7fd" - BUILD() { - rc BeScreenCapture.rdef - make BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` + make OBJ_DIR=objects \ + BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` } INSTALL() { - architecture=${buildArchitecture/_/-} - mkdir -p $appsDir - cp -a objects.$architecture-release/BeScreenCapture $appsDir + cp -a objects/BeScreenCapture $appsDir addAppDeskbarSymlink $appsDir/BeScreenCapture } diff --git a/haiku-apps/binary_clock/binary_clock-2.0.recipe b/haiku-apps/binary_clock/binary_clock-2.0.recipe index 44060dfbd..ea7108c12 100644 --- a/haiku-apps/binary_clock/binary_clock-2.0.recipe +++ b/haiku-apps/binary_clock/binary_clock-2.0.recipe @@ -1,13 +1,16 @@ SUMMARY="A binary clock application and screensaver" DESCRIPTION="What Is This: -A Binary Clock. And yes, you really can use this to tell time! I have found it quite enjoyable to reprogram my brain to learn to read it at a glance. It just takes a little getting used to. Detailed directions on how to read it are included at the end of this file." +A Binary Clock. And yes, you really can use this to tell time! I +have found it quite enjoyable to reprogram my brain to learn to read +it at a glance. It just takes a little getting used to. Detailed +directions on how to read it are included at the end of this file." HOMEPAGE="http://github.com/HaikuArchives/BinaryClock" -SRC_URI="git://github.com/HaikuArchives/BinaryClock" -REVISION="1" +SRC_URI="git://github.com/HaikuArchives/BinaryClock#5d04da1137" +REVISION="2" LICENSE="GNU GPL v2" COPYRIGHT="2000 David Enderson" -ARCHITECTURES="x86_gcc2 x86 x86_64" +ARCHITECTURES="x86_gcc2 !x86 !x86_64" PROVIDES=" app:binary_clock = $portVersion @@ -23,29 +26,26 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion cmd:make cmd:gcc cmd:ld " USER_SETTINGS_FILES=" - settings/BinaryClock_2.xx "directory" + settings/BinaryClock_2.xx " -SOURCE_DIR="BinaryClock-master" - BUILD() { cd Application g++ -o BinaryClock *.cpp -lbe -ltranslation xres -o BinaryClock BinaryClock.rsrc + mimeset -f BinaryClock } + INSTALL() { - mkdir -p $appsDir - - cd Application - cp BinaryClock $appsDir + mkdir -p $appsDir + cp Application/BinaryClock $appsDir addAppDeskbarSymlink $appsDir/BinaryClock "Binary Clock" } diff --git a/haiku-apps/dockbert/dockbert-1.0.2b1.recipe b/haiku-apps/dockbert/dockbert-1.0.2b1.recipe index 2a9b0db16..9dd4a60ef 100644 --- a/haiku-apps/dockbert/dockbert-1.0.2b1.recipe +++ b/haiku-apps/dockbert/dockbert-1.0.2b1.recipe @@ -1,13 +1,13 @@ DESCRIPTION="DockBert is a Deskbar modification. It adds a dock to your deskbar where you may have shortcuts organized in "tabs", a tab of the running apps and some other general eyecandy." SUMMARY="DockBert adds a dock to your deskbar" HOMEPAGE="https://github.com/HaikuArchives/DockBert" -SRC_URI="git+https://github.com/HaikuArchives/DockBert" +SRC_URI="git+https://github.com/HaikuArchives/DockBert#057c54674d" COPYRIGHT="2005 yellowTAB GmbH" LICENSE="BSD (3-clause)" -REVISION="1" +REVISION="2" -ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" +ARCHITECTURES="x86_gcc2 x86 ?x86_64" PROVIDES=" dockbert = $portVersion @@ -19,30 +19,28 @@ REQUIRES=" " BUILD_REQUIRES=" + haiku_devel >= $haikuVersion " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion makefile_engine cmd:gcc cmd:make cmd:mkdepend " +PATCHES="dockbert-1.0.2b1.patchset" + BUILD() { cd trunk - make BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` + make OBJ_DIR=objects \ + BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` } INSTALL() -{ - architecture=$(echo $buildArchitecture | sed 's/_/-/g') - - cd trunk/objects.$architecture-debug - - mkdir -p $appsDir/Dock - cp -a Dock $appsDir/Dock - - addAppDeskbarSymlink $appsDir/Dock/Dock +{ + mkdir -p $appsDir + cp -a trunk/objects/Dock $appsDir/Dock + addAppDeskbarSymlink $appsDir/Dock } diff --git a/haiku-apps/dockbert/patches/dockbert-1.0.2b1.patchset b/haiku-apps/dockbert/patches/dockbert-1.0.2b1.patchset new file mode 100644 index 000000000..7d7c88028 --- /dev/null +++ b/haiku-apps/dockbert/patches/dockbert-1.0.2b1.patchset @@ -0,0 +1,22 @@ +From c7dd365b426c78ef62bfb1b1b8ba149e9b6a7afb Mon Sep 17 00:00:00 2001 +From: Chris Roberts +Date: Mon, 2 Dec 2013 18:12:54 -0700 +Subject: Fix makefile stdc++ libs + + +diff --git a/trunk/Makefile b/trunk/Makefile +index fa6193c..748e5fd 100644 +--- a/trunk/Makefile ++++ b/trunk/Makefile +@@ -60,7 +60,7 @@ RSRCS= dockbert.rsrc + # 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= be tracker stdc++.r4 locale localestub ++LIBS= be tracker $(STDCPPLIBS) localestub + + # specify additional paths to directories following the standard + # libXXX.so or libXXX.a naming scheme. You can specify full paths +-- +1.8.3.4 + diff --git a/haiku-apps/documentviewer/documentviewer-0.3.2.recipe b/haiku-apps/documentviewer/documentviewer-0.3.2.recipe index f1ea0c856..439e422c4 100644 --- a/haiku-apps/documentviewer/documentviewer-0.3.2.recipe +++ b/haiku-apps/documentviewer/documentviewer-0.3.2.recipe @@ -5,7 +5,7 @@ COPYRIGHT="2010-2012 Haiku, Inc" HOMEPAGE="http://haiku.bplaced.net/" SRC_URI="http://haiku.bplaced.net/DocumentViewer/sources/documentviewer-0.3.2.zip" CHECKSUM_MD5="1fddc4292ecb14f343eb18b0bf723b13" -REVISION="1" +REVISION="2" ARCHITECTURES="x86" if [ $effectiveTargetArchitecture != x86_gcc2 ]; then # x86_gcc2 is fine as primary target architecture as long as we're building @@ -32,6 +32,7 @@ REQUIRES=" " BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion devel:libdjvulibre devel:libfitz devel:libfreetype @@ -42,7 +43,6 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion cmd:jam cmd:g++$secondaryArchSuffix " @@ -58,6 +58,5 @@ INSTALL() { mkdir -p $appsDir cp application/DocumentViewer $appsDir - addAppDeskbarSymlink $appsDir/DocumentViewer } diff --git a/haiku-apps/filecropper/filecropper-1.recipe b/haiku-apps/filecropper/filecropper-1.recipe index 58ebaec8b..421a5d542 100644 --- a/haiku-apps/filecropper/filecropper-1.recipe +++ b/haiku-apps/filecropper/filecropper-1.recipe @@ -1,32 +1,38 @@ DESCRIPTION="About FileCropper: -Truncates files of any kind. Cuts off everything from a given offset (bytes) to the end of the file. (GUI app)." -SUMMARY="Truncates files of any kind. Cuts off everything from a given offset (bytes) to the end of the file. (GUI app)." +Truncates files of any kind. Cuts off everything from a given offset +(bytes) to the end of the file. (GUI app)." +SUMMARY="Truncates files of any kind." +COPYRIGHT="2002 Maurice Michalski" +LICENSE="MIT" HOMEPAGE="https://github.com/HaikuArchives/FileCropper" -SRC_URI="git+git://github.com/HaikuArchives/FileCropper.git" -REVISION="1" +SRC_URI="git://github.com/HaikuArchives/FileCropper.git#0dde0f752a" +REVISION="2" -ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" +ARCHITECTURES="x86_gcc2 x86 ?x86_64" PROVIDES=" filecropper = $portVersion - app:filecropper = $portVersion" - -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - cmd:gcc - cmd:xres" + app:filecropper = $portVersion + " REQUIRES=" - haiku >= $haikuVersion" + haiku >= $haikuVersion + " -COPYRIGHT="2002 Maurice Michalski" +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + " -LICENSE="MIT" +BUILD_PREREQUIRES=" + cmd:gcc + cmd:xres + " BUILD() { g++ app.cpp mainWindow.cpp -lbe -o FileCropper xres -o FileCropper FileCropper.rsrc + mimeset -f FileCropper } INSTALL() diff --git a/haiku-apps/ftppositive/ftppositive-1.0.recipe b/haiku-apps/ftppositive/ftppositive-1.0.recipe index 7e4997c61..9ad712d8e 100644 --- a/haiku-apps/ftppositive/ftppositive-1.0.recipe +++ b/haiku-apps/ftppositive/ftppositive-1.0.recipe @@ -1,20 +1,28 @@ DESCRIPTION="FtpPositive is a simple graphical FTP client." SUMMARY="A simple graphical FTP client" HOMEPAGE="https://github.com/HaikuArchives/FtpPositive" -SRC_URI="git+https://github.com/HaikuArchives/FtpPositive" +SRC_URI="git+https://github.com/HaikuArchives/FtpPositive#442f47a22f" COPYRIGHT="2007 momoziro" LICENSE="FtpPositive" -REVISION="1" +REVISION="2" -ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" +ARCHITECTURES="x86_gcc2 x86 ?x86_64" PROVIDES=" ftppositive = $portVersion - app:ftppositive = $portVersion" + app:ftppositive = $portVersion + " + +REQUIRES=" + haiku >= $haikuVersion + " + +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion cmd:gcc cmd:jam" @@ -22,14 +30,14 @@ BUILD() { cd src jam + + #too lazy to fix the jamfile + mimeset -f FtpPositive } INSTALL() { - cd src - - mkdir -p $appsDir/FtpPositive - cp -a FtpPositive $appsDir/FtpPositive - - addAppDeskbarSymlink $appsDir/FtpPositive/FtpPositive + mkdir -p $appsDir + cp -a src/FtpPositive $appsDir + addAppDeskbarSymlink $appsDir/FtpPositive } diff --git a/haiku-apps/hare/hare-beta1_git.recipe b/haiku-apps/hare/hare-beta1_git.recipe index 2b914b37f..d6ff3eb19 100644 --- a/haiku-apps/hare/hare-beta1_git.recipe +++ b/haiku-apps/hare/hare-beta1_git.recipe @@ -10,13 +10,15 @@ COPYRIGHT="2000 FlipSide Software REVISION="1" -ARCHITECTURES="x86_gcc2 x86 ?x86_64" +ARCHITECTURES="x86_gcc2 !x86 !x86_64" PROVIDES=" Hare = $portVersion + app:Hare = $portVersion " REQUIRES=" + haiku >= $haikuVersion # lib:liblame # lib:liboggenc # lib:libflac @@ -25,19 +27,16 @@ REQUIRES=" " BUILD_REQUIRES=" - haiku >= $haikuVersion + haiku${secondaryArchSuffix}_devel >= $haikuVersion devel:libtag$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion cmd:gcc$secondaryArchSuffix cmd:cmake cmd:make " -SOURCE_DIRECTORY="hare-beta1_git" - BUILD() { cmake . @@ -48,7 +47,6 @@ INSTALL() { mkdir -p $appsDir/Hare cp -r build/* $appsDir/Hare - addAppDeskbarSymlink $appsDir/Hare/Hare Hare } diff --git a/haiku-apps/jammin/jammin-0.1.0.recipe b/haiku-apps/jammin/jammin-0.1.0.recipe index 4713577fa..920ae8ccd 100644 --- a/haiku-apps/jammin/jammin-0.1.0.recipe +++ b/haiku-apps/jammin/jammin-0.1.0.recipe @@ -1,41 +1,49 @@ DESCRIPTION="The JamMin manages your jamfiles. -Jamfiles are the thing that is most important to the user, bacause they declare the targets that should be built. Jamfiles are also used for organizing targets— each Jamfile is a separate project that can be built independently from the other projects." +Jamfiles are the thing that is most important to the user, bacause +they declare the targets that should be built. Jamfiles are also used +for organizing targets— each Jamfile is a separate project that can be +built independently from the other projects." SUMMARY="The Jamfile Administrator" HOMEPAGE="https://github.com/HaikuArchives/JamMin" -SRC_URI="git+https://github.com/HaikuArchives/JamMin.git" -REVISION="1" - +SRC_URI="git+https://github.com/HaikuArchives/JamMin.git#681e87d6d4" +REVISION="2" COPYRIGHT="2003 Guido Casiraghi" - LICENSE="MIT" -ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" +ARCHITECTURES="x86_gcc2 !x86 !x86_64" PROVIDES=" JamMin = $portVersion - app:JamMin = $portVersion" + app:JamMin = $portVersion + " + +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion makefile_engine cmd:gcc cmd:make - cmd:mkdepend" + cmd:mkdepend + " REQUIRES=" - haiku >= $haikuVersion" + haiku >= $haikuVersion + " PATCHES="jampatch-1.patch" BUILD() { - make BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` + make OBJ_DIR=objects \ + BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` } INSTALL() { mkdir -p $appsDir - cp objects.x86-gcc2-release/JamApp $appsDir + cp objects/JamApp $appsDir addAppDeskbarSymlink $appsDir/JamApp } diff --git a/haiku-apps/nightandday/nightsandday-0.1.2.recipe b/haiku-apps/nightandday/nightsandday-0.1.2.recipe index 0cb397820..63abe693d 100644 --- a/haiku-apps/nightandday/nightsandday-0.1.2.recipe +++ b/haiku-apps/nightandday/nightsandday-0.1.2.recipe @@ -1,29 +1,38 @@ -DESCRIPTION="This program was inspired by the 'TaveDesktop' program by the Tave Software Group. I think that 'TaveDesktop' was a good idea, but I wanted to be able to choose my own colors, since the 'TaveDesktop' colors looks bad on an 8bpp display. -This program should be self-explanatory. You'll find a small Popup menu when clicking the small screen at the top-right corner of the window." -SUMMARY="Automatic desktop color changer" -HOMEPAGE="https://github.com/HaikuArchives/NightAndDay" -SRC_URI="git+git://github.com/HaikuArchives/NightAndDay.git" -REVISION="1" +DESCRIPTION=" +This program was inspired by the 'TaveDesktop' program by the Tave +Software Group. I think that 'TaveDesktop' was a good idea, but I +wanted to be able to choose my own colors, since the 'TaveDesktop' +colors looks bad on an 8bpp display. -ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" +This program should be self-explanatory. You'll find a small Popup +menu when clicking the small screen at the top-right corner of the +window." +SUMMARY="Automatic desktop color changer" +COPYRIGHT="1998-1999 Jean-Baptiste M. Queru" +LICENSE="GNU GPL v2" +HOMEPAGE="https://github.com/HaikuArchives/NightAndDay" +SRC_URI="git+git://github.com/HaikuArchives/NightAndDay.git#3bcc1a5a39" +REVISION="2" + +ARCHITECTURES="x86_gcc2 !x86 !x86_64" PROVIDES=" - nightanddays = $portVersion - app:nightanddays = $portVersion" + nightanddays = $portVersion + app:nightanddays = $portVersion + " + +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - cmd:gcc - cmd:ld" + cmd:gcc + cmd:ld + " REQUIRES=" - haiku >= $haikuVersion" - -COPYRIGHT="1998-1999 Jean-Baptiste M. Queru" - -LICENSE="GNU GPL v2" - -SOURCE_DIR="src" + haiku >= $haikuVersion + " BUILD() { @@ -33,9 +42,9 @@ BUILD() INSTALL() { - NDDir=$appsDir/NightAndDay - mkdir -p $NDDir - cp src/NightAndDay $NDDir/NightAndDay - cp ReadMe $NDDir/ReadMe - addAppDeskbarSymlink $NDDir/NightAndDay + mkdir -p $appsDir + cp src/NightAndDay $appsDir + mkdir -p $docDir + cp ReadMe $docDir + addAppDeskbarSymlink $appsDir/NightAndDay } diff --git a/haiku-apps/organizer/organizer-0.1.recipe b/haiku-apps/organizer/organizer-0.1.recipe index d33820b3e..bb3d4e6ac 100644 --- a/haiku-apps/organizer/organizer-0.1.recipe +++ b/haiku-apps/organizer/organizer-0.1.recipe @@ -1,39 +1,45 @@ -DESCRIPTION="organizer - An organizer that helps you keep track on your appointments, notes and stuff." +DESCRIPTION="An organizer that helps you keep track on your appointments, notes and stuff." SUMMARY="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" -REVISION="1" +SRC_URI="git+https://github.com/HaikuArchives/Organizer#a534f0e992" +REVISION="2" -ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" +ARCHITECTURES="x86_gcc2 x86 ?x86_64" PROVIDES=" organizer = $portVersion app:organizer = $portVersion - lib:libfSub" + lib:libfSub + " + +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion makefile_engine cmd:gcc cmd:make - cmd:mkdepend" + cmd:mkdepend + " REQUIRES=" - haiku >= $haikuVersion" + haiku >= $haikuVersion + " PATCHES="organizer-0.1.patch" USER_SETTINGS_FILES=" settings/fSub directory" -COPYRIGHT="2013 Marius Stene" -LICENSE="Public Domain" +PATCHES="organizer-0.1.patchset" BUILD() { cd Source - mkdir lib/lib - make BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` + make OBJ_DIR=objects BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` } INSTALL() diff --git a/haiku-apps/organizer/patches/organizer-0.1.patch b/haiku-apps/organizer/patches/organizer-0.1.patch deleted file mode 100644 index 91741f39f..000000000 --- a/haiku-apps/organizer/patches/organizer-0.1.patch +++ /dev/null @@ -1,258 +0,0 @@ -diff -ur Organizer/Source/App/calenderView.cpp Organizer-fix/Source/App/calenderView.cpp ---- Organizer/Source/App/calenderView.cpp 2013-11-22 11:46:04.618659840 +0000 -+++ Organizer-fix/Source/App/calenderView.cpp 2013-11-22 11:46:00.566755328 +0000 -@@ -55,7 +55,7 @@ - //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 -ur Organizer/Source/App/editScriptView.cpp Organizer-fix/Source/App/editScriptView.cpp ---- Organizer/Source/App/editScriptView.cpp 2013-11-22 11:46:04.629669888 +0000 -+++ Organizer-fix/Source/App/editScriptView.cpp 2013-11-22 11:46:00.575143936 +0000 -@@ -145,7 +145,7 @@ - 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 @@ - 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 -ur Organizer/Source/App/editWindow.cpp Organizer-fix/Source/App/editWindow.cpp ---- Organizer/Source/App/editWindow.cpp 2013-11-22 11:46:04.633864192 +0000 -+++ Organizer-fix/Source/App/editWindow.cpp 2013-11-22 11:46:00.578027520 +0000 -@@ -302,7 +302,7 @@ - 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 @@ - 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 @@ - 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 @@ - 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 -ur Organizer/Source/App/exportWindow.cpp Organizer-fix/Source/App/exportWindow.cpp ---- Organizer/Source/App/exportWindow.cpp 2013-11-22 11:46:04.641466368 +0000 -+++ Organizer-fix/Source/App/exportWindow.cpp 2013-11-22 11:46:00.583794688 +0000 -@@ -114,7 +114,7 @@ - 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 -ur Organizer/Source/App/main.cpp Organizer-fix/Source/App/main.cpp ---- Organizer/Source/App/main.cpp 2013-11-22 11:46:04.650641408 +0000 -+++ Organizer-fix/Source/App/main.cpp 2013-11-22 11:46:00.590086144 +0000 -@@ -11,7 +11,7 @@ - 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 @@ - \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 @@ - 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 @@ - mApp::CheckForUpdateThread_static(void *data) - { - mApp *check4updates = (mApp *)data; -- check4updates->CheckForUpdateThread(); -+ //check4updates->CheckForUpdateThread(); - return 0; - } - -@@ -577,7 +577,7 @@ - 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 @@ - 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 -ur Organizer/Source/App/makefile Organizer-fix/Source/App/makefile ---- Organizer/Source/App/makefile 2013-11-22 11:46:04.654835712 +0000 -+++ Organizer-fix/Source/App/makefile 2013-11-22 11:46:00.593231872 +0000 -@@ -29,7 +29,7 @@ - translation \ - fSub - DEFINES= --LIBPATHS= ../../lib -+LIBPATHS= ../lib - - SYSTEM_INCLUDE_PATHS = - LOCAL_INCLUDE_PATHS = -diff -ur Organizer/Source/App/mWindow.cpp Organizer-fix/Source/App/mWindow.cpp ---- Organizer/Source/App/mWindow.cpp 2013-11-22 11:46:04.646184960 +0000 -+++ Organizer-fix/Source/App/mWindow.cpp 2013-11-22 11:46:00.586940416 +0000 -@@ -339,7 +339,7 @@ - { - 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 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 -ur Organizer/Source/App/obsolete/Language.cpp Organizer-fix/Source/App/obsolete/Language.cpp ---- Organizer/Source/App/obsolete/Language.cpp 2013-11-22 11:46:04.667942912 +0000 -+++ Organizer-fix/Source/App/obsolete/Language.cpp 2013-11-22 11:46:00.659292160 +0000 -@@ -201,7 +201,7 @@ - { - 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 -ur Organizer/Source/App/preferencesView.cpp Organizer-fix/Source/App/preferencesView.cpp ---- Organizer/Source/App/preferencesView.cpp 2013-11-22 11:46:04.678428672 +0000 -+++ Organizer-fix/Source/App/preferencesView.cpp 2013-11-22 11:46:00.665583616 +0000 -@@ -49,7 +49,7 @@ - - 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 -ur Organizer/Source/App/preferencesWindow.cpp Organizer-fix/Source/App/preferencesWindow.cpp ---- Organizer/Source/App/preferencesWindow.cpp 2013-11-22 11:46:04.681836544 +0000 -+++ Organizer-fix/Source/App/preferencesWindow.cpp 2013-11-22 11:46:00.668729344 +0000 -@@ -39,7 +39,7 @@ - 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 -ur Organizer/Source/App/Secret/glView.cpp Organizer-fix/Source/App/Secret/glView.cpp ---- Organizer/Source/App/Secret/glView.cpp 2013-11-22 11:46:04.602669056 +0000 -+++ Organizer-fix/Source/App/Secret/glView.cpp 2013-11-22 11:46:00.556531712 +0000 -@@ -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 @@ - // 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 @@ - 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 @@ - 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 -ur Organizer/Source/lib/makefile Organizer-fix/Source/lib/makefile ---- Organizer/Source/lib/makefile 2013-11-22 11:46:04.719585280 +0000 -+++ Organizer-fix/Source/lib/makefile 2013-11-22 11:46:00.701235200 +0000 -@@ -1,4 +1,4 @@ --NAME= ../../../lib/libfSub.so -+NAME= ../libfSub.so - TYPE= SHARED - SRCS= Bitmap.cpp \ - Bubble.cpp \ diff --git a/haiku-apps/organizer/patches/organizer-0.1.patchset b/haiku-apps/organizer/patches/organizer-0.1.patchset new file mode 100644 index 000000000..3bf5d9b7d --- /dev/null +++ b/haiku-apps/organizer/patches/organizer-0.1.patchset @@ -0,0 +1,562 @@ +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/phantomlimb/phantomlimb-1.recipe b/haiku-apps/phantomlimb/phantomlimb-1.recipe index 4cfcb7062..df0ba729c 100644 --- a/haiku-apps/phantomlimb/phantomlimb-1.recipe +++ b/haiku-apps/phantomlimb/phantomlimb-1.recipe @@ -1,48 +1,59 @@ -DESCRIPTION="PhantomLimb is a little program to generate tones, and test your discrimination of frequency deltas. I wrote it for a friend of mine who is suffering from tinnitus ('ringing in the ears') due to an ear infection. (the infection destroyed some nerve cells in his inner ear, and the lack of signals from the destroyed nerve cells is what causes the ringing--similar to the 'phantom limb' sensations experienced by amputees. Hence the name of this program) By practicing discriminating between the sound of the tinnitus and 'nearby' sounds, he hopes to be able to train his brain to discriminate between the 'phantom' sound and other, real sounds." - SUMMARY="PhantomLimb is a little program to generate tones, and test your discrimination of frequency deltas." -HOMEPAGE="https://github.com/HaikuArchives/PhantomLimb" -SRC_URI="git+git://github.com/HaikuArchives/PhantomLimb.git" -REVISION="1" - -ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" - -PROVIDES=" - phantomlimb = $portVersion - app:phantomlimb = $portVersion" - -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - cmd:g++ - cmd:xres" - -REQUIRES=" - haiku >= $haikuVersion" - +DESCRIPTION=" +PhantomLimb is a little program to generate tones, and test your +discrimination of frequency deltas. I wrote it for a friend of mine +who is suffering from tinnitus ('ringing in the ears') due to an ear +infection. (the infection destroyed some nerve cells in his inner +ear, and the lack of signals from the destroyed nerve cells is what +causes the ringing--similar to the 'phantom limb' sensations +experienced by amputees. Hence the name of this program) By +practicing discriminating between the sound of the tinnitus and +'nearby' sounds, he hopes to be able to train his brain to +discriminate between the 'phantom' sound and other, real sounds." COPYRIGHT=" 2001 Ben Loftis 2013 Jeremy Friesner" - LICENSE="Public Domain" +HOMEPAGE="https://github.com/HaikuArchives/PhantomLimb" +SRC_URI="git+git://github.com/HaikuArchives/PhantomLimb.git#5444867ac9" +REVISION="2" + +ARCHITECTURES="x86_gcc2 x86 ?x86_64" + +PROVIDES=" + phantomlimb = $portVersion + app:phantomlimb = $portVersion + " + +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + " + +BUILD_PREREQUIRES=" + cmd:g++ + cmd:xres + " + +REQUIRES=" + haiku >= $haikuVersion + " BUILD() { cd source - gcc -c -o PhantomApp.o PhantomApp.cpp - gcc -c -o PhantomWindow.o PhantomWindow.cpp - gcc -c -o PhantomPlayer.o PhantomPlayer.cpp -D PI=3.141592 - gcc -c -o PhantomView.o PhantomView.cpp - gcc -c -o LRUEntry.o LRUEntry.cpp - gcc -o PhantomLimb PhantomApp.o PhantomWindow.o PhantomPlayer.o PhantomView.o LRUEntry.o -lbe -lmedia + gcc -c -o PhantomApp.o PhantomApp.cpp + gcc -c -o PhantomWindow.o PhantomWindow.cpp + gcc -c -o PhantomPlayer.o PhantomPlayer.cpp -D PI=3.141592 + gcc -c -o PhantomView.o PhantomView.cpp + gcc -c -o LRUEntry.o LRUEntry.cpp + g++ -o PhantomLimb PhantomApp.o PhantomWindow.o PhantomPlayer.o PhantomView.o LRUEntry.o -lbe -lmedia xres -o PhantomLimb Phantom.rsrc - cd .. + mimeset -f PhantomLimb } INSTALL() { - cd source mkdir -p $appsDir - cp PhantomLimb $appsDir + cp source/PhantomLimb $appsDir addAppDeskbarSymlink $appsDir/PhantomLimb - cd .. } diff --git a/haiku-apps/querywatcher/patches/querywatcher-1.4.patchset b/haiku-apps/querywatcher/patches/querywatcher-1.4.patchset new file mode 100644 index 000000000..3dbf69223 --- /dev/null +++ b/haiku-apps/querywatcher/patches/querywatcher-1.4.patchset @@ -0,0 +1,109 @@ +From 88d1ebaf009131526657d0e848495b46bc001aee Mon Sep 17 00:00:00 2001 +From: Chris Roberts +Date: Mon, 2 Dec 2013 19:32:02 -0700 +Subject: Misc gcc4 fixes + + +diff --git a/src/App.cpp b/src/App.cpp +index 6dd6ad8..25a4bac 100644 +--- a/src/App.cpp ++++ b/src/App.cpp +@@ -41,7 +41,7 @@ const char *kTrackerQueryVolume = "_trk/qryvol1"; + #include + + // Yes, globals are bad. But, sssh! +-typedef list reflist; ++typedef std::list reflist; + reflist gIgnoreList; + BPath gSettingsPath; + +@@ -57,7 +57,7 @@ struct query_load_info + BRect rect; + }; + +-typedef list vollist; ++typedef std::list vollist; + + char *ReadAttribute(BNode node, const char *attribute, int32 *length = NULL) { + attr_info info; +@@ -583,7 +583,7 @@ QueryView::ShouldIgnore( BMessage * msg ) + ref.node = node; + ref.device = device; + +- list::iterator iter; ++ std::list::iterator iter; + iter = find(fIgnoredMatches.begin(), fIgnoredMatches.end(), ref); + + if ( iter == fIgnoredMatches.end() ) +@@ -601,7 +601,7 @@ QueryView::ShouldIgnore( BMessage * msg ) + if ( !result ) + { + // remove node from ignore list if present +- list::iterator iter; ++ std::list::iterator iter; + + node_ref ref; + ref.node = node; +@@ -619,7 +619,7 @@ QueryView::ShouldIgnore( BMessage * msg ) + if ( opcode == B_ENTRY_REMOVED ) + { + // remove from fIgnoredMatches if there +- list::iterator iter; ++ std::list::iterator iter; + + node_ref ref; + ref.node = node; +@@ -653,7 +653,7 @@ QueryView::MessageReceived(BMessage* msg) + msg->FindInt32("device",&node.device); + msg->FindInt64("node",&node.node); + +- list::iterator iter; ++ std::list::iterator iter; + + iter = find(fIgnoredMatches.begin(),fIgnoredMatches.end(),node); + +diff --git a/src/App.h b/src/App.h +index fe5e49c..765eabe 100644 +--- a/src/App.h ++++ b/src/App.h +@@ -28,7 +28,7 @@ class LabelView; + class ColorView; + + // slaad +-typedef list querylist; ++typedef std::list querylist; + + class App : public BApplication + { +@@ -104,7 +104,7 @@ private: + BString fPredicate; + + // eiman +- list fIgnoredMatches; ++ std::list fIgnoredMatches; + }; + + IMPEXP class LabelView : public BStringView +diff --git a/src/makefile b/src/makefile +index 07ea621..ac5d9b2 100644 +--- a/src/makefile ++++ b/src/makefile +@@ -47,7 +47,7 @@ SRCS := \ + # 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= be ++LIBS= be $(STDCPPLIBS) + + # specify additional paths to directories following the standard + # libXXX.so or libXXX.a naming scheme. You can specify full paths +@@ -149,4 +149,4 @@ else + LIBS += zeta tracker + endif + +-include $(BUILDHOME)/etc/makefile-engine +\ No newline at end of file ++include $(BUILDHOME)/etc/makefile-engine +-- +1.8.3.4 + diff --git a/haiku-apps/querywatcher/querywatcher-1.4.recipe b/haiku-apps/querywatcher/querywatcher-1.4.recipe index c82279f28..b7df8c79b 100644 --- a/haiku-apps/querywatcher/querywatcher-1.4.recipe +++ b/haiku-apps/querywatcher/querywatcher-1.4.recipe @@ -1,43 +1,54 @@ SUMMARY="An application that monitors Tracker queries." -DESCRIPTION="This is a tiny little GUI application that monitors any regular Tracker queries and displays miniature indicator lights for the presence of results." +DESCRIPTION=" +This is a tiny little GUI application that monitors any regular +Tracker queries and displays miniature indicator lights for the +presence of results." HOMEPAGE="https://github.com/HaikuArchives/QueryWatcher" -SRC_URI="git://github.com/HaikuArchives/QueryWatcher.git" +SRC_URI="git://github.com/HaikuArchives/QueryWatcher.git#64b66ee9e9" LICENSE="Public Domain" COPYRIGHT=" 2003-2004 Michael Armida 2004 Mikael Eiman 2004 Michael Davidson " - -REVISION="1" +REVISION="2" +ARCHITECTURES="x86_gcc2 x86 ?x86_64" -ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" -PROVIDES="app:QueryWatcher = $portVersion" +PROVIDES=" + QueryWatcher = $portVersion + app:QueryWatcher = $portVersion + " REQUIRES=" haiku >= $haikuVersion " -BUILD_REQUIRES="" +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion makefile_engine cmd:gcc cmd:make cmd:mkdepend " -SOURCE_DIR="src/src" +PATCHES="querywatcher-1.4.patchset" BUILD() { - make BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` + cd src + make OBJ_DIR=objects \ + BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` } INSTALL() { - mkdir -p $appsDir /QueryWatcher - cp -a objects.x86-gcc2-release/QueryWatcher $appsDir/QueryWatcher + mkdir -p $appsDir + cp -a src/objects/QueryWatcher $appsDir addAppDeskbarSymlink $appsDir/QueryWatcher + + mkdir -p $docDir + cp README $docDir } diff --git a/haiku-apps/resourcer/resourcer-1.0.recipe b/haiku-apps/resourcer/resourcer-1.0.recipe index 4df073f17..17ea2d7e2 100644 --- a/haiku-apps/resourcer/resourcer-1.0.recipe +++ b/haiku-apps/resourcer/resourcer-1.0.recipe @@ -1,17 +1,25 @@ -DESCRIPTION="Resourcer is an all-purpose resource and attribute editor with a full-featured interface editor. It also contains plug-in editors for 31 other data types, including images, cursors, sounds, movies, text, and icons." -SUMMARY="Resourcer is an all-purpose resource and attribute editor with a full-featured interface editor." +SUMMARY="A resource and attribute editor with a full-featured interface editor." +DESCRIPTION=" +Resourcer is an all-purpose resource and attribute editor with a +full-featured interface editor. It also contains plug-in editors for +31 other data types, including images, cursors, sounds, movies, text, +and icons." +COPYRIGHT="2000 Nathan Whitehorn" +LICENSE="BSD (3-clause)" HOMEPAGE="https://gitorious.org/desknotes/resourcer" -SRC_URI="git+https://git.gitorious.org/desknotes/resourcer.git" -REVISION="1" +SRC_URI="git+https://git.gitorious.org/desknotes/resourcer.git#b93cb9e" +REVISION="2" -ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" +ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64" PROVIDES=" resourcer = $portVersion - app:resourcer = $portVersion" + app:resourcer = $portVersion + " REQUIRES=" - haiku >= $haikuVersion" + haiku >= $haikuVersion + " BUILD_PREREQUIRES=" makefile_engine @@ -20,17 +28,14 @@ BUILD_PREREQUIRES=" cmd:mkdepend" BUILD_REQUIRES=" - haiku_devel >= $haikuVersion" - -COPYRIGHT=" - 2000 Nathan Whitehorn" - -LICENSE="BSD (3-clause)" + haiku_devel >= $haikuVersion + " BUILD() { cd main - make BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` + make OBJ_DIR=objects \ + BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` # The two next steps might not be required # The first one probably isn't, because according to the description @@ -38,10 +43,12 @@ BUILD() # but I'm not really sure about the second one cd ../editors - make BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` + make OBJ_DIR=objects \ + BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` cd ../reslib - make BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` + make OBJ_DIR=objects \ + BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` } INSTALL() @@ -50,13 +57,8 @@ INSTALL() # because I can't figure out how the files in the other directories # should be installed - cd main - - architecture=`echo $buildArchitecture | sed 's/_/-/g'` - - cd objects.$architecture-release mkdir -p $appsDir - cp -a Resourcer $appsDir + cp -a main/objects/Resourcer $appsDir addAppDeskbarSymlink $appsDir/Resourcer } diff --git a/haiku-apps/runprogram/patches/runprogram-1.0rc1.patch b/haiku-apps/runprogram/patches/runprogram-1.0rc1.patchset similarity index 57% rename from haiku-apps/runprogram/patches/runprogram-1.0rc1.patch rename to haiku-apps/runprogram/patches/runprogram-1.0rc1.patchset index 9c7c0a011..0a2c636eb 100644 --- a/haiku-apps/runprogram/patches/runprogram-1.0rc1.patch +++ b/haiku-apps/runprogram/patches/runprogram-1.0rc1.patchset @@ -1,11 +1,8 @@ -From fc9ee0911f7ea1881eed295c0cca7470b1c35a14 Mon Sep 17 00:00:00 2001 -From: Luke -Date: Mon, 25 Nov 2013 21:02:41 +0000 -Subject: [PATCH] COMMON -> SYSTEM +From 6b3517facc71d33974bfd81a78a7567704a94554 Mon Sep 17 00:00:00 2001 +From: Chris Roberts +Date: Mon, 2 Dec 2013 19:41:16 -0700 +Subject: applying patch runprogram-1.0rc1.patch ---- - src/ExeBox.cpp | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ExeBox.cpp b/src/ExeBox.cpp index b4ee544..b3c3bb2 100644 @@ -41,3 +38,26 @@ index b4ee544..b3c3bb2 100644 -- 1.8.3.4 + +From 522d633b7593a3009fbccf0da8efd3943cceb31b Mon Sep 17 00:00:00 2001 +From: Chris Roberts +Date: Mon, 2 Dec 2013 19:46:25 -0700 +Subject: Fix includes for building with gcc4 + + +diff --git a/src/ExeBox.cpp b/src/ExeBox.cpp +index b3c3bb2..4d154bb 100644 +--- a/src/ExeBox.cpp ++++ b/src/ExeBox.cpp +@@ -13,6 +13,8 @@ + #include + #include + ++#include ++ + static BObjectList *sPathData = NULL; + BLocker sPathDataLock; + thread_id sThreadID = -1; +-- +1.8.3.4 + diff --git a/haiku-apps/runprogram/runprogram-1.0rc1.recipe b/haiku-apps/runprogram/runprogram-1.0rc1.recipe index 51ea61570..7f3a50bc7 100644 --- a/haiku-apps/runprogram/runprogram-1.0rc1.recipe +++ b/haiku-apps/runprogram/runprogram-1.0rc1.recipe @@ -11,32 +11,33 @@ HOMEPAGE="https://github.com/HaikuArchives/RunProgram" SRC_URI="git+git://github.com/HaikuArchives/RunProgram.git#a8fe29319e8dde884d8634a0c5a82838a3706563" LICENSE="MIT" COPYRIGHT="2008 DarkWyrm" -REVISION="1" -ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" +REVISION="2" +ARCHITECTURES="x86_gcc2 x86 ?x86_64" PROVIDES=" RunProgram = $portVersion + app:RunProgram = $portVersion " REQUIRES=" haiku >= $haikuVersion " -BUILD_REQUIRES="" -BUILD_PREREQUIRES=" +BUILD_REQUIRES=" haiku_devel >= $haikuVersion + " + +BUILD_PREREQUIRES=" cmd:gcc + cmd:xres " -PATCHES=" - runprogram-1.0rc1.patch - " - -SOURCE_DIR="$portName-a8fe29319e8dde884d8634a0c5a82838a3706563" +PATCHES="runprogram-1.0rc1.patchset" BUILD() { cd src + rm -f ObjectList.h g++ -o RunProgram -lbe \ AutoTextControl.cpp \ ExeBox.cpp \ @@ -44,6 +45,7 @@ BUILD() RunWindow.cpp \ TextFile.cpp xres -o RunProgram "Run Program.rsrc" + mimeset -f RunProgram } INSTALL() diff --git a/haiku-apps/sum_it/sum_it-0.2beta.recipe b/haiku-apps/sum_it/sum_it-0.2beta.recipe index cacd46b2e..a16aaf719 100644 --- a/haiku-apps/sum_it/sum_it-0.2beta.recipe +++ b/haiku-apps/sum_it/sum_it-0.2beta.recipe @@ -1,8 +1,18 @@ SUMMARY="Sum-It is a native spreadsheet for BeOS" +DESCRIPTION=" +Sum-It is a spreadsheet for BeOS (Download BeOS for free). This is Open Sum-It, +the open source version of Maarten Hekkelman's Sum-It application. +Sum-It has many features, including a plug-in architecture for formulas and +graphs. This product includes software developed by Hekkelman Programmatuur B.V. +" +LICENSE="BSD (4-clause)" +COPYRIGHT="1996-1998, 2000 Hekkelman Programmatuur B.V. All rights reserved. + 1999-2000 Tim Vernum. All rights reserved." HOMEPAGE="https://github.com/HaikuArchives/OpenSumIt" -SRC_URI="git+https://github.com/HaikuArchives/OpenSumIt.git" -REVISION="1" -ARCHITECTURES="x86 x86_gcc2" +SRC_URI="git+https://github.com/HaikuArchives/OpenSumIt.git#cdab184a27" +REVISION="2" +ARCHITECTURES="!x86 x86_gcc2" + PROVIDES=" sum_it = $portVersion app:sum_it = $portVersion @@ -10,11 +20,15 @@ PROVIDES=" BUILD_REQUIRES=" haiku_devel >= $haikuVersion + " + +BUILD_PREREQUIRES=" cmd:make cmd:gcc cmd:flex cmd:bison " + BUILD() { pushd bsl @@ -36,16 +50,5 @@ INSTALL() { mkdir -p $appsDir cp sum-it/OpenSum-It $appsDir/Sum-It - addAppDeskbarSymlink $appsDir/Sum-It } - -LICENSE="BSD (4-clause)" -COPYRIGHT="1996-1998, 2000 Hekkelman Programmatuur B.V. All rights reserved. - 1999-2000 Tim Vernum. All rights reserved." -DESCRIPTION=" -Sum-It is a spreadsheet for BeOS (Download BeOS for free). This is Open Sum-It, -the open source version of Maarten Hekkelman's Sum-It application. -Sum-It has many features, including a plug-in architecture for formulas and -graphs. This product includes software developed by Hekkelman Programmatuur B.V. -" diff --git a/haiku-apps/systeminfo/systeminfo-2.recipe b/haiku-apps/systeminfo/systeminfo-2.recipe index 444fbee8f..145a760c7 100644 --- a/haiku-apps/systeminfo/systeminfo-2.recipe +++ b/haiku-apps/systeminfo/systeminfo-2.recipe @@ -1,3 +1,4 @@ +SUMMARY="A system monitor for Haiku" DESCRIPTION="It is an little application through which we can see some statistics about our system. It currently only shows: -CPU 0 usage @@ -5,34 +6,40 @@ It currently only shows: -Memory usage -Boot disk used space -Uptime" -SUMMARY="A system monitor for Haiku" -HOMEPAGE="https://github.com/disreali/SystemInfo" -SRC_URI="git+git://github.com/disreali/SystemInfo.git" -REVISION="1" - -ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" - -PROVIDES=" - SystemInfo = $portVersion - app:SystemInfo = $portVersion" - -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - cmd:gcc" - -REQUIRES=" - haiku >= $haikuVersion" - COPYRIGHT=" 2002 Brent Miszalski 2012 Disreali" - LICENSE="MIT" +HOMEPAGE="https://github.com/disreali/SystemInfo" +SRC_URI="git+git://github.com/disreali/SystemInfo.git#ae36df9999" +REVISION="2" + +ARCHITECTURES="x86_gcc2 x86 ?x86_64" + +PROVIDES=" + SystemInfo = $portVersion + app:SystemInfo = $portVersion + " + +REQUIRES=" + haiku >= $haikuVersion + " + +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + " + +BUILD_PREREQUIRES=" + cmd:gcc + cmd:xres + " BUILD() { echo "const uint32 CP_CHANGE_BG = 'CPBG'; const uint32 CP_CHANGE_FG = 'CPFG';" > ./DigitalView.h g++ CPUPercent.cpp ColourPrefs.cpp ImageView.cpp MemUsage.cpp SIReplicant.cpp main.cpp -o SystemInfo -lbe + xres -o SystemInfo SystemInfo.rsrc + mimeset -f SystemInfo } INSTALL() diff --git a/haiku-apps/takenotes/patches/takenotes-1.0.0.patchset b/haiku-apps/takenotes/patches/takenotes-1.0.0.patchset new file mode 100644 index 000000000..42bc9ba6e --- /dev/null +++ b/haiku-apps/takenotes/patches/takenotes-1.0.0.patchset @@ -0,0 +1,36 @@ +From 06e5cb378bf63d5352a90605d2cd80ee5200d456 Mon Sep 17 00:00:00 2001 +From: Chris Roberts +Date: Mon, 2 Dec 2013 19:59:47 -0700 +Subject: Misc gcc4 fixes + + +diff --git a/ChoiceView.cpp b/ChoiceView.cpp +index f33aa88..4293e22 100644 +--- a/ChoiceView.cpp ++++ b/ChoiceView.cpp +@@ -31,8 +31,8 @@ + #define BUTTON_UNDO 'btun' + + // Constructor +-ChoiceView :: ChoiceView(BRect rect, char *name,BHandler *handler) +- : BView(rect, name, B_FOLLOW_ALL, B_WILL_DRAW | B_FRAME_EVENTS | B_FULL_UPDATE_ON_RESIZE){ ++ChoiceView :: ChoiceView(BRect rect, char *vname,BHandler *handler) ++ : BView(rect, vname, B_FOLLOW_ALL, B_WILL_DRAW | B_FRAME_EVENTS | B_FULL_UPDATE_ON_RESIZE){ + + // Variables + BStringView *instructions; +diff --git a/NoteWindow.h b/NoteWindow.h +index a07ffe7..38e7ce3 100644 +--- a/NoteWindow.h ++++ b/NoteWindow.h +@@ -31,6 +31,7 @@ + #include + #include + #include ++#include + + /* == DATA STRUCTURE == + * Structure containing all the informations about the current post-it +-- +1.8.3.4 + diff --git a/haiku-apps/takenotes/takenotes-1.0.0.recipe b/haiku-apps/takenotes/takenotes-1.0.0.recipe index 80aa965a0..0be698752 100644 --- a/haiku-apps/takenotes/takenotes-1.0.0.recipe +++ b/haiku-apps/takenotes/takenotes-1.0.0.recipe @@ -9,39 +9,44 @@ DESCRIPTION=" - Tag your note for easy search - Set an alarm to reminds you date, appointments and so on " +COPYRIGHT="Copyright 2009, Ilio Catallo, Stefano Celentano, Eleonora Ciceri, all rights reserved" +LICENSE="GNU GPL v2" HOMEPAGE="https://github.com/HaikuArchives/TakeNotes" -SRC_URI="git+https://github.com/HaikuArchives/TakeNotes" -REVISION="1" -ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" +SRC_URI="git+https://github.com/HaikuArchives/TakeNotes#3ee7d80b53" +REVISION="2" +ARCHITECTURES="x86_gcc2 x86 ?x86_64" + PROVIDES=" takenotes=$portVersion app:takenotes=$portVersion " + REQUIRES=" haiku >= $haikuVersion " -BUILD_REQUIRES="" -BUILD_PREREQUIRES=" + +BUILD_REQUIRES=" haiku_devel >= $haikuVersion + " + +BUILD_PREREQUIRES=" makefile_engine cmd:gcc cmd:make cmd:mkdepend " -COPYRIGHT="Copyright 2009, Ilio Catallo, Stefano Celentano, Eleonora Ciceri, all rights reserved" -LICENSE="GNU GPL v2" -SOURCE_DIR="$portVersionedName" + +PATCHES="takenotes-1.0.0.patchset" BUILD() { - make BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` + make OBJ_DIR=objects \ + BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` } INSTALL() { - architecture=$(echo $buildArchitecture | sed 's/_/-/g') mkdir -p $appsDir - cp objects.$architecture-release/TakeNotes $appsDir/TakeNotes - + cp objects/TakeNotes $appsDir addAppDeskbarSymlink $appsDir/TakeNotes } diff --git a/haiku-apps/trackergrep/patches/trackergrep-5.1.patchset b/haiku-apps/trackergrep/patches/trackergrep-5.1.patchset new file mode 100644 index 000000000..01fd9988e --- /dev/null +++ b/haiku-apps/trackergrep/patches/trackergrep-5.1.patchset @@ -0,0 +1,49 @@ +From c02a072f11683914ce9dbe77adf0b478f613885e Mon Sep 17 00:00:00 2001 +From: Chris Roberts +Date: Mon, 2 Dec 2013 20:22:01 -0700 +Subject: Fix directory and include issues + + +diff --git a/source/Grepper.cpp b/source/Grepper.cpp +index d2e5c58..71befc8 100644 +--- a/source/Grepper.cpp ++++ b/source/Grepper.cpp +@@ -139,8 +139,10 @@ int32 Grepper::GrepperThread() + char command[B_PATH_NAME_LENGTH + 32]; + + BPath tempFile; +- sprintf(fileName, "/boot/var/tmp/TrackerGrep%ld", fThreadId); +- tempFile.SetTo(fileName); ++ if (find_directory(B_SYSTEM_TEMP_DIRECTORY, &tempFile, true) != B_OK) ++ return -1; ++ sprintf(fileName, "TrackerGrep%ld", fThreadId); ++ tempFile.Append(fileName); + + while (!fMustQuit && GetNextName(fileName)) { + message.MakeEmpty(); +@@ -159,8 +161,9 @@ int32 Grepper::GrepperThread() + + EscapeSpecialChars(fileName); + ++ //assume that grep is already in $PATH + sprintf( +- command, "/boot/beos/bin/grep -hn %s %s \"%s\" > \"%s\"", ++ command, "grep -hn %s %s \"%s\" > \"%s\"", + fModel->fCaseSensitive ? "" : "-i", fPattern, fileName, + tempFile.Path()); + +diff --git a/source/Model.h b/source/Model.h +index a73d801..8ec1d24 100644 +--- a/source/Model.h ++++ b/source/Model.h +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + #include + + #define PREFS_FILE "TrackerGrepSettings" +-- +1.8.3.4 + diff --git a/haiku-apps/trackergrep/trackergrep-5.1.recipe b/haiku-apps/trackergrep/trackergrep-5.1.recipe index 039b84e3a..4f9bd20b2 100644 --- a/haiku-apps/trackergrep/trackergrep-5.1.recipe +++ b/haiku-apps/trackergrep/trackergrep-5.1.recipe @@ -1,41 +1,54 @@ -DESCRIPTION="Tracker Grep is a simple Tracker add-on that lets you search through text files. Haiku already comes with a tool that lets you do that, grep, but you need to use it from a Terminal window. Gone are those days of command-line trouble, because from now on Tracker Grep lets you run grep directly from the Tracker." - -SUMMARY="Tracker Grep is a simple Tracker add-on that lets you search through text files." +SUMMARY="A simple Tracker add-on that lets you search through text files." +DESCRIPTION=" +Tracker Grep is a simple Tracker add-on that lets you search through +text files. Haiku already comes with a tool that lets you do that, +grep, but you need to use it from a Terminal window. Gone are those +days of command-line trouble, because from now on Tracker Grep lets +you run grep directly from the Tracker." HOMEPAGE="https://github.com/HaikuArchives/TrackerGrep/" -SRC_URI="git+git://github.com/HaikuArchives/TrackerGrep.git" -REVISION="1" - +SRC_URI="git://github.com/HaikuArchives/TrackerGrep.git#001a0b68be" +REVISION="2" COPYRIGHT=" 1998-2006 Matthijs Hollemans 2007 Jonas Sundström." - LICENSE="MIT" -ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" +ARCHITECTURES="x86_gcc2 x86 ?x86_64" PROVIDES=" TrackerGrep = $portVersion - app:TrackerGrep = $portVersion" + app:TrackerGrep = $portVersion + " REQUIRES=" - haiku >= $haikuVersion" + haiku >= $haikuVersion + " + +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion cmd:gcc - cmd:xres" + cmd:xres + " + +PATCHES="trackergrep-5.1.patchset" BUILD() { cd source - g++ -o TrackerGrep GrepApp.cpp GrepWindow.cpp Model.cpp TrackerGrep.cpp Grepper.cpp GrepListView.cpp -lbe -ltracker -ltextencoding + g++ -o TrackerGrep GrepApp.cpp GrepWindow.cpp Model.cpp \ + TrackerGrep.cpp Grepper.cpp GrepListView.cpp -fpermissive \ + -lbe -ltracker -ltextencoding xres -o TrackerGrep TrackerGrep.rsrc + mimeset -f TrackerGrep } INSTALL() { cd source - mkdir -p $appsDir - cp TrackerGrep $appsDir + mkdir -p $addOnsDir/Tracker + cp TrackerGrep $addOnsDir/Tracker addAppDeskbarSymlink $appsDir/TrackerGrep } diff --git a/haiku-apps/ubertuber/patches/ubertuber-0.9.7.patchset b/haiku-apps/ubertuber/patches/ubertuber-0.9.7.patchset new file mode 100644 index 000000000..ea63fb80c --- /dev/null +++ b/haiku-apps/ubertuber/patches/ubertuber-0.9.7.patchset @@ -0,0 +1,22 @@ +From bc2604eee4490c94747cbfb268e9a6cdf72d2052 Mon Sep 17 00:00:00 2001 +From: Chris Roberts +Date: Mon, 2 Dec 2013 20:33:29 -0700 +Subject: Misc fixes for gcc4 + + +diff --git a/Makefile b/Makefile +index 8b2ae37..9af3924 100644 +--- a/Makefile ++++ b/Makefile +@@ -2,7 +2,7 @@ NAME= UberTuber + TYPE= APP + SRCS= App.cpp MainWindow.cpp Settings.cpp + RDEFS= UberTuber.rdef +-LIBS= /boot/system/lib/libroot.so /boot/system/lib/libbe.so /boot/system/lib/libtracker.so ++LIBS= be tracker $(STDCPPLIBS) + LIBPATHS= + SYSTEM_INCLUDE_PATHS= $(BUILDHOME)/headers/be $(BUILDHOME)/headers/cpp $(BUILDHOME)/headers/posix ~/config/include + LOCAL_INCLUDE_PATHS= +-- +1.8.3.4 + diff --git a/haiku-apps/ubertuber/ubertuber-0.9.7.recipe b/haiku-apps/ubertuber/ubertuber-0.9.7.recipe index 33462ab5f..60b874083 100644 --- a/haiku-apps/ubertuber/ubertuber-0.9.7.recipe +++ b/haiku-apps/ubertuber/ubertuber-0.9.7.recipe @@ -1,25 +1,31 @@ SUMMARY="A tool to play back online videos in MediaPlayer" -DESCRIPTION="UberTuber grabs clips from various sites and opens them in your media player while they're being downloaded. - " +DESCRIPTION=" +UberTuber grabs clips from various sites and opens them in your media +player while they're being downloaded. +" HOMEPAGE="http://sourceforge.net/projects/ubertuber/" SRC_URI="git://git.code.sf.net/p/ubertuber/code#7971df0e58a145d7357261600442116321257065" LICENSE="MIT" COPYRIGHT="2013 Humdinger" -REVISION="1" -ARCHITECTURES="x86_gcc2 ?x86" +REVISION="2" +ARCHITECTURES="x86_gcc2 x86" PROVIDES=" ubertuber = $portVersion + app:ubertuber = $portVersion " + REQUIRES=" haiku >= $haikuVersion cmd:python " + BUILD_REQUIRES=" + haiku_devel >= $haikuVersion makefile_engine " + BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion cmd:gcc cmd:ld cmd:make @@ -27,11 +33,13 @@ BUILD_PREREQUIRES=" cmd:unzip cmd:xres " -SOURCE_DIR="$portVersionedName" + +PATCHES="ubertuber-0.9.7.patchset" BUILD() { - make OBJ_DIR=objects BUILDHOME=/boot/system/develop + make OBJ_DIR=objects \ + BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` } INSTALL() diff --git a/haiku-apps/waveview/waveview-1.0.recipe b/haiku-apps/waveview/waveview-1.0.recipe index 42dbc3415..58593cb72 100644 --- a/haiku-apps/waveview/waveview-1.0.recipe +++ b/haiku-apps/waveview/waveview-1.0.recipe @@ -1,16 +1,11 @@ -SUMMARY="A data acquisition Software" -DESCRIPTION="waveview" +SUMMARY="A simple audio wave viewer" +DESCRIPTION="simple audio wave viewer" HOMEPAGE="https://github.com/aldeck/waveview" -LICENSE=" - MIT - " -COPYRIGHT=" - 2011 Alexandre Deckner (alex@zappotek.com) - " - -SRC_URI="git+https://github.com/aldeck/waveview" -REVISION="1" -ARCHITECTURES="x86_gcc2" +LICENSE="MIT" +COPYRIGHT="2011 Alexandre Deckner (alex@zappotek.com)" +SRC_URI="git+https://github.com/aldeck/waveview#fce091e76a" +REVISION="2" +ARCHITECTURES="x86_gcc2 x86" PROVIDES=" waveview = $portVersion @@ -24,12 +19,12 @@ REQUIRES=" " BUILD_REQUIRES=" - devel:libpcre >= 1 - devel:libpcreposix >= 1 + haiku_devel >= $haikuVersion + devel:libpcre + devel:libpcreposix " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion makefile_engine cmd:bison cmd:flex @@ -44,20 +39,15 @@ REQUIRES=" haiku >= $haikuVersion " -SOURCE_DIR="waveview-1.0" - BUILD() { - pwd - ls /etc - make BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` + make OBJ_DIR=objects \ + BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` } INSTALL() { - waveviewDir=$appsDir/WaveView - mkdir -p $waveviewDir - cp -a objects.x86-gcc2-release/WaveView $waveviewDir - - addAppDeskbarSymlink $waveviewDir/WaveView + mkdir -p $appsDir + cp -a objects/WaveView $appsDir + addAppDeskbarSymlink $appsDir/WaveView } From 9a0dcbfa66af05536841b7e8670bf16b905e90e1 Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Tue, 3 Dec 2013 00:41:48 -0700 Subject: [PATCH 04/15] Remove some useless/outdated recipes and patches --- haiku-apps/artpaint/artpaint-339.recipe | 20 -- haiku-apps/bowser/bowser-1.1.1_cvs.recipe | 19 -- haiku-apps/caya/caya-236.recipe | 35 --- haiku-apps/caya/caya-240.recipe | 35 --- haiku-apps/caya/caya-264.recipe | 36 --- haiku-apps/caya/caya-278.recipe | 36 --- haiku-apps/caya/caya-279.recipe | 36 --- haiku-apps/caya/caya-293.recipe | 60 ----- haiku-apps/caya/patches/caya-293.patchset | 49 ---- .../caya_gpl_protocols-0.HEAD.recipe | 31 --- .../caya_gpl_protocols-19.recipe | 30 --- .../caya_gpl_protocols-24.recipe | 31 --- .../caya_gpl_protocols-35.recipe | 31 --- .../patches/caya_gpl_protocols-0.HEAD.patch | 214 ------------------ 14 files changed, 663 deletions(-) delete mode 100644 haiku-apps/artpaint/artpaint-339.recipe delete mode 100644 haiku-apps/bowser/bowser-1.1.1_cvs.recipe delete mode 100644 haiku-apps/caya/caya-236.recipe delete mode 100644 haiku-apps/caya/caya-240.recipe delete mode 100644 haiku-apps/caya/caya-264.recipe delete mode 100644 haiku-apps/caya/caya-278.recipe delete mode 100644 haiku-apps/caya/caya-279.recipe delete mode 100644 haiku-apps/caya/caya-293.recipe delete mode 100644 haiku-apps/caya/patches/caya-293.patchset delete mode 100644 haiku-apps/caya_gpl_protocols/caya_gpl_protocols-0.HEAD.recipe delete mode 100644 haiku-apps/caya_gpl_protocols/caya_gpl_protocols-19.recipe delete mode 100644 haiku-apps/caya_gpl_protocols/caya_gpl_protocols-24.recipe delete mode 100644 haiku-apps/caya_gpl_protocols/caya_gpl_protocols-35.recipe delete mode 100644 haiku-apps/caya_gpl_protocols/patches/caya_gpl_protocols-0.HEAD.patch diff --git a/haiku-apps/artpaint/artpaint-339.recipe b/haiku-apps/artpaint/artpaint-339.recipe deleted file mode 100644 index 3a80a0bdb..000000000 --- a/haiku-apps/artpaint/artpaint-339.recipe +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION="Artpaint is a painting and image processing program" -HOMEPAGE="http://dev.osdrawer.net/projects/artpaint" -SRC_URI="svn+http://svn.osdrawer.net/artpaint/trunk" -REVISION="1" -STATUS_HAIKU="broken" -DEPEND="" -#CHECKSUM_MD5="" -BUILD() -{ - echo "Need to figure out how to build this still" -} - -INSTALL() -{ - echo "Need to figure out how to install this still" -} - -LICENSE="MIT" -COPYRIGHT="2003, Heikki Suhonen - 2008-2009 ArtPaint Maintainers" diff --git a/haiku-apps/bowser/bowser-1.1.1_cvs.recipe b/haiku-apps/bowser/bowser-1.1.1_cvs.recipe deleted file mode 100644 index 4a127a126..000000000 --- a/haiku-apps/bowser/bowser-1.1.1_cvs.recipe +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION="bowser" -HOMEPAGE="http://bowser.sourceforge.net" -SRC_URI="cvs://:pserver:anonymous@bowser.cvs.sourceforge.net:/cvsroot/bowser/Bowser" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" - -BUILD() -{ - true -} - -INSTALL() -{ - true -} - -#COPYRIGHT="" -#LICENSE=" diff --git a/haiku-apps/caya/caya-236.recipe b/haiku-apps/caya/caya-236.recipe deleted file mode 100644 index adb7367fc..000000000 --- a/haiku-apps/caya/caya-236.recipe +++ /dev/null @@ -1,35 +0,0 @@ -DESCRIPTION="Caya is a multiprotocol IM client." -HOMEPAGE="http://dev.osdrawer.net/projects/caya" -SRC_URI="svn+http://svn.osdrawer.net/caya/trunk#236" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="net-misc/curl >= 7.21.6" -#CHECKSUM_MD5="" -MESSAGE="This port only builds with gcc4." -BUILD() -{ - cd caya-236 - ./configure - jam -} - -INSTALL() -{ - cd caya-236 - mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya - mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/smileys - mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols - mkdir -p ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/ - - cp generated/distro-haiku-x86-gcc4-debug/Caya ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya - cp generated/distro-haiku-x86-gcc4-debug/aim ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols - cp smileys/*.gif smileys/settings.xml ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/smileys - cp application/CayaProtocol.h ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/ - cp application/CayaConstants.h ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/ - cp application/CayaProtocolMessages.h ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/ -} - -LICENSE="MIT" -COPYRIGHT="2009-2011 Andrea Anzani - 2009-2011 Pierluigi Fiorini - 2010-2011 Oliver Ruiz Dorantes" diff --git a/haiku-apps/caya/caya-240.recipe b/haiku-apps/caya/caya-240.recipe deleted file mode 100644 index 78f0e79d5..000000000 --- a/haiku-apps/caya/caya-240.recipe +++ /dev/null @@ -1,35 +0,0 @@ -DESCRIPTION="Caya is a multiprotocol IM client." -HOMEPAGE="http://dev.osdrawer.net/projects/caya" -SRC_URI="svn+http://svn.osdrawer.net/caya/trunk#240" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="net-misc/curl >= 7.21.6" -#CHECKSUM_MD5="" -MESSAGE="This port only builds with gcc4." -BUILD() -{ - cd caya-240 - ./configure - jam -} - -INSTALL() -{ - cd caya-240 - mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya - mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/smileys - mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols - mkdir -p ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/ - - cp generated/distro-haiku-x86-gcc4-debug/Caya ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya - cp generated/distro-haiku-x86-gcc4-debug/aim ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols - cp smileys/*.gif smileys/settings.xml ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/smileys - cp application/CayaProtocol.h ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/ - cp application/CayaConstants.h ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/ - cp application/CayaProtocolMessages.h ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/ -} - -LICENSE="MIT" -COPYRIGHT="2009-2011 Andrea Anzani - 2009-2011 Pierluigi Fiorini - 2010-2011 Oliver Ruiz Dorantes" diff --git a/haiku-apps/caya/caya-264.recipe b/haiku-apps/caya/caya-264.recipe deleted file mode 100644 index c7a92ce6d..000000000 --- a/haiku-apps/caya/caya-264.recipe +++ /dev/null @@ -1,36 +0,0 @@ -DESCRIPTION="Caya is a multiprotocol IM client." -HOMEPAGE="http://dev.osdrawer.net/projects/caya" -SRC_URI="svn+http://svn.osdrawer.net/caya/trunk#264" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-libs/expat >= 2.0.1" -#CHECKSUM_MD5="" -MESSAGE="This port only builds with gcc4." -BUILD() -{ - cd caya-264 - ./configure - jam -} - -INSTALL() -{ - cd caya-264 - mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya - mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/smileys - mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols - mkdir -p ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/ - - cp generated/distro-haiku-x86-gcc4-debug/Caya ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya - cp generated/distro-haiku-x86-gcc4-debug/aim ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols - cp smileys/*.gif smileys/settings.xml ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/smileys - cp application/CayaProtocol.h ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/ - cp application/CayaConstants.h ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/ - cp application/CayaProtocolMessages.h ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/ -} - -LICENSE="MIT" -COPYRIGHT="2009-2011 Andrea Anzani - 2009-2011 Pierluigi Fiorini - 2010-2011 Oliver Ruiz Dorantes - 2011-2012 Casalinuovo Dario" diff --git a/haiku-apps/caya/caya-278.recipe b/haiku-apps/caya/caya-278.recipe deleted file mode 100644 index ced844436..000000000 --- a/haiku-apps/caya/caya-278.recipe +++ /dev/null @@ -1,36 +0,0 @@ -DESCRIPTION="Caya is a multiprotocol IM client." -HOMEPAGE="http://dev.osdrawer.net/projects/caya" -SRC_URI="svn+http://svn.osdrawer.net/caya/trunk#278" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-libs/expat >= 2.0.1" -#CHECKSUM_MD5="" -MESSAGE="This port only builds with gcc4." -BUILD() -{ - cd caya-278 - ./configure - jam -} - -INSTALL() -{ - cd caya-278 - mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya - mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/smileys - mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols - mkdir -p ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/ - - cp generated/distro-haiku-x86-gcc4-debug/Caya ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya - cp generated/distro-haiku-x86-gcc4-debug/aim ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols - cp smileys/*.gif smileys/settings.xml ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/smileys - cp application/CayaProtocol.h ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/ - cp application/CayaConstants.h ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/ - cp application/CayaProtocolMessages.h ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/ -} - -LICENSE="MIT" -COPYRIGHT="2009-2011 Andrea Anzani - 2009-2011 Pierluigi Fiorini - 2010-2011 Oliver Ruiz Dorantes - 2011-2012 Casalinuovo Dario" diff --git a/haiku-apps/caya/caya-279.recipe b/haiku-apps/caya/caya-279.recipe deleted file mode 100644 index 87fce694e..000000000 --- a/haiku-apps/caya/caya-279.recipe +++ /dev/null @@ -1,36 +0,0 @@ -DESCRIPTION="Caya is a multiprotocol IM client." -HOMEPAGE="http://dev.osdrawer.net/projects/caya" -SRC_URI="svn+http://svn.osdrawer.net/caya/trunk#279" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-libs/expat >= 2.0.1" -#CHECKSUM_MD5="" -MESSAGE="This port only builds with gcc4." -BUILD() -{ - cd caya-279 - ./configure - jam -} - -INSTALL() -{ - cd caya-279 - mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya - mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/smileys - mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols - mkdir -p ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/ - - cp generated/distro-haiku-x86-gcc4-debug/Caya ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya - cp generated/distro-haiku-x86-gcc4-debug/aim ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols - cp smileys/*.gif smileys/settings.xml ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/smileys - cp application/CayaProtocol.h ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/ - cp application/CayaConstants.h ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/ - cp application/CayaProtocolMessages.h ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/ -} - -LICENSE="MIT" -COPYRIGHT="2009-2011 Andrea Anzani - 2009-2011 Pierluigi Fiorini - 2010-2011 Oliver Ruiz Dorantes - 2011-2012 Casalinuovo Dario" diff --git a/haiku-apps/caya/caya-293.recipe b/haiku-apps/caya/caya-293.recipe deleted file mode 100644 index fbf25e70e..000000000 --- a/haiku-apps/caya/caya-293.recipe +++ /dev/null @@ -1,60 +0,0 @@ -SUMMARY="Caya is a multiprotocol IM client." -HOMEPAGE="http://dev.osdrawer.net/projects/caya" -SRC_URI="svn+http://svn.osdrawer.net/caya/trunk#293" -REVISION="2" -ARCHITECTURES="x86 x86_gcc2" - -PROVIDES=" - caya = $portVersion - lib:libexpat - " - -REQUIRES=" - haiku >= $haikuVersion - " -BUILD_REQUIRES=" - devel:libexpat - " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - cmd:gcc - cmd:ld - cmd:jam - cmd:which - " - -BUILD() -{ - mkdir -p $sourceDir/generated/objects-haiku-x86-gcc2-debug/application - echo $portVersion > $sourceDir/generated/objects-haiku-x86-gcc2-debug/application/svn_revision - ./configure - jam -} - -INSTALL() -{ - mkdir -p $appsDir/Caya - mkdir -p $appsDir/Caya/smileys - mkdir -p $appsDir/Caya/protocols - mkdir -p $includeDir/caya/ - - cp generated/distro-haiku-*-debug/Caya $appsDir/Caya - cp generated/distro-haiku-*-debug/aim $appsDir/Caya/protocols - cp smileys/*.gif smileys/settings.xml $appsDir/Caya/smileys - cp application/Caya.h $includeDir/caya/ - cp application/CayaProtocol.h $includeDir/caya/ - cp application/CayaConstants.h $includeDir/caya/ - cp application/CayaProtocolMessages.h $includeDir/caya/ -} - -LICENSE="MIT" -COPYRIGHT=" - 2009-2011 Andrea Anzani - 2009-2011 Pierluigi Fiorini - 2010-2011 Oliver Ruiz Dorantes - 2011-2012 Casalinuovo Dario - " -DESCRIPTION=" - Caya is a multiprotocol chat client for Haiku. It supports msn, aim, jabber, - google talk, and facebook. - " diff --git a/haiku-apps/caya/patches/caya-293.patchset b/haiku-apps/caya/patches/caya-293.patchset deleted file mode 100644 index 05202ecd3..000000000 --- a/haiku-apps/caya/patches/caya-293.patchset +++ /dev/null @@ -1,49 +0,0 @@ -From abd4aac88a07ea0a9967be553833a121bf98ccf9 Mon Sep 17 00:00:00 2001 -From: Adrien Destugues -Date: Sat, 5 Oct 2013 13:17:26 +0200 -Subject: Fix gcc4 detection - - -diff --git a/build/jam/CheckRules b/build/jam/CheckRules -index 6fbc213..294fab7 100644 ---- a/build/jam/CheckRules -+++ b/build/jam/CheckRules -@@ -14,7 +14,7 @@ rule CheckGccPlatform - # /boot/develop/lib/x86 to judge whether this is a BeOS compatible and thus - # gcc 2 platform. This is not entirely correct, but should be good enough - # for the time being. -- local haveLibStdC++.R4 = [ Glob /boot/develop/lib/x86 : libstdc++.r4.so ] ; -+ local haveLibStdC++.R4 = [ Glob /boot/system/develop/tools/lib : libstdc++.r4.so ] ; - if ! $(haveLibStdC++.R4) { - IS_GCC4_PLATFORM = 1 ; - Echo Using GCC4 platform ; --- -1.8.3.4 - - -From db90c28cb36b59a010abec5406f77c1c4135f378 Mon Sep 17 00:00:00 2001 -From: Adrien Destugues -Date: Sat, 5 Oct 2013 13:19:23 +0200 -Subject: Let haikuporter compute the version - - * The .svn dir isn't available in the chroot, so there is no way it can -be used to detect the SVN revision. - -diff --git a/build/jam/MainBuildRules b/build/jam/MainBuildRules -index 292a2a5..314c4d7 100644 ---- a/build/jam/MainBuildRules -+++ b/build/jam/MainBuildRules -@@ -368,9 +368,7 @@ rule CreateSVNRevisionFile file - { - # CreateSVNRevisionFile - -- local svnEntries = entries ; -- SEARCH on $(svnEntries) = [ FDirName $(TOP) .svn ] ; -- Depends $(file) : $(svnEntries) ; -+ # Let haikuporter do it as the .svn dir is removed on checkout - } - - actions CreateSVNRevisionFile --- -1.8.3.4 - diff --git a/haiku-apps/caya_gpl_protocols/caya_gpl_protocols-0.HEAD.recipe b/haiku-apps/caya_gpl_protocols/caya_gpl_protocols-0.HEAD.recipe deleted file mode 100644 index 225624b42..000000000 --- a/haiku-apps/caya_gpl_protocols/caya_gpl_protocols-0.HEAD.recipe +++ /dev/null @@ -1,31 +0,0 @@ -DESCRIPTION="GPL Plugins for Caya, protocols MSN and XMPP" -HOMEPAGE="http://dev.osdrawer.net/projects/caya-gpl-protocols" -SRC_URI="svn+http://svn.osdrawer.net/caya-gpl-protocols/trunk" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="caya" -#CHECKSUM_MD5="" -BUILD() -{ - cd caya-gpl-protocols-0.HEAD - ./configure - jam -} - -INSTALL() -{ - cd caya-gpl-protocols-0.HEAD - mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols - PLATFORM=`setgcc|tr / -|cut -f3 -d' '` - cp generated/distro-haiku-$PLATFORM-debug/msn ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols - cp generated/distro-haiku-$PLATFORM-debug/gtalk ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols - cp generated/distro-haiku-$PLATFORM-debug/facebook ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols - cp generated/distro-haiku-$PLATFORM-debug/jabber ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols - cp generated/distro-haiku-$PLATFORM-debug/yahoo ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols -} - -LICENSE="GNU GPL v2" -COPYRIGHT="2010-2011 Casalinuovo Dario - 2009-2011 Pierluigi Fiorini - 2010-2011 Oliver Ruiz Dorantes" - diff --git a/haiku-apps/caya_gpl_protocols/caya_gpl_protocols-19.recipe b/haiku-apps/caya_gpl_protocols/caya_gpl_protocols-19.recipe deleted file mode 100644 index 93816baed..000000000 --- a/haiku-apps/caya_gpl_protocols/caya_gpl_protocols-19.recipe +++ /dev/null @@ -1,30 +0,0 @@ -DESCRIPTION="GPL Plugins for Caya, protocols MSN and XMPP" -HOMEPAGE="http://dev.osdrawer.net/projects/caya-gpl-protocols" -SRC_URI="svn+http://svn.osdrawer.net/caya-gpl-protocols/trunk#19" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="caya" -#CHECKSUM_MD5="" -MESSAGE="This port only builds with gcc4." -BUILD() -{ - cd caya-gpl-protocols-19 - ./configure - jam -} - -INSTALL() -{ - cd caya-gpl-protocols-19 - mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols - cp generated/distro-haiku-x86-gcc4-debug/msn ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols - cp generated/distro-haiku-x86-gcc4-debug/gtalk ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols - cp generated/distro-haiku-x86-gcc4-debug/facebook ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols - cp generated/distro-haiku-x86-gcc4-debug/jabber ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols -} - -LICENSE="GNU GPL v2" -COPYRIGHT="2010-2011 Casalinuovo Dario - 2009-2011 Pierluigi Fiorini - 2010-2011 Oliver Ruiz Dorantes" - diff --git a/haiku-apps/caya_gpl_protocols/caya_gpl_protocols-24.recipe b/haiku-apps/caya_gpl_protocols/caya_gpl_protocols-24.recipe deleted file mode 100644 index e6c00dd27..000000000 --- a/haiku-apps/caya_gpl_protocols/caya_gpl_protocols-24.recipe +++ /dev/null @@ -1,31 +0,0 @@ -DESCRIPTION="GPL Plugins for Caya, protocols MSN and XMPP" -HOMEPAGE="http://dev.osdrawer.net/projects/caya-gpl-protocols" -SRC_URI="svn+http://svn.osdrawer.net/caya-gpl-protocols/trunk#24" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="caya" -#CHECKSUM_MD5="" -MESSAGE="This port only builds with gcc4." -BUILD() -{ - cd caya-gpl-protocols-24 - ./configure - jam -} - -INSTALL() -{ - cd caya-gpl-protocols-24 - mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols - cp generated/distro-haiku-x86-gcc4-debug/msn ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols - cp generated/distro-haiku-x86-gcc4-debug/gtalk ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols - cp generated/distro-haiku-x86-gcc4-debug/facebook ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols - cp generated/distro-haiku-x86-gcc4-debug/jabber ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols - cp generated/distro-haiku-x86-gcc4-debug/yahoo ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols -} - -LICENSE="GNU GPL v2" -COPYRIGHT="2010-2011 Casalinuovo Dario - 2009-2011 Pierluigi Fiorini - 2010-2011 Oliver Ruiz Dorantes" - diff --git a/haiku-apps/caya_gpl_protocols/caya_gpl_protocols-35.recipe b/haiku-apps/caya_gpl_protocols/caya_gpl_protocols-35.recipe deleted file mode 100644 index f6df24bd5..000000000 --- a/haiku-apps/caya_gpl_protocols/caya_gpl_protocols-35.recipe +++ /dev/null @@ -1,31 +0,0 @@ -DESCRIPTION="GPL Plugins for Caya, protocols MSN and XMPP" -HOMEPAGE="http://dev.osdrawer.net/projects/caya-gpl-protocols" -SRC_URI="svn+http://svn.osdrawer.net/caya-gpl-protocols/trunk#35" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="caya" -#CHECKSUM_MD5="" -MESSAGE="This port only builds with gcc4." -BUILD() -{ - cd caya-gpl-protocols-35 - ./configure - jam -} - -INSTALL() -{ - cd caya-gpl-protocols-35 - mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols - cp generated/distro-haiku-x86-gcc4-debug/msn ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols - cp generated/distro-haiku-x86-gcc4-debug/gtalk ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols - cp generated/distro-haiku-x86-gcc4-debug/facebook ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols - cp generated/distro-haiku-x86-gcc4-debug/jabber ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols - cp generated/distro-haiku-x86-gcc4-debug/yahoo ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols -} - -LICENSE="GNU GPL v2" -COPYRIGHT="2010-2011 Casalinuovo Dario - 2009-2011 Pierluigi Fiorini - 2010-2011 Oliver Ruiz Dorantes" - diff --git a/haiku-apps/caya_gpl_protocols/patches/caya_gpl_protocols-0.HEAD.patch b/haiku-apps/caya_gpl_protocols/patches/caya_gpl_protocols-0.HEAD.patch deleted file mode 100644 index a45bd230b..000000000 --- a/haiku-apps/caya_gpl_protocols/patches/caya_gpl_protocols-0.HEAD.patch +++ /dev/null @@ -1,214 +0,0 @@ -Index: libs/libmsn/msnobject.cpp -=================================================================== ---- libs/libmsn/msnobject.cpp (revision 36) -+++ libs/libmsn/msnobject.cpp (working copy) -@@ -30,7 +30,7 @@ - { - void MSNObject::addMSNObject(std::string filename, int Type) - { -- std::ifstream::pos_type size; -+ std::streampos size; - char * memblock; - SHA_CTX ctx; - unsigned char digest[SHA_DIGEST_LENGTH]; -Index: libs/libmsn/Jamfile -=================================================================== ---- libs/libmsn/Jamfile (revision 36) -+++ libs/libmsn/Jamfile (working copy) -@@ -2,6 +2,7 @@ - - SubDirSysHdrs [ FDirName $(TOP) ] ; - SubDirSysHdrs [ FDirName $(TOP) libs ] ; -+SubDirSysHdrs [ FDirName $(TOP) libs libmsn ] ; - - SubDirSysHdrs [ FDirName $(OPENSSL_INCLUDE_DIR) ] ; - -Index: libs/libmsn/connection.h -=================================================================== ---- libs/libmsn/connection.h (revision 36) -+++ libs/libmsn/connection.h (working copy) -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include - - #ifdef _MSC_VER - #pragma warning( disable : 4290 ) -Index: libs/libmsn/util.cpp -=================================================================== ---- libs/libmsn/util.cpp (revision 36) -+++ libs/libmsn/util.cpp (working copy) -@@ -146,8 +146,8 @@ - it1 != s1.end() && it2 != s2.end(); - ++it1, ++it2) - { -- if (std::toupper(*it1) != std::toupper(*it2)) -- return std::toupper(*it1) - std::toupper(*it2); -+ if (toupper(*it1) != toupper(*it2)) -+ return toupper(*it1) - toupper(*it2); - } - size_t size1 = s1.size(), size2 = s2.size(); - return (int) (size1 - size2); -@@ -358,11 +358,11 @@ - int FileSize(const char* sFileName) - { - std::ifstream f; -- f.open(sFileName, std::ios_base::binary | std::ios_base::in); -+ f.open(sFileName, std::ios::binary | std::ios::in); - if (!f.good() || f.eof() || !f.is_open()) { return 0; } -- f.seekg(0, std::ios_base::beg); -- std::ifstream::pos_type begin_pos = f.tellg(); -- f.seekg(0, std::ios_base::end); -+ f.seekg(0, std::ios::beg); -+ std::streampos begin_pos = f.tellg(); -+ f.seekg(0, std::ios::end); - return static_cast(f.tellg() - begin_pos); - } - -Index: libs/libmsn/message.cpp -=================================================================== ---- libs/libmsn/message.cpp (revision 36) -+++ libs/libmsn/message.cpp (working copy) -@@ -124,7 +124,7 @@ - { - std::string color = this->getFormatInfo()["CO"]; - assert(color.size() <= 6 && color.size() >= 0); -- color.insert(0U, 6 - color.size(), '0'); -+ color.insert((size_t)0, (size_t)(6 - color.size()), '0'); - int r = 0, g = 0, b = 0; - - b = strtol(color.substr(0, 2).c_str(), NULL, 16); -@@ -167,7 +167,7 @@ - - void Message::setColor(std::string color) - { -- color.insert(0U, 6 - color.size(), '0'); -+ color.insert((size_t)0, (size_t)(6 - color.size()), '0'); - int r = 0, g = 0, b = 0; - - r = strtol(color.substr(0, 2).c_str(), NULL, 16); -Index: libs/libyahoo2/yahoo_httplib.c -=================================================================== ---- libs/libyahoo2/yahoo_httplib.c (revision 36) -+++ libs/libyahoo2/yahoo_httplib.c (working copy) -@@ -29,19 +29,7 @@ - #include - #include - --#if STDC_HEADERS - # include --#else --# if !HAVE_STRCHR --# define strchr index --# define strrchr rindex --# endif --char *strchr(), *strrchr(); --# if !HAVE_MEMCPY --# define memcpy(d, s, n) bcopy ((s), (d), (n)) --# define memmove(d, s, n) bcopy ((s), (d), (n)) --# endif --#endif - - #include - #if HAVE_UNISTD_H -@@ -374,7 +362,6 @@ - void yahoo_http_head(int id, const char *url, const char *cookies, int len, - char *payload, yahoo_get_fd_callback callback, void *data) - { -- printf("yahoo_http_read\n"); - char host[255]; - int port = 80; - char path[255]; -Index: libs/libgloox/parser.cpp -=================================================================== ---- libs/libgloox/parser.cpp (revision 36) -+++ libs/libgloox/parser.cpp (working copy) -@@ -141,7 +141,7 @@ - { - if( pos + needle.length() <= data.length() ) - { -- if( !data.compare( pos, needle.length(), needle ) ) -+ if( !data.compare(pos, needle.length(), needle ) ) - { - pos += needle.length() - 1; - return ForwardFound; -Index: libs/libgloox/siprofileft.cpp -=================================================================== ---- libs/libgloox/siprofileft.cpp (revision 36) -+++ libs/libgloox/siprofileft.cpp (working copy) -@@ -84,11 +84,11 @@ - DataFormField* dff = df.addField( DataFormField::TypeListSingle, "stream-method" ); - StringMultiMap sm; - if( streamTypes & FTTypeS5B ) -- sm.insert( std::make_pair( "s5b", XMLNS_BYTESTREAMS ) ); -+ sm.insert( std::make_pair( "s5b", XMLNS_BYTESTREAMS ) ); - if( streamTypes & FTTypeIBB ) -- sm.insert( std::make_pair( "ibb", XMLNS_IBB ) ); -+ sm.insert( std::make_pair( "ibb", XMLNS_IBB ) ); - if( streamTypes & FTTypeOOB ) -- sm.insert( std::make_pair( "oob", XMLNS_IQ_OOB ) ); -+ sm.insert( std::make_pair( "oob", XMLNS_IQ_OOB ) ); - dff->setOptions( sm ); - feature->addChild( df.tag() ); - -Index: libs/libgloox/connectionbosh.cpp -=================================================================== ---- libs/libgloox/connectionbosh.cpp (revision 36) -+++ libs/libgloox/connectionbosh.cpp (working copy) -@@ -303,7 +303,7 @@ - - bool ci_equal( char ch1, char ch2 ) - { -- return std::toupper( (unsigned char)ch1 ) == std::toupper( (unsigned char)ch2 ); -+ return toupper( (unsigned char)ch1 ) == toupper( (unsigned char)ch2 ); - } - - std::string::size_type ci_find( const std::string& str1, const std::string& str2 ) -Index: libs/libgloox/gloox.h -=================================================================== ---- libs/libgloox/gloox.h (revision 36) -+++ libs/libgloox/gloox.h (working copy) -@@ -1214,7 +1214,7 @@ - /** - * A multimap of strings. - */ -- typedef std::multimap StringMultiMap; -+ typedef std::multimap StringMultiMap; - - class StanzaExtension; - /** -Index: protocols/msn/MSN.cpp -=================================================================== ---- protocols/msn/MSN.cpp (revision 36) -+++ protocols/msn/MSN.cpp (working copy) -@@ -52,7 +52,7 @@ - const uint32 kAvatarCheckMessage = 'AVMs'; - - struct pollfd* kPollSockets = NULL; --struct ssl { -+struct Ssl { - bool isSSL; - bool isConnected; - SSL *ssl; -@@ -718,7 +718,7 @@ - return; - } - -- kSocketsSsl = (struct ssl*) realloc(kSocketsSsl, (kSocketsAvailable + 10) * sizeof(struct ssl)); -+ kSocketsSsl = (struct Ssl*) realloc(kSocketsSsl, (kSocketsAvailable + 10) * sizeof(struct Ssl)); - if (kSocketsSsl == NULL) { - Error("Memory Error!!\n", NULL); - return; -Index: protocols/xmpp/Jamfile -=================================================================== ---- protocols/xmpp/Jamfile (revision 36) -+++ protocols/xmpp/Jamfile (working copy) -@@ -2,6 +2,7 @@ - - SubDirSysHdrs [ FDirName $(TOP) ] ; - SubDirSysHdrs [ FDirName $(TOP) libs ] ; -+SubDirSysHdrs [ FDirName $(TOP) libs libgloox ] ; - SubDirSysHdrs [ FDirName $(OPENSSL_INCLUDE_DIR) ] ; - SubDirSysHdrs [ FDirName $(CAYA_INCLUDE_DIR) ] ; - From e4dcc46191a94fbd21f19de8dea80fd70a346947 Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Tue, 3 Dec 2013 00:42:21 -0700 Subject: [PATCH 05/15] Move keepassx binary from $binDir to $appsDir --- app-admin/keepassx/keepassx-2.0a4.git.recipe | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app-admin/keepassx/keepassx-2.0a4.git.recipe b/app-admin/keepassx/keepassx-2.0a4.git.recipe index 736ea893b..1cd686d36 100644 --- a/app-admin/keepassx/keepassx-2.0a4.git.recipe +++ b/app-admin/keepassx/keepassx-2.0a4.git.recipe @@ -30,12 +30,12 @@ COPYRIGHT=" " LICENSE="GNU GPL v2" -REVISION="1" +REVISION="2" ARCHITECTURES="x86" PROVIDES=" keepassx = $portVersion - cmd:keepassx = $portVersion + app:keepassx = $portVersion " REQUIRES=" @@ -83,6 +83,7 @@ BUILD() INSTALL() { make install - - addAppDeskbarSymlink $binDir/keepassx KeePassX + mkdir -p $appsDir + mv $binDir/keepassx $appsDir/KeePassX + addAppDeskbarSymlink $appsDir/KeePassX KeePassX } From fa3736107a746b349f93e0b4d84c25fe1dd964a7 Mon Sep 17 00:00:00 2001 From: "Arfonzo J. Coward" Date: Mon, 2 Dec 2013 19:12:11 +0000 Subject: [PATCH 06/15] Initial work on quassel-0.9.2 recipe. --- net-irc/quassel/quassel-0.9.2.recipe | 60 ++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 net-irc/quassel/quassel-0.9.2.recipe diff --git a/net-irc/quassel/quassel-0.9.2.recipe b/net-irc/quassel/quassel-0.9.2.recipe new file mode 100644 index 000000000..fdd236a0e --- /dev/null +++ b/net-irc/quassel/quassel-0.9.2.recipe @@ -0,0 +1,60 @@ +SUMMARY="Quassel IRC." +DESCRIPTION="Quassel IRC core and client." +HOMEPAGE="http://quassel-irc.org" +SRC_URI="http://quassel-irc.org/pub/quassel-0.9.2.tar.bz2" +CHECKSUM_MD5="4ed88d288f60290f4459d3e68d61b037" +REVISION="1" +LICENSE=" + GNU GPL v2 + GNU GPL v3 + " +COPYRIGHT="Copyright (C) 2005, 2006, 2007, 2008, 2009 by the Quassel IRC Team" + +ARCHITECTURES="x86 x86_gcc2" +SECONDARY_ARCHITECTURES="x86" + +PROVIDES=" + quassel = $portVersion + " + +REQUIRES=" + haiku >= $haikuVersion + qtcore${secondaryArchSuffix} >= 4.8 + " + +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + pkgconfig + qtcore${secondaryArchSuffix}_devel >= 4.8 + + cmd:cmake + cmd:gcc + cmd:g++ + cmd:gcc${secondaryArchSuffix} + cmd:g++${secondaryArchSuffix} + cmd:make + " + +#PATCHES=" +# " + +BUILD() +{ + echo "=========================" + echo "TODO: Building quassel..." + + pushd . + mkdir -p build + cd build + cmake `popd` + make + + cd `popd` +} + +INSTALL() +{ + echo "===========================" + echo "TODO: Installing quassel..." + #make install +} From d23305991c9f1108f019150cb6ea59acb320d031 Mon Sep 17 00:00:00 2001 From: "Arfonzo J. Coward" Date: Mon, 2 Dec 2013 23:47:56 +0000 Subject: [PATCH 07/15] Updated quassel recipe. Now builds on hrev46464 on gcc2h. Installs to $appDir/Quassel. --- net-irc/quassel/quassel-0.9.2.recipe | 60 ++++++++++++++++------------ 1 file changed, 35 insertions(+), 25 deletions(-) diff --git a/net-irc/quassel/quassel-0.9.2.recipe b/net-irc/quassel/quassel-0.9.2.recipe index fdd236a0e..5ce0db1f8 100644 --- a/net-irc/quassel/quassel-0.9.2.recipe +++ b/net-irc/quassel/quassel-0.9.2.recipe @@ -14,47 +14,57 @@ ARCHITECTURES="x86 x86_gcc2" SECONDARY_ARCHITECTURES="x86" PROVIDES=" - quassel = $portVersion + quassel${secondaryArchSuffix} = $portVersion + cmd:quassel${secondaryArchSuffix} + cmd:quasselcore${secondaryArchSuffix} + cmd:quasselclient${secondaryArchSuffix} " REQUIRES=" - haiku >= $haikuVersion + haiku${secondaryArchSuffix} >= $haikuVersion qtcore${secondaryArchSuffix} >= 4.8 " + +BUILD_PREREQUIRES=" + cmd:cmake + cmd:gcc${secondaryArchSuffix} + cmd:g++${secondaryArchSuffix} + cmd:make + " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion - pkgconfig - qtcore${secondaryArchSuffix}_devel >= 4.8 - - cmd:cmake - cmd:gcc - cmd:g++ - cmd:gcc${secondaryArchSuffix} - cmd:g++${secondaryArchSuffix} - cmd:make + haiku${secondaryArchSuffix}_devel >= $haikuVersion + qtcore${secondaryArchSuffix}_devel >= 4.8 + cmd:pkg_config " - -#PATCHES=" -# " BUILD() -{ - echo "=========================" - echo "TODO: Building quassel..." - +{ pushd . mkdir -p build cd build - cmake `popd` - make - + cmake -DCMAKE_INSTALL_PREFIX=$prefix -DCMAKE_C_COMPILER="gcc" -DCMAKE_CXX_COMPILER="g++" `popd` + make cd `popd` } INSTALL() { - echo "===========================" - echo "TODO: Installing quassel..." - #make install + pushd . + cd build + # Optional: strip the binaries before installing. + echo "Stripping binaries ..." + strip quassel + strip quasselcore + strip quasselclient + + + echo "DEBUG: apps dir: ${appsDir}" + echo "Copying binaries to ${appsDir} ..." + mkdir -p ${appsDir}/Quassel + cp quassel ${appsDir}/Quassel + cp quasselcore ${appsDir}/Quassel + cp quasselclient ${appsDir}/Quassel + + cd `popd` } From aba3601bd408e6707aceb5bef59301f5e7623855 Mon Sep 17 00:00:00 2001 From: "Arfonzo J. Coward" Date: Tue, 3 Dec 2013 08:25:41 +0000 Subject: [PATCH 08/15] Cleaned up quassel recipe based on feedback. --- net-irc/quassel/quassel-0.9.2.recipe | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/net-irc/quassel/quassel-0.9.2.recipe b/net-irc/quassel/quassel-0.9.2.recipe index 5ce0db1f8..6908aea09 100644 --- a/net-irc/quassel/quassel-0.9.2.recipe +++ b/net-irc/quassel/quassel-0.9.2.recipe @@ -40,31 +40,26 @@ BUILD_REQUIRES=" BUILD() { - pushd . mkdir -p build - cd build + pushd build cmake -DCMAKE_INSTALL_PREFIX=$prefix -DCMAKE_C_COMPILER="gcc" -DCMAKE_CXX_COMPILER="g++" `popd` make - cd `popd` + popd } INSTALL() { - pushd . - cd build + cd build + # Optional: strip the binaries before installing. echo "Stripping binaries ..." strip quassel strip quasselcore strip quasselclient - - echo "DEBUG: apps dir: ${appsDir}" echo "Copying binaries to ${appsDir} ..." mkdir -p ${appsDir}/Quassel cp quassel ${appsDir}/Quassel cp quasselcore ${appsDir}/Quassel cp quasselclient ${appsDir}/Quassel - - cd `popd` } From 6490a5f66a2e61731be707595eeacbff60f59d60 Mon Sep 17 00:00:00 2001 From: "Arfonzo J. Coward" Date: Tue, 3 Dec 2013 09:13:55 +0000 Subject: [PATCH 09/15] Quassel recipe updates based on feedback: - Modified description. - Modified copyright. - Only support gcc2 if we're building for a different architecture. - Removed unnecessary BUILD_PREREQUIRES entry for gcc. - Added note regarding stripped binaries for future reference. --- net-irc/quassel/quassel-0.9.2.recipe | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/net-irc/quassel/quassel-0.9.2.recipe b/net-irc/quassel/quassel-0.9.2.recipe index 6908aea09..ce00b742b 100644 --- a/net-irc/quassel/quassel-0.9.2.recipe +++ b/net-irc/quassel/quassel-0.9.2.recipe @@ -1,5 +1,15 @@ SUMMARY="Quassel IRC." -DESCRIPTION="Quassel IRC core and client." +DESCRIPTION=" +Quassel IRC is a modern, cross-platform, distributed IRC client, +meaning that one (or multiple) client(s) can attach to and detach +from a central core -- much like the popular combination of screen +and a text-based IRC client such as WeeChat, but graphical. In +addition to this unique feature, we aim to bring a pleasurable, +comfortable chatting experience to all major platforms (including +Linux, Windows, and MacOS X as well as Android smartphones), making +communication with your peers not only convenient, but also +ubiquitous available. + " HOMEPAGE="http://quassel-irc.org" SRC_URI="http://quassel-irc.org/pub/quassel-0.9.2.tar.bz2" CHECKSUM_MD5="4ed88d288f60290f4459d3e68d61b037" @@ -8,9 +18,15 @@ LICENSE=" GNU GPL v2 GNU GPL v3 " -COPYRIGHT="Copyright (C) 2005, 2006, 2007, 2008, 2009 by the Quassel IRC Team" +COPYRIGHT="2005-2009, the Quassel IRC Team" + +ARCHITECTURES="x86" +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" +fi -ARCHITECTURES="x86 x86_gcc2" SECONDARY_ARCHITECTURES="x86" PROVIDES=" @@ -27,7 +43,6 @@ REQUIRES=" BUILD_PREREQUIRES=" cmd:cmake - cmd:gcc${secondaryArchSuffix} cmd:g++${secondaryArchSuffix} cmd:make " @@ -52,6 +67,7 @@ INSTALL() cd build # Optional: strip the binaries before installing. + # To be updated/removed whenever resources are added. echo "Stripping binaries ..." strip quassel strip quasselcore From ee1d6a11bba06c851094489f12c75ee7f52739e2 Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Tue, 3 Dec 2013 02:29:08 -0700 Subject: [PATCH 10/15] Update mercurial to 2.8.1 Changed the requires because mercurial only needs the msgfmt tool at build time. --HG-- rename : dev-vcs/mercurial/mercurial-2.8.recipe => dev-vcs/mercurial/mercurial-2.8.1.recipe rename : dev-vcs/mercurial/patches/mercurial-2.8.patch => dev-vcs/mercurial/patches/mercurial-2.8.1.patch --- ...curial-2.8.recipe => mercurial-2.8.1.recipe} | 17 +++++++++-------- ...ercurial-2.8.patch => mercurial-2.8.1.patch} | 6 +++--- 2 files changed, 12 insertions(+), 11 deletions(-) rename dev-vcs/mercurial/{mercurial-2.8.recipe => mercurial-2.8.1.recipe} (81%) rename dev-vcs/mercurial/patches/{mercurial-2.8.patch => mercurial-2.8.1.patch} (57%) diff --git a/dev-vcs/mercurial/mercurial-2.8.recipe b/dev-vcs/mercurial/mercurial-2.8.1.recipe similarity index 81% rename from dev-vcs/mercurial/mercurial-2.8.recipe rename to dev-vcs/mercurial/mercurial-2.8.1.recipe index e4fc40317..46ea1cb8c 100644 --- a/dev-vcs/mercurial/mercurial-2.8.recipe +++ b/dev-vcs/mercurial/mercurial-2.8.1.recipe @@ -3,36 +3,37 @@ DESCRIPTION="Mercurial is a free, distributed source control management tool." HOMEPAGE="http://mercurial.selenic.com/" COPYRIGHT="2005-2012 Matt Mackall et al." LICENSE="GNU GPL v2" -SRC_URI="http://mercurial.selenic.com/release/mercurial-2.8.tar.gz" -CHECKSUM_MD5="76b565f48000e9f331356ab107a5bcbb" +SRC_URI="http://mercurial.selenic.com/release/mercurial-2.8.1.tar.gz" +CHECKSUM_MD5="bede5869f9b5d09ab3269bac472495e7" REVISION="1" ARCHITECTURES="x86_gcc2 x86 x86_64" -PATCHES="mercurial-2.8.patch" +PATCHES="mercurial-2.8.1.patch" PROVIDES=" mercurial = $portVersion compat >= 2 cmd:hg = $portVersion compat >= 2 " + REQUIRES=" haiku_devel >= $haikuVersion cmd:python cmd:nano - lib:libintl " + BUILD_REQUIRES=" - " -BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion + " + +BUILD_PREREQUIRES=" cmd:python cmd:gcc cmd:gettext cmd:ld cmd:make + cmd:msgfmt " -SOURCE_DIR="$portVersionedName" - BUILD() { $portPackageLinksDir/cmd~python/bin/python setup.py build --force diff --git a/dev-vcs/mercurial/patches/mercurial-2.8.patch b/dev-vcs/mercurial/patches/mercurial-2.8.1.patch similarity index 57% rename from dev-vcs/mercurial/patches/mercurial-2.8.patch rename to dev-vcs/mercurial/patches/mercurial-2.8.1.patch index 734c4b759..edfe44133 100644 --- a/dev-vcs/mercurial/patches/mercurial-2.8.patch +++ b/dev-vcs/mercurial/patches/mercurial-2.8.1.patch @@ -1,6 +1,6 @@ -diff -up mercurial-2.8/mercurial/ui.py.orig mercurial-2.8/mercurial/ui.py ---- mercurial-2.8/mercurial/ui.py.orig 2012-06-01 22:48:21.025690112 -0600 -+++ mercurial-2.8/mercurial/ui.py 2012-06-04 17:15:16.317980672 -0600 +diff -up mercurial-2.8.1/mercurial/ui.py.orig mercurial-2.8.1/mercurial/ui.py +--- mercurial-2.8.1/mercurial/ui.py.orig 2012-06-01 22:48:21.025690112 -0600 ++++ mercurial-2.8.1/mercurial/ui.py 2012-06-04 17:15:16.317980672 -0600 @@ -693,7 +693,7 @@ class ui(object): # avoid confusion. editor = 'E' From 458b2f783ebb9ca00cb2f7b7ec40d9517858d216 Mon Sep 17 00:00:00 2001 From: "Arfonzo J. Coward" Date: Tue, 3 Dec 2013 09:33:06 +0000 Subject: [PATCH 11/15] Avoid using pushd/popd here for simplicity. --- net-irc/quassel/quassel-0.9.2.recipe | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/net-irc/quassel/quassel-0.9.2.recipe b/net-irc/quassel/quassel-0.9.2.recipe index ce00b742b..b4e59beba 100644 --- a/net-irc/quassel/quassel-0.9.2.recipe +++ b/net-irc/quassel/quassel-0.9.2.recipe @@ -56,10 +56,9 @@ BUILD_REQUIRES=" BUILD() { mkdir -p build - pushd build - cmake -DCMAKE_INSTALL_PREFIX=$prefix -DCMAKE_C_COMPILER="gcc" -DCMAKE_CXX_COMPILER="g++" `popd` - make - popd + cd build + cmake -DCMAKE_INSTALL_PREFIX=$prefix -DCMAKE_C_COMPILER="gcc" -DCMAKE_CXX_COMPILER="g++" .. + make } INSTALL() From 399941fb03098de439fb898066957d8fc1a2645b Mon Sep 17 00:00:00 2001 From: "Arfonzo J. Coward" Date: Tue, 3 Dec 2013 09:38:11 +0000 Subject: [PATCH 12/15] Move cmd:pkg_config requirement to BUILD_PREREQUIRES. --- net-irc/quassel/quassel-0.9.2.recipe | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/net-irc/quassel/quassel-0.9.2.recipe b/net-irc/quassel/quassel-0.9.2.recipe index b4e59beba..d9e585e48 100644 --- a/net-irc/quassel/quassel-0.9.2.recipe +++ b/net-irc/quassel/quassel-0.9.2.recipe @@ -22,9 +22,9 @@ COPYRIGHT="2005-2009, the Quassel IRC Team" ARCHITECTURES="x86" 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" + # x86_gcc2 is fine as primary target architecture as long as we're building + # for a different secondary architecture. + ARCHITECTURES="$ARCHITECTURES x86_gcc2" fi SECONDARY_ARCHITECTURES="x86" @@ -37,21 +37,21 @@ PROVIDES=" " REQUIRES=" - haiku${secondaryArchSuffix} >= $haikuVersion - qtcore${secondaryArchSuffix} >= 4.8 - " + haiku${secondaryArchSuffix} >= $haikuVersion + qtcore${secondaryArchSuffix} >= 4.8 + " BUILD_PREREQUIRES=" cmd:cmake cmd:g++${secondaryArchSuffix} cmd:make + cmd:pkg_config " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion - qtcore${secondaryArchSuffix}_devel >= 4.8 - cmd:pkg_config - " + haiku${secondaryArchSuffix}_devel >= $haikuVersion + qtcore${secondaryArchSuffix}_devel >= 4.8 + " BUILD() { From 98697cf6b83d387cb7503ffad96f56cb09f368a3 Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Tue, 3 Dec 2013 15:02:28 +0100 Subject: [PATCH 13/15] Move commands to BUILD_PREREQUIRES, remove useless folder (Fortuna) --- haiku-apps/fortuna/fortuna-1.0.0.recipe | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/haiku-apps/fortuna/fortuna-1.0.0.recipe b/haiku-apps/fortuna/fortuna-1.0.0.recipe index 8410ae72b..7ccf3272b 100644 --- a/haiku-apps/fortuna/fortuna-1.0.0.recipe +++ b/haiku-apps/fortuna/fortuna-1.0.0.recipe @@ -28,12 +28,15 @@ REQUIRES=" haiku >= $haikuVersion " -BUILD_REQUIRES=" - haiku_devel >= $haikuVersion +BUILD_PREREQUIRES=" cmd:gcc cmd:xres " +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + " + BUILD() { gcc -o Fortuna -lbe src/main.cpp src/FortuneWindow.cpp src/FortuneFunctions.cpp @@ -43,7 +46,7 @@ BUILD() INSTALL() { - mkdir -p $appsDir/Fortuna - cp Fortuna $appsDir/Fortuna - addAppDeskbarSymlink $appsDir/Fortuna/Fortuna + mkdir -p $appsDir + cp Fortuna $appsDir + addAppDeskbarSymlink $appsDir/Fortuna } From c5fb090d75e7b887a09c772ff33df13e8cb23e3c Mon Sep 17 00:00:00 2001 From: Theodore Kokkoris Date: Tue, 3 Dec 2013 15:20:18 +0000 Subject: [PATCH 14/15] BurnItNow trunk (fixed commit from repo) recipe added --- haiku-apps/burnitnow/burnitnow-trunk.recipe | 51 +++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 haiku-apps/burnitnow/burnitnow-trunk.recipe diff --git a/haiku-apps/burnitnow/burnitnow-trunk.recipe b/haiku-apps/burnitnow/burnitnow-trunk.recipe new file mode 100644 index 000000000..03fb1378b --- /dev/null +++ b/haiku-apps/burnitnow/burnitnow-trunk.recipe @@ -0,0 +1,51 @@ +SUMMARY="A utility for burning CD" +DESCRIPTION="BurnItNow is a CD burning utility application for Haiku" +HOMEPAGE="https://github.com/HaikuArchives/BurnItNow" +SRC_URI="git+https://github.com/HaikuArchives/BurnItNow#5036e55" +REVISION="1" +COPYRIGHT=" + 2010 BurnItNow Team + 2010 BurnItNow Maintainers + 2005-2007 Ingo Weinhold + 2007 Haiku, Inc. + 1991-2000 Be Incorporated + " +LICENSE="MIT" + + +ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" + +PROVIDES=" + burnitnow = $portVersion + app:burnintnow = $portVersion + " + +REQUIRES=" + cdrtools + " + +BUILD_PREREQUIRES=" + makefile_engine + cmd:cmake + cmd:make + cmd:gcc + " + +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + " + +SOURCE_DIR="$portName/trunk" + +BUILD() +{ + cmake . + make +} + +INSTALL() +{ + mkdir -p $appsDir/BurnItNow + cp BurnItNow $appsDir/BurnItNow + addAppDeskbarSymlink $appsDir/BurnItNow/BurnItNow +} From 6b88bcf114edbab6aa95449863c8f66a2c2de167 Mon Sep 17 00:00:00 2001 From: tgkokk Date: Tue, 3 Dec 2013 16:50:31 +0000 Subject: [PATCH 15/15] Minor tweaks to the burnitnow-trunk recipe --- haiku-apps/burnitnow/burnitnow-trunk.recipe | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/haiku-apps/burnitnow/burnitnow-trunk.recipe b/haiku-apps/burnitnow/burnitnow-trunk.recipe index 03fb1378b..98d226421 100644 --- a/haiku-apps/burnitnow/burnitnow-trunk.recipe +++ b/haiku-apps/burnitnow/burnitnow-trunk.recipe @@ -4,8 +4,7 @@ HOMEPAGE="https://github.com/HaikuArchives/BurnItNow" SRC_URI="git+https://github.com/HaikuArchives/BurnItNow#5036e55" REVISION="1" COPYRIGHT=" - 2010 BurnItNow Team - 2010 BurnItNow Maintainers + 2010-2013 BurnItNow Team 2005-2007 Ingo Weinhold 2007 Haiku, Inc. 1991-2000 Be Incorporated @@ -21,7 +20,7 @@ PROVIDES=" " REQUIRES=" - cdrtools + cmd:cdrecord " BUILD_PREREQUIRES="