From 0b91aaf58e3189061ed23ca187b57ccff03f4dc2 Mon Sep 17 00:00:00 2001 From: noryb009 Date: Sun, 1 Dec 2013 08:01:45 -0500 Subject: [PATCH 01/25] Updated beezer, work by GCI2013 student Luke --- haiku-apps/beezer/beezer-1.recipe | 69 ++++++++++++++++++------ haiku-apps/beezer/patches/beezer-1.patch | 57 ++++++++++++++++++++ 2 files changed, 109 insertions(+), 17 deletions(-) create mode 100644 haiku-apps/beezer/patches/beezer-1.patch diff --git a/haiku-apps/beezer/beezer-1.recipe b/haiku-apps/beezer/beezer-1.recipe index 7b9dbb02f..0574da00c 100644 --- a/haiku-apps/beezer/beezer-1.recipe +++ b/haiku-apps/beezer/beezer-1.recipe @@ -1,28 +1,63 @@ -DESCRIPTION="beezer, an archiving tool for the Haiku operating system, similar to winzip" +SUMMARY="Beezer is an archive manager for Haiku, similar to winzip" +DESCRIPTION=" + Beezer is an archive manager for Haiku. It can extract and browse, + create and add to archive files. In addition, Beezer can split and rejoin + files. + + It can extract 7zip, arj, bzip2, gzip, lha, rar, tar, xz and zip files. + It can create 7zip, bzip2, gzip, tar and zip files. + " HOMEPAGE="https://bitbucket.org/cpr/beezer" -SRC_URI="https://bitbucket.org/cpr/beezer/get/82199f683571.zip" +SRC_URI="https://bitbucket.org/cpr/beezer/get/e6e2c619aa4a.zip" +CHECKSUM_MD5="79aac5ae3eac5abcfe0d197730723284" + +LICENSE="BSD (3-clause)" +COPYRIGHT=" + 2009 Ramshankar (aka Teknomancer) + 2011-2012 Chris Roberts + " REVISION="1" -STATUS_HAIKU="stable" -CHECKSUM_MD5="b27479b8a8afc1bc105ad9a6d8911f74" -DEPEND="cmake >= 2.8" +ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" + +PROVIDES=" + beezer = $portVersion + app:beezer = $portVersion + " + +REQUIRES=" + haiku >= $haikuVersion + " + +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + " +BUILD_PREREQUIRES=" + cmake >= 2.8 + cmd:gcc + cmd:make + " + +PATCHES=" + beezer-1.patch + " + +SOURCE_DIR="cpr-beezer-e6e2c619aa4a" + BUILD() { - cd cpr-beezer-82199f683571/Source + cd Source cmake . make } INSTALL() { - cd cpr-beezer-82199f683571/Source/build - BEEZER_DIR=${DESTDIR}/`finddir B_APPS_DIRECTORY`/Beezer - mkdir -p $BEEZER_DIR/add-ons - cp -a Beezer $BEEZER_DIR - cp -a add-ons/* $BEEZER_DIR/add-ons - mkdir -p ${DESTDIR}/`finddir B_USER_ADDONS_DIRECTORY`/Tracker - cp -a TrackerAddOn/BeezerAddOn ${DESTDIR}/`finddir B_USER_ADDONS_DIRECTORY`/Tracker + cd Source/build + mkdir -p $appsDir/Beezer/add-ons + cp Beezer $appsDir/Beezer + cp -a add-ons/* $appsDir/Beezer/add-ons + addAppDeskbarSymlink $appsDir/Beezer/Beezer + + mkdir -p $appsDir/Tracker + cp -a TrackerAddOn/BeezerAddOn $appsDir/Tracker } - -LICENSE="BSD (3-clause)" -COPYRIGHT="2009 Ramshankar (aka Teknomancer) - 2011-2012 Chris Roberts" diff --git a/haiku-apps/beezer/patches/beezer-1.patch b/haiku-apps/beezer/patches/beezer-1.patch new file mode 100644 index 000000000..638f8e7e2 --- /dev/null +++ b/haiku-apps/beezer/patches/beezer-1.patch @@ -0,0 +1,57 @@ +From 3728835e4083c862c9b03dd5ffdb5941f34f9da5 Mon Sep 17 00:00:00 2001 +From: Luke +Date: Sun, 1 Dec 2013 12:22:29 +0000 +Subject: [PATCH] Remove references to B_COMMON_ + +--- + Source/Archiver/Archiver.cpp | 13 +------------ + Source/Beezer/FSUtils/FSUtils.cpp | 2 +- + 2 files changed, 2 insertions(+), 13 deletions(-) + +diff --git a/Source/Archiver/Archiver.cpp b/Source/Archiver/Archiver.cpp +index c272333..7b57313 100644 +--- a/Source/Archiver/Archiver.cpp ++++ b/Source/Archiver/Archiver.cpp +@@ -625,7 +625,7 @@ status_t Archiver::SetComment(char* commentStr, const char* tempDirPath) + bool Archiver::IsBinaryFound(char* filePath, const char* fileName) const + { + // Check if the given fileName exists in the given dir, if so copy the full path of fileName to filePath +- // Path priority /workers -> B_SYSTEM_BIN_DIRECTORY -> B_COMMON_BIN_DIRECTORY ++ // Path priority /workers -> B_SYSTEM_BIN_DIRECTORY + BPath binPath; + app_info appInfo; + be_app->GetAppInfo(&appInfo); +@@ -652,17 +652,6 @@ bool Archiver::IsBinaryFound(char* filePath, const char* fileName) const + } + } + +- if (find_directory(B_COMMON_BIN_DIRECTORY, &binPath) == B_OK) +- { +- binPath.Append(fileName); +- BEntry entry(binPath.Path(), true); +- if (entry.Exists()) +- { +- strcpy(filePath, binPath.Path()); +- return true; +- } +- } +- + // TODO full search of $PATH + + filePath = '\0'; +diff --git a/Source/Beezer/FSUtils/FSUtils.cpp b/Source/Beezer/FSUtils/FSUtils.cpp +index a651c58..8fbb01d 100644 +--- a/Source/Beezer/FSUtils/FSUtils.cpp ++++ b/Source/Beezer/FSUtils/FSUtils.cpp +@@ -177,7 +177,7 @@ BString CreateTempDirectory(const char* prefix, BDirectory** createdDir, bool cr + prefixStr << prefix << "_"; + + BPath tmpPath; +- find_directory(B_COMMON_TEMP_DIRECTORY, &tmpPath, true); ++ find_directory(B_SYSTEM_TEMP_DIRECTORY, &tmpPath, true); + BString tempDirName = tempnam(const_cast(tmpPath.Path()), const_cast(prefixStr.String())); + + // Further random the dir name (the below number is a prime) +-- +1.8.3.4 + From 8eb485cb23538ffa4e41aa3bfe8d37a34b40a70c Mon Sep 17 00:00:00 2001 From: noryb009 Date: Sun, 1 Dec 2013 19:01:02 -0500 Subject: [PATCH 02/25] Correct beezer addon and docs placement --- haiku-apps/beezer/beezer-1.recipe | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/haiku-apps/beezer/beezer-1.recipe b/haiku-apps/beezer/beezer-1.recipe index 0574da00c..26a6bbcec 100644 --- a/haiku-apps/beezer/beezer-1.recipe +++ b/haiku-apps/beezer/beezer-1.recipe @@ -47,17 +47,20 @@ BUILD() { cd Source cmake . - make + make $jobArgs } INSTALL() { + mkdir -p $docDir/Beezer + cp -a Docs/* $docDir/Beezer + cd Source/build mkdir -p $appsDir/Beezer/add-ons cp Beezer $appsDir/Beezer cp -a add-ons/* $appsDir/Beezer/add-ons addAppDeskbarSymlink $appsDir/Beezer/Beezer - mkdir -p $appsDir/Tracker - cp -a TrackerAddOn/BeezerAddOn $appsDir/Tracker + mkdir -p $addOnsDir/Tracker + cp -a TrackerAddOn/BeezerAddOn $addOnsDir/Tracker } From 9af00b9cb5fa1cf5f8d75a28ec77f6251464fc78 Mon Sep 17 00:00:00 2001 From: noryb009 Date: Sun, 1 Dec 2013 21:23:18 -0500 Subject: [PATCH 03/25] Include correct docs --- haiku-apps/beezer/beezer-1.recipe | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/haiku-apps/beezer/beezer-1.recipe b/haiku-apps/beezer/beezer-1.recipe index 26a6bbcec..2c8fa55ee 100644 --- a/haiku-apps/beezer/beezer-1.recipe +++ b/haiku-apps/beezer/beezer-1.recipe @@ -52,13 +52,12 @@ BUILD() INSTALL() { - mkdir -p $docDir/Beezer - cp -a Docs/* $docDir/Beezer - cd Source/build - mkdir -p $appsDir/Beezer/add-ons + + mkdir -p $appsDir/Beezer cp Beezer $appsDir/Beezer - cp -a add-ons/* $appsDir/Beezer/add-ons + cp -a add-ons $appsDir/Beezer + cp -a ../Beezer/docs $appsDir/Beezer addAppDeskbarSymlink $appsDir/Beezer/Beezer mkdir -p $addOnsDir/Tracker From 1f815c9868e28667dac71ebbdd6c21dd6523d5c7 Mon Sep 17 00:00:00 2001 From: Alex Ozer Date: Sun, 1 Dec 2013 23:13:20 -0500 Subject: [PATCH 04/25] Fix ThemeManager's recipe file, work by GCI2013 student mindstormscreator --- .../thememanager/thememanager-0_svn.recipe | 20 --------- .../thememanager/thememanager-1.0_git.recipe | 43 +++++++++++++++++++ 2 files changed, 43 insertions(+), 20 deletions(-) delete mode 100644 haiku-apps/thememanager/thememanager-0_svn.recipe create mode 100644 haiku-apps/thememanager/thememanager-1.0_git.recipe diff --git a/haiku-apps/thememanager/thememanager-0_svn.recipe b/haiku-apps/thememanager/thememanager-0_svn.recipe deleted file mode 100644 index 69eb763d7..000000000 --- a/haiku-apps/thememanager/thememanager-0_svn.recipe +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION="ThemeManager" -HOMEPAGE="http://dev.osdrawer.net/projects/thememanager/" -SRC_URI="http://svn.osdrawer.net/thememanager/trunk" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -#CHECKSUM_MD5="" -BUILD() -{ - cd trunk - make -} - -INSTALL() -{ - cd trunk -} - -LICENSE="MIT" -COPYRIGHT="2000-2012 François Revol" diff --git a/haiku-apps/thememanager/thememanager-1.0_git.recipe b/haiku-apps/thememanager/thememanager-1.0_git.recipe new file mode 100644 index 000000000..51913da3b --- /dev/null +++ b/haiku-apps/thememanager/thememanager-1.0_git.recipe @@ -0,0 +1,43 @@ +SUMMARY="Manages Haiku themes." +DESCRIPTION="The Haiku Theme Manager is compatible with the one shipping with ZETA. Users can choose which part of a theme to apply or save. It can also import BeTheme themes, and to some degree, MS Plus themes. It is add-ons based, so it can be extended." +HOMEPAGE="https://github.com/HaikuArchives/HaikuThemeManager" +SRC_URI="git://github.com/HaikuArchives/HaikuThemeManager.git#400a0ff17173a2510e24bf737df0bb218a9c531c" +# 20 October 2013 commit +LICENSE="MIT" +COPYRIGHT="2000-2012 François Revol" +REVISION="1" +STATUS_HAIKU="stable" +ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" +PROVIDES=" + thememanager = $portVersion + cmd:ThemeManager = $portVersion +" +REQUIRES=" + haiku >= $haikuVersion +" +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:git + cmd:gcc + cmd:make + cmd:mkdepend + cmd:ld + cmd:strip +" +BUILD_REQUIRES=" + makefile_engine +" + +BUILD() +{ + cd src + make OBJ_DIR=objects BUILDHOME=/boot/system/develop $jobArgs +} + +INSTALL() +{ + cd src + make OBJ_DIR=objects BUILDHOME=/boot/system/develop INSTALL_DIR=$binDir install + strip $binDir/* + +} From ffbe8b0ad4e30a5e185f49185c9724316cd5ba8c Mon Sep 17 00:00:00 2001 From: Alex Ozer Date: Mon, 2 Dec 2013 10:42:40 -0500 Subject: [PATCH 05/25] (Re)fix ThemeManager's recipe file, work by GCI2013 student mindstormscreator --- .../thememanager/thememanager-1.0_git.recipe | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/haiku-apps/thememanager/thememanager-1.0_git.recipe b/haiku-apps/thememanager/thememanager-1.0_git.recipe index 51913da3b..9638331e4 100644 --- a/haiku-apps/thememanager/thememanager-1.0_git.recipe +++ b/haiku-apps/thememanager/thememanager-1.0_git.recipe @@ -1,16 +1,18 @@ SUMMARY="Manages Haiku themes." -DESCRIPTION="The Haiku Theme Manager is compatible with the one shipping with ZETA. Users can choose which part of a theme to apply or save. It can also import BeTheme themes, and to some degree, MS Plus themes. It is add-ons based, so it can be extended." +DESCRIPTION="The Haiku Theme Manager is compatible with the one +shipping with ZETA. Users can choose which part of a theme to apply or +save. It can also import BeTheme themes, and to some degree, MS Plus +themes. It is add-ons based, so it can be extended." HOMEPAGE="https://github.com/HaikuArchives/HaikuThemeManager" SRC_URI="git://github.com/HaikuArchives/HaikuThemeManager.git#400a0ff17173a2510e24bf737df0bb218a9c531c" # 20 October 2013 commit LICENSE="MIT" COPYRIGHT="2000-2012 François Revol" REVISION="1" -STATUS_HAIKU="stable" ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" PROVIDES=" thememanager = $portVersion - cmd:ThemeManager = $portVersion + app:thememanager = $portVersion " REQUIRES=" haiku >= $haikuVersion @@ -22,7 +24,6 @@ BUILD_PREREQUIRES=" cmd:make cmd:mkdepend cmd:ld - cmd:strip " BUILD_REQUIRES=" makefile_engine @@ -37,7 +38,6 @@ BUILD() INSTALL() { cd src - make OBJ_DIR=objects BUILDHOME=/boot/system/develop INSTALL_DIR=$binDir install - strip $binDir/* - + make OBJ_DIR=objects BUILDHOME=/boot/system/develop INSTALL_DIR=$preferencesDir install + addPreferencesDeskbarSymlink $preferencesDir/ThemeManager } From 8e554bea728f05ba8f6675dd35fe5d382c1e8a97 Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Mon, 2 Dec 2013 23:18:26 +0100 Subject: [PATCH 06/25] 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 e307f94462390c4a1ad890ebad006d67e6b5d010 Mon Sep 17 00:00:00 2001 From: "Arfonzo J. Coward" Date: Tue, 3 Dec 2013 12:29:47 +0000 Subject: [PATCH 07/25] Updated quassel to create Deskbar symlinks. --- net-irc/quassel/quassel-0.9.2.recipe | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/net-irc/quassel/quassel-0.9.2.recipe b/net-irc/quassel/quassel-0.9.2.recipe index d9e585e48..4ca7b90bc 100644 --- a/net-irc/quassel/quassel-0.9.2.recipe +++ b/net-irc/quassel/quassel-0.9.2.recipe @@ -13,7 +13,7 @@ ubiquitous available. HOMEPAGE="http://quassel-irc.org" SRC_URI="http://quassel-irc.org/pub/quassel-0.9.2.tar.bz2" CHECKSUM_MD5="4ed88d288f60290f4459d3e68d61b037" -REVISION="1" +REVISION="2" LICENSE=" GNU GPL v2 GNU GPL v3 @@ -77,4 +77,11 @@ INSTALL() cp quassel ${appsDir}/Quassel cp quasselcore ${appsDir}/Quassel cp quasselclient ${appsDir}/Quassel + + DIR_QUASSEL_DESKBAR="${dataDir}/deskbar/menu/Applications/Quassel" + mkdir -p ${DIR_QUASSEL_DESKBAR} + echo "Making links for Deskbar in ${DIR_QUASSEL_DESKBAR} ..." + addAppDeskbarSymlink ${appsDir}/Quassel/quassel "Quassel/Quassel" + addAppDeskbarSymlink ${appsDir}/Quassel/quasselcore "Quassel/Quassel Core" + addAppDeskbarSymlink ${appsDir}/Quassel/quasselclient "Quassel/Quassel Client" } From 98697cf6b83d387cb7503ffad96f56cb09f368a3 Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Tue, 3 Dec 2013 15:02:28 +0100 Subject: [PATCH 08/25] 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 09/25] 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 10/25] 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=" From 9a53e5632a55d3ca572b44dc8381a37256560068 Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Tue, 3 Dec 2013 20:25:36 +0100 Subject: [PATCH 11/25] Add ConvertToLF recipe --- haiku-apps/converttolf/converttolf_git.recipe | 51 +++++++++++++++++++ .../patches/converttolf-1.0.0.patch | 13 +++++ 2 files changed, 64 insertions(+) create mode 100644 haiku-apps/converttolf/converttolf_git.recipe create mode 100644 haiku-apps/converttolf/patches/converttolf-1.0.0.patch diff --git a/haiku-apps/converttolf/converttolf_git.recipe b/haiku-apps/converttolf/converttolf_git.recipe new file mode 100644 index 000000000..a3539f540 --- /dev/null +++ b/haiku-apps/converttolf/converttolf_git.recipe @@ -0,0 +1,51 @@ +SUMMARY="A small tool to turn CRLF into LF without fuss!" +DESCRIPTION=" + ConvertToLF is a filter that removes the carriage returns used in the + end of file markers on some operating systems. Haiku uses just a line + feed to mark the end of line, and gcc, the Haiku compiler and StyledEdit + don't function properly with carriage returns in source code / text files. + " # Taken from the homepage + +HOMEPAGE="https://github.com/HaikuArchives/ConvertToLF/" +SRC_URI="git://github.com/HaikuArchives/ConvertToLF.git" + +REVISION="1" + +COPYRIGHT=" + fReT + " + +LICENSE="GPL" + +ARCHITECTURES="x86_gcc2 x86" + +PATCHES="converttolf_git.patch" + +PROVIDES=" + ConvertToLF = $portVersion + app:ConvertToLF = $portVersion + " + +REQUIRES=" + haiku >= $haikuVersion + " + +BUILD_PREREQUIRES=" + cmd:gcc + cmd:xres + " + +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + " +BUILD() +{ + g++ -lbe -ltracker -o ConvertToLF Source/Strip.cpp + xres -o ConvertToLF Source/ConvertToLF.rsrc +} + +INSTALL() +{ + mkdir -p $addOnsDir/Tracker + cp ConvertToLF $addOnsDir/Tracker +} diff --git a/haiku-apps/converttolf/patches/converttolf-1.0.0.patch b/haiku-apps/converttolf/patches/converttolf-1.0.0.patch new file mode 100644 index 000000000..e60c631b3 --- /dev/null +++ b/haiku-apps/converttolf/patches/converttolf-1.0.0.patch @@ -0,0 +1,13 @@ +diff --git a/Source/Strip.cpp b/Source/Strip.cpp +index c630a03..fa79021 100644 +--- a/Source/Strip.cpp ++++ b/Source/Strip.cpp +@@ -1,7 +1,7 @@ + #include + #include + #include +-#include ++#include + + #include + #include From 7091695365c11338dc8aa70971fac2174124d69b Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Tue, 3 Dec 2013 20:51:59 +0100 Subject: [PATCH 12/25] Renamed converttolf version, fixed license, pinned commit, copyright corrected --- .../{converttolf_git.recipe => converttolf-0.0.0.recipe} | 8 ++++---- .../{converttolf-1.0.0.patch => converttolf-0.0.0.patch} | 0 2 files changed, 4 insertions(+), 4 deletions(-) rename haiku-apps/converttolf/{converttolf_git.recipe => converttolf-0.0.0.recipe} (84%) rename haiku-apps/converttolf/patches/{converttolf-1.0.0.patch => converttolf-0.0.0.patch} (100%) diff --git a/haiku-apps/converttolf/converttolf_git.recipe b/haiku-apps/converttolf/converttolf-0.0.0.recipe similarity index 84% rename from haiku-apps/converttolf/converttolf_git.recipe rename to haiku-apps/converttolf/converttolf-0.0.0.recipe index a3539f540..a0c0577f3 100644 --- a/haiku-apps/converttolf/converttolf_git.recipe +++ b/haiku-apps/converttolf/converttolf-0.0.0.recipe @@ -7,19 +7,19 @@ DESCRIPTION=" " # Taken from the homepage HOMEPAGE="https://github.com/HaikuArchives/ConvertToLF/" -SRC_URI="git://github.com/HaikuArchives/ConvertToLF.git" +SRC_URI="git://github.com/HaikuArchives/ConvertToLF.git#68aa99caf238e6ae91203f5023daa6716ea6c2cb" REVISION="1" COPYRIGHT=" - fReT + 2008 fReT " -LICENSE="GPL" +LICENSE="GNU GPL v2" ARCHITECTURES="x86_gcc2 x86" -PATCHES="converttolf_git.patch" +PATCHES="converttolf-0.0.0.patch" PROVIDES=" ConvertToLF = $portVersion diff --git a/haiku-apps/converttolf/patches/converttolf-1.0.0.patch b/haiku-apps/converttolf/patches/converttolf-0.0.0.patch similarity index 100% rename from haiku-apps/converttolf/patches/converttolf-1.0.0.patch rename to haiku-apps/converttolf/patches/converttolf-0.0.0.patch From ce3ce18c51415100c1252ae801ca1a8d9488d34f Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Tue, 3 Dec 2013 21:22:25 +0100 Subject: [PATCH 13/25] Changed copyright, changed commit --- haiku-apps/converttolf/converttolf-0.0.0.recipe | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/haiku-apps/converttolf/converttolf-0.0.0.recipe b/haiku-apps/converttolf/converttolf-0.0.0.recipe index a0c0577f3..93c32de90 100644 --- a/haiku-apps/converttolf/converttolf-0.0.0.recipe +++ b/haiku-apps/converttolf/converttolf-0.0.0.recipe @@ -7,12 +7,12 @@ DESCRIPTION=" " # Taken from the homepage HOMEPAGE="https://github.com/HaikuArchives/ConvertToLF/" -SRC_URI="git://github.com/HaikuArchives/ConvertToLF.git#68aa99caf238e6ae91203f5023daa6716ea6c2cb" +SRC_URI="git://github.com/HaikuArchives/ConvertToLF.git#baed641a66480a02c570db21476c536f6d3369b2" REVISION="1" COPYRIGHT=" - 2008 fReT + 2001 fReT " LICENSE="GNU GPL v2" From 1ba13e35bcf73ab14011fd6181c7371afd0bddb3 Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Tue, 3 Dec 2013 21:27:18 +0100 Subject: [PATCH 14/25] Moved from rsrc to rdef at ConvertToLF --- haiku-apps/converttolf/converttolf-0.0.0.recipe | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/haiku-apps/converttolf/converttolf-0.0.0.recipe b/haiku-apps/converttolf/converttolf-0.0.0.recipe index 93c32de90..0ad536f36 100644 --- a/haiku-apps/converttolf/converttolf-0.0.0.recipe +++ b/haiku-apps/converttolf/converttolf-0.0.0.recipe @@ -19,8 +19,6 @@ LICENSE="GNU GPL v2" ARCHITECTURES="x86_gcc2 x86" -PATCHES="converttolf-0.0.0.patch" - PROVIDES=" ConvertToLF = $portVersion app:ConvertToLF = $portVersion @@ -41,7 +39,8 @@ BUILD_REQUIRES=" BUILD() { g++ -lbe -ltracker -o ConvertToLF Source/Strip.cpp - xres -o ConvertToLF Source/ConvertToLF.rsrc + rc -o ConvertToLF.rsrc Source/ConvertToLF.rdef + xres -o ConvertToLF ConvertToLF.rsrc } INSTALL() From a5776893d315a58d87891993749821ac0055c305 Mon Sep 17 00:00:00 2001 From: Alex Ozer Date: Tue, 3 Dec 2013 15:28:05 -0500 Subject: [PATCH 15/25] Fix description, tidy up *REQUIRES functions --- haiku-apps/thememanager/thememanager-1.0_git.recipe | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/haiku-apps/thememanager/thememanager-1.0_git.recipe b/haiku-apps/thememanager/thememanager-1.0_git.recipe index 9638331e4..b3ba3e182 100644 --- a/haiku-apps/thememanager/thememanager-1.0_git.recipe +++ b/haiku-apps/thememanager/thememanager-1.0_git.recipe @@ -1,6 +1,6 @@ SUMMARY="Manages Haiku themes." DESCRIPTION="The Haiku Theme Manager is compatible with the one -shipping with ZETA. Users can choose which part of a theme to apply or +that shipped with ZETA. Users can choose which part of a theme to apply or save. It can also import BeTheme themes, and to some degree, MS Plus themes. It is add-ons based, so it can be extended." HOMEPAGE="https://github.com/HaikuArchives/HaikuThemeManager" @@ -17,17 +17,17 @@ PROVIDES=" REQUIRES=" haiku >= $haikuVersion " -BUILD_PREREQUIRES=" +BUILD_REQUIRES=" haiku_devel >= $haikuVersion +" +BUILD_PREREQUIRES=" + makefile_engine cmd:git cmd:gcc cmd:make cmd:mkdepend cmd:ld " -BUILD_REQUIRES=" - makefile_engine -" BUILD() { From 6ec4b3c0308060dccee3733648e15b465cdb2276 Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Tue, 3 Dec 2013 21:31:05 +0100 Subject: [PATCH 16/25] Forgot to remove patch --- .../converttolf/patches/converttolf-0.0.0.patch | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 haiku-apps/converttolf/patches/converttolf-0.0.0.patch diff --git a/haiku-apps/converttolf/patches/converttolf-0.0.0.patch b/haiku-apps/converttolf/patches/converttolf-0.0.0.patch deleted file mode 100644 index e60c631b3..000000000 --- a/haiku-apps/converttolf/patches/converttolf-0.0.0.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Source/Strip.cpp b/Source/Strip.cpp -index c630a03..fa79021 100644 ---- a/Source/Strip.cpp -+++ b/Source/Strip.cpp -@@ -1,7 +1,7 @@ - #include - #include - #include --#include -+#include - - #include - #include From 137d7ee4cf2391e685f8ae1fc4d042814622bff7 Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Tue, 3 Dec 2013 21:35:08 +0100 Subject: [PATCH 17/25] Updated sha hash of git to new --- haiku-apps/converttolf/converttolf-0.0.0.recipe | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/haiku-apps/converttolf/converttolf-0.0.0.recipe b/haiku-apps/converttolf/converttolf-0.0.0.recipe index 0ad536f36..ffa82c763 100644 --- a/haiku-apps/converttolf/converttolf-0.0.0.recipe +++ b/haiku-apps/converttolf/converttolf-0.0.0.recipe @@ -7,7 +7,7 @@ DESCRIPTION=" " # Taken from the homepage HOMEPAGE="https://github.com/HaikuArchives/ConvertToLF/" -SRC_URI="git://github.com/HaikuArchives/ConvertToLF.git#baed641a66480a02c570db21476c536f6d3369b2" +SRC_URI="git://github.com/HaikuArchives/ConvertToLF.git#d8ec50f92a65d9fd1058adf98fe2515fbafa243c" REVISION="1" @@ -17,7 +17,7 @@ COPYRIGHT=" LICENSE="GNU GPL v2" -ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="x86_gcc2 x86 ?x86_64" PROVIDES=" ConvertToLF = $portVersion From 56c9034c347834e024a0fac214582793991d4887 Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Tue, 3 Dec 2013 21:59:42 +0100 Subject: [PATCH 18/25] Add mimeset to converttolf --- haiku-apps/converttolf/converttolf-0.0.0.recipe | 1 + 1 file changed, 1 insertion(+) diff --git a/haiku-apps/converttolf/converttolf-0.0.0.recipe b/haiku-apps/converttolf/converttolf-0.0.0.recipe index ffa82c763..e24a0eec9 100644 --- a/haiku-apps/converttolf/converttolf-0.0.0.recipe +++ b/haiku-apps/converttolf/converttolf-0.0.0.recipe @@ -41,6 +41,7 @@ BUILD() g++ -lbe -ltracker -o ConvertToLF Source/Strip.cpp rc -o ConvertToLF.rsrc Source/ConvertToLF.rdef xres -o ConvertToLF ConvertToLF.rsrc + mimeset -f ConvertToLF } INSTALL() From ec93d6574fffcd0d08b5408c9bb289b88dab6137 Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Tue, 3 Dec 2013 14:09:25 -0700 Subject: [PATCH 19/25] Fix fortuna on gcc4 Switched to g++ for compiling so that the stdc++ libs get linked properly --- haiku-apps/fortuna/fortuna-1.0.0.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/haiku-apps/fortuna/fortuna-1.0.0.recipe b/haiku-apps/fortuna/fortuna-1.0.0.recipe index 7ccf3272b..a64b8da0e 100644 --- a/haiku-apps/fortuna/fortuna-1.0.0.recipe +++ b/haiku-apps/fortuna/fortuna-1.0.0.recipe @@ -39,7 +39,7 @@ BUILD_REQUIRES=" BUILD() { - gcc -o Fortuna -lbe src/main.cpp src/FortuneWindow.cpp src/FortuneFunctions.cpp + g++ -o Fortuna -lbe src/main.cpp src/FortuneWindow.cpp src/FortuneFunctions.cpp xres -o Fortuna src/Fortuna.rsrc mimeset -f Fortuna } From 225f1a314a40b9ca695926f6c805babaff77da03 Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Tue, 3 Dec 2013 14:23:41 -0700 Subject: [PATCH 20/25] Minor cleanup of beezer recipe --HG-- rename : haiku-apps/beezer/beezer-1.recipe => haiku-apps/beezer/beezer-0.99.hg.recipe rename : haiku-apps/beezer/patches/beezer-1.patch => haiku-apps/beezer/patches/beezer-0.99.hg.patch --- .../{beezer-1.recipe => beezer-0.99.hg.recipe} | 15 ++++++--------- .../{beezer-1.patch => beezer-0.99.hg.patch} | 0 2 files changed, 6 insertions(+), 9 deletions(-) rename haiku-apps/beezer/{beezer-1.recipe => beezer-0.99.hg.recipe} (82%) rename haiku-apps/beezer/patches/{beezer-1.patch => beezer-0.99.hg.patch} (100%) diff --git a/haiku-apps/beezer/beezer-1.recipe b/haiku-apps/beezer/beezer-0.99.hg.recipe similarity index 82% rename from haiku-apps/beezer/beezer-1.recipe rename to haiku-apps/beezer/beezer-0.99.hg.recipe index 2c8fa55ee..833eb3d04 100644 --- a/haiku-apps/beezer/beezer-1.recipe +++ b/haiku-apps/beezer/beezer-0.99.hg.recipe @@ -8,16 +8,14 @@ DESCRIPTION=" It can create 7zip, bzip2, gzip, tar and zip files. " HOMEPAGE="https://bitbucket.org/cpr/beezer" -SRC_URI="https://bitbucket.org/cpr/beezer/get/e6e2c619aa4a.zip" -CHECKSUM_MD5="79aac5ae3eac5abcfe0d197730723284" - +SRC_URI="hg+https://bitbucket.org/cpr/beezer" LICENSE="BSD (3-clause)" COPYRIGHT=" 2009 Ramshankar (aka Teknomancer) 2011-2012 Chris Roberts " -REVISION="1" -ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" +REVISION="2" +ARCHITECTURES="x86_gcc2 x86 ?x86_64" PROVIDES=" beezer = $portVersion @@ -31,18 +29,17 @@ REQUIRES=" BUILD_REQUIRES=" haiku_devel >= $haikuVersion " + BUILD_PREREQUIRES=" - cmake >= 2.8 + cmd:cmake >= 2.8 cmd:gcc cmd:make " PATCHES=" - beezer-1.patch + beezer-0.99.hg.patch " -SOURCE_DIR="cpr-beezer-e6e2c619aa4a" - BUILD() { cd Source diff --git a/haiku-apps/beezer/patches/beezer-1.patch b/haiku-apps/beezer/patches/beezer-0.99.hg.patch similarity index 100% rename from haiku-apps/beezer/patches/beezer-1.patch rename to haiku-apps/beezer/patches/beezer-0.99.hg.patch From f0430b0c54da43b087223e0a400a01f8a7092e96 Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Tue, 3 Dec 2013 14:50:02 -0700 Subject: [PATCH 21/25] tweak quassel recipe * make the requires more specific instead of depending on the whole qtcore package * enable parallel building --- net-irc/quassel/quassel-0.9.2.recipe | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/net-irc/quassel/quassel-0.9.2.recipe b/net-irc/quassel/quassel-0.9.2.recipe index 4ca7b90bc..d9b7e1d46 100644 --- a/net-irc/quassel/quassel-0.9.2.recipe +++ b/net-irc/quassel/quassel-0.9.2.recipe @@ -38,40 +38,46 @@ PROVIDES=" REQUIRES=" haiku${secondaryArchSuffix} >= $haikuVersion - qtcore${secondaryArchSuffix} >= 4.8 + lib:libQtCore$secondaryArchSuffix >= 4.8 + lib:libQtGui$secondaryArchSuffix >= 4.8 " BUILD_PREREQUIRES=" cmd:cmake cmd:g++${secondaryArchSuffix} cmd:make + cmd:qmake$secondaryArchSuffix + cmd:moc$secondaryArchSuffix cmd:pkg_config " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel >= $haikuVersion - qtcore${secondaryArchSuffix}_devel >= 4.8 + devel:libQtCore$secondaryArchSuffix >= 4.8 + devel:libQtGui$secondaryArchSuffix >= 4.8 " BUILD() { mkdir -p build cd build - cmake -DCMAKE_INSTALL_PREFIX=$prefix -DCMAKE_C_COMPILER="gcc" -DCMAKE_CXX_COMPILER="g++" .. - make + cmake -DCMAKE_INSTALL_PREFIX=$prefix \ + -DCMAKE_C_COMPILER="gcc" -DCMAKE_CXX_COMPILER="g++" \ + -DCMAKE_BUILD_TYPE=Release .. + make $jobArgs } INSTALL() { cd build - + # Optional: strip the binaries before installing. # To be updated/removed whenever resources are added. echo "Stripping binaries ..." strip quassel strip quasselcore strip quasselclient - + echo "Copying binaries to ${appsDir} ..." mkdir -p ${appsDir}/Quassel cp quassel ${appsDir}/Quassel From fb0cfcac89cf8f64b67bb26a10deb257ba4faa77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Tue, 3 Dec 2013 23:09:08 +0000 Subject: [PATCH 22/25] libvpx: update patchset for x86_64 --- media-libs/libvpx/patches/libvpx-1.0.0.patch | 66 ------------------- .../libvpx/patches/libvpx-1.0.0.patchset | 48 ++++++++++++-- 2 files changed, 42 insertions(+), 72 deletions(-) delete mode 100644 media-libs/libvpx/patches/libvpx-1.0.0.patch diff --git a/media-libs/libvpx/patches/libvpx-1.0.0.patch b/media-libs/libvpx/patches/libvpx-1.0.0.patch deleted file mode 100644 index da04b72ff..000000000 --- a/media-libs/libvpx/patches/libvpx-1.0.0.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff -ruN libvpx-v1.0.0/build/make/configure.sh libvpx-v1.0.0-haiku/build/make/configure.sh ---- libvpx-v1.0.0/build/make/configure.sh 2012-01-27 18:36:39.038535168 +0000 -+++ libvpx-v1.0.0-haiku/build/make/configure.sh 2012-03-14 00:47:54.780926976 +0000 -@@ -579,6 +579,9 @@ - *solaris2.10) - tgt_os=solaris - ;; -+ *haiku*) -+ tgt_os=haiku -+ ;; - esac - - if [ -n "$tgt_isa" ] && [ -n "$tgt_os" ]; then -@@ -909,8 +912,8 @@ - esac - ;; - gcc*) -- add_cflags -m${bits} -- add_ldflags -m${bits} -+ enabled haiku || add_cflags -m${bits} -+ enabled haiku || add_ldflags -m${bits} - link_with_cc=gcc - tune_cflags="-march=" - setup_gnu_toolchain -@@ -939,7 +942,7 @@ - add_asflags -f x64 - enabled debug && add_asflags -g cv8 - ;; -- linux*|solaris*) -+ linux*|solaris*|haiku*) - add_asflags -f elf${bits} - enabled debug && [ "${AS}" = yasm ] && add_asflags -g dwarf2 - enabled debug && [ "${AS}" = nasm ] && add_asflags -g -@@ -1019,6 +1022,7 @@ - case ${toolchain} in - *-win*);; - *-android-gcc);; -+ *-haiku*);; - *) check_header pthread.h && add_extralibs -lpthread - esac - fi -diff -ruN libvpx-v1.0.0/configure libvpx-v1.0.0-haiku/configure ---- libvpx-v1.0.0/configure 2012-01-27 18:36:39.039583744 +0000 -+++ libvpx-v1.0.0-haiku/configure 2012-03-14 00:46:37.182976512 +0000 -@@ -107,6 +107,7 @@ - all_platforms="${all_platforms} x86-darwin9-gcc" - all_platforms="${all_platforms} x86-darwin9-icc" - all_platforms="${all_platforms} x86-darwin10-gcc" -+all_platforms="${all_platforms} x86-haiku-gcc" - all_platforms="${all_platforms} x86-linux-gcc" - all_platforms="${all_platforms} x86-linux-icc" - all_platforms="${all_platforms} x86-solaris-gcc" -diff -ruN libvpx-v1.0.0/examples.mk libvpx-v1.0.0-haiku/examples.mk ---- libvpx-v1.0.0/examples.mk 2012-01-27 18:36:39.040108032 +0000 -+++ libvpx-v1.0.0-haiku/examples.mk 2012-03-14 00:46:37.187432960 +0000 -@@ -113,7 +113,9 @@ - # We should not link to math library (libm) on RVCT - # when building for bare-metal targets - ifeq ($(CONFIG_OS_SUPPORT), yes) --CODEC_EXTRA_LIBS-$(CONFIG_VP8) += m -+ ifneq ($(TOOLCHAIN),x86-haiku-gcc) -+ CODEC_EXTRA_LIBS-$(CONFIG_VP8) += m -+ endif - else - ifeq ($(CONFIG_GCC), yes) - CODEC_EXTRA_LIBS-$(CONFIG_VP8) += m diff --git a/media-libs/libvpx/patches/libvpx-1.0.0.patchset b/media-libs/libvpx/patches/libvpx-1.0.0.patchset index eba3dc397..24eb0181d 100644 --- a/media-libs/libvpx/patches/libvpx-1.0.0.patchset +++ b/media-libs/libvpx/patches/libvpx-1.0.0.patchset @@ -1,4 +1,4 @@ -From 0c31cfc2c7429f81129c3403d9bc03bd245db71c Mon Sep 17 00:00:00 2001 +From 98f5dcd5f2dba828f545dac2a534c90d0c5e6c53 Mon Sep 17 00:00:00 2001 From: korli Date: Wed, 14 Mar 2012 00:15:38 +0000 Subject: patch for 1.0.0 @@ -74,10 +74,10 @@ index f6c9045..ab9657f 100644 ifeq ($(CONFIG_GCC), yes) CODEC_EXTRA_LIBS-$(CONFIG_VP8) += m -- -1.7.5 +1.8.3.4 -From dd76984687465e457d9e3dcd0b4bdc4bd46225dd Mon Sep 17 00:00:00 2001 +From 9a194ee7b8498467e5700e2c4e39bc6a30c95714 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 11 Jun 2013 21:09:11 +0200 Subject: configure: enable shared library building for Haiku @@ -97,10 +97,10 @@ index eb8a359..a2ef98d 100755 if [ -z "$CC" ]; then echo "Bypassing toolchain for environment detection." -- -1.7.5 +1.8.3.4 -From 87b2816834bb2bbfc1e13765084a0c21eb46cf13 Mon Sep 17 00:00:00 2001 +From 238a1625cbbb75a1a84c112bacd3e6afee54a919 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 11 Jun 2013 21:09:28 +0200 Subject: libs.mk: no -lm or -lpthread on Haiku @@ -128,5 +128,41 @@ index 79a1d00..d88cfa7 100644 $(if $(LIPO_LIBS),$(eval $(call lipo_bin_template,$(bin))))\ -- -1.7.5 +1.8.3.4 + + +From 214d6e14250d72980faf3798501efe5808562854 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= +Date: Tue, 3 Dec 2013 22:18:36 +0000 +Subject: x86_64 support + +* configure, amples.mk + +diff --git a/configure b/configure +index a2ef98d..4b671ee 100755 +--- a/configure ++++ b/configure +@@ -118,6 +118,7 @@ all_platforms="${all_platforms} x86-win32-vs9" + all_platforms="${all_platforms} x86_64-darwin9-gcc" + all_platforms="${all_platforms} x86_64-darwin10-gcc" + all_platforms="${all_platforms} x86_64-darwin11-gcc" ++all_platforms="${all_platforms} x86_64-haiku-gcc" + all_platforms="${all_platforms} x86_64-linux-gcc" + all_platforms="${all_platforms} x86_64-linux-icc" + all_platforms="${all_platforms} x86_64-solaris-gcc" +diff --git a/examples.mk b/examples.mk +index ab9657f..947a645 100644 +--- a/examples.mk ++++ b/examples.mk +@@ -113,7 +113,7 @@ vp8_multi_resolution_encoder.DESCRIPTION = VP8 Multiple-resolution Encoding + # We should not link to math library (libm) on RVCT + # when building for bare-metal targets + ifeq ($(CONFIG_OS_SUPPORT), yes) +- ifneq ($(TOOLCHAIN),x86-haiku-gcc) ++ ifeq (,$(findstring haiku,$(TOOLCHAIN))) + CODEC_EXTRA_LIBS-$(CONFIG_VP8) += m + endif + else +-- +1.8.3.4 From ed0cf0a7fee2b17e4543d2d138e2623faf104e75 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Wed, 4 Dec 2013 02:17:17 +0000 Subject: [PATCH 23/25] Patch for libiptcdata which disables gtk-doc and allows building static and shared libs --- .../patches/libiptcdata-1.0.4.patch | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 media-libs/libiptcdata/patches/libiptcdata-1.0.4.patch diff --git a/media-libs/libiptcdata/patches/libiptcdata-1.0.4.patch b/media-libs/libiptcdata/patches/libiptcdata-1.0.4.patch new file mode 100644 index 000000000..d29456cd1 --- /dev/null +++ b/media-libs/libiptcdata/patches/libiptcdata-1.0.4.patch @@ -0,0 +1,45 @@ +diff --git a/configure.in b/configure.in +index a1c58ab..2d8a3b1 100644 +--- a/configure.in ++++ b/configure.in +@@ -1,6 +1,6 @@ + AC_PREREQ(2.50) + AC_INIT(libiptcdata/iptc-data.h) +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS(config.h) + AM_INIT_AUTOMAKE(libiptcdata, 1.0.4) + AM_MAINTAINER_MODE + +@@ -75,7 +75,7 @@ dnl Check for headers (Mac OSX often doesn't have them) + AC_CHECK_HEADERS([getopt.h wchar.h iconv.h]) + + +-GTK_DOC_CHECK([1.0]) ++dnl GTK_DOC_CHECK([1.0]) + + + dnl --------------------------------------------------------------------------- +diff --git a/Makefile.am b/Makefile.am +index 192529a..504ed54 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -7,4 +7,4 @@ SUBDIRS = m4 libiptcdata po iptc docs win $(MAYBE_PYTHONLIB) + EXTRA_DIST = @PACKAGE@.spec + + ACLOCAL_AMFLAGS = -I m4 +-DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc ++DISTCHECK_CONFIGURE_FLAGS = +diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am +index f91793a..1f52449 100644 +--- a/docs/reference/Makefile.am ++++ b/docs/reference/Makefile.am +@@ -42,7 +42,7 @@ content_files = \ + libjpeg.sgml \ + overview.sgml + +-include $(top_srcdir)/gtk-doc.make ++include + +-EXTRA_DIST += \ ++EXTRA_DIST = \ + version.xml.in From 2ceacd897f93857a5ec21aa748a3bc0078b96539 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Wed, 4 Dec 2013 03:28:20 +0100 Subject: [PATCH 24/25] openjdk: Fix for missing java.lang.CharacterData* classes --- .../openjdk-1.7_2013_11_08-source8.patchset | 34 ++++++++++++++++--- 1 file changed, 29 insertions(+), 5 deletions(-) diff --git a/dev-lang/openjdk/patches/openjdk-1.7_2013_11_08-source8.patchset b/dev-lang/openjdk/patches/openjdk-1.7_2013_11_08-source8.patchset index 10b680b0f..6ebc6e320 100644 --- a/dev-lang/openjdk/patches/openjdk-1.7_2013_11_08-source8.patchset +++ b/dev-lang/openjdk/patches/openjdk-1.7_2013_11_08-source8.patchset @@ -1,4 +1,4 @@ -From 2a98aa8f929d5018f35ac90064ebbbf2a64dc27a Mon Sep 17 00:00:00 2001 +From 5cca79ee50fbf704e67d337a16adf66877a976cd Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sat, 9 Nov 2013 02:30:27 +0100 Subject: Defs-haiku.gmk: Fix Haiku specific *_PATH variables @@ -67,7 +67,7 @@ index c1cc440..134e128 100644 1.8.3.4 -From 60b48baf8bd582d783bc12df7d968c166297617b Mon Sep 17 00:00:00 2001 +From cab8b76a94407e51e0a9c665b53f28588e003a8b Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sat, 9 Nov 2013 02:35:20 +0100 Subject: PLATFORM_API_HaikuOS_PCM.cpp: Fix SoundConsumer include @@ -91,7 +91,7 @@ index ec111fc..d69c6a9 100644 1.8.3.4 -From 4da954b7d748decbf8120cb4953a67babbc2ab96 Mon Sep 17 00:00:00 2001 +From f8a888057bba2123556300ca7cb200ff6b0f3186 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sat, 9 Nov 2013 14:52:36 +0100 Subject: Fix freetype paths for Haiku @@ -116,7 +116,7 @@ index a478f97..c0dc0d0 100644 1.8.3.4 -From 99858f834541b5934ca8b34b30c8c43adf2f98f8 Mon Sep 17 00:00:00 2001 +From aad23df8dd37db1f0b5c3cd82cb90bb3f23e303f Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sat, 9 Nov 2013 14:53:56 +0100 Subject: HaikuFontManager: Use BPathFinder API to find font dirs @@ -165,7 +165,7 @@ index a645d00..66af9ab 100644 1.8.3.4 -From 8951c824cd602b066bb51895be71c407c86a8578 Mon Sep 17 00:00:00 2001 +From dcfb77462ec97c8b72c746dcb3d18bf2d488fe62 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 26 Nov 2013 17:50:46 +0100 Subject: Make use of $ORIGIN in rpath now supported in Haiku @@ -233,3 +233,27 @@ index bb0db1e..74e744e 100644 -- 1.8.3.4 + +From d71b1d303b0b6681b76c7557eec6e581734e0a7c Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Wed, 4 Dec 2013 03:23:53 +0100 +Subject: make/java/java/Makefile: Missing generated classes + +Add AUTO_FILES_JAVA_DIRS, so that the auto-generated classes are +picked up. + +diff --git a/make/java/java/Makefile b/make/java/java/Makefile +index 93878e6..bd94e8f 100644 +--- a/make/java/java/Makefile ++++ b/make/java/java/Makefile +@@ -59,6 +59,7 @@ endif + include FILES_c.gmk + include FILES_java.gmk + include Exportedfiles.gmk ++AUTO_FILES_JAVA_DIRS = java/lang + + ifeq ($(PLATFORM),windows) + FILES_java += java/io/Win32FileSystem.java \ +-- +1.8.3.4 + From c814ab396922de0882e0087743265438a56ad05e Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Wed, 4 Dec 2013 03:33:26 +0100 Subject: [PATCH 25/25] openjdk: Fix missing classes in rt.jar We invoke make twice to work around a bug in the build system which causes (some) generated java files not to be picked up and compiled the first time around. The issue is in jdk/make/common/Rules.gmk the way $(JAVA_SOURCE_LIST) is generated. That happens as a side-effect of the */%.class rules which are triggered due to $(FILES_class) being listed as prerequisites of $(JAVA_SOURCE_LIST). That means $(FILES_class) -- which ultimately is based on a shell invocation which finds .java files via find -- is evaluated in the first pass, i.e. long before the generated source files are made. Hence they aren't compiled and will be missing from rt.jar. Running make a second time works around the issue, since the source files will already be present then. --- dev-lang/openjdk/openjdk-1.7_2013_11_08.recipe | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dev-lang/openjdk/openjdk-1.7_2013_11_08.recipe b/dev-lang/openjdk/openjdk-1.7_2013_11_08.recipe index a04ce485c..d32ff7eb5 100644 --- a/dev-lang/openjdk/openjdk-1.7_2013_11_08.recipe +++ b/dev-lang/openjdk/openjdk-1.7_2013_11_08.recipe @@ -171,6 +171,12 @@ export ALT_JDK_IMPORT_PATH=$ALT_BOOTDIR # Build. cd jdk make + + # The build system is broken in that it doesn't pick up all auto-generated + # java sources (it uses "find ... -name '*.java'" too early). Unfortunately + # that isn't easy to fix, so we just run a second make, which will pick up + # the then already existing files. + make } INSTALL()