From c6d2ae4d2ccba2c6a0d2e1d2c58a7f669dabf1d4 Mon Sep 17 00:00:00 2001 From: Theodore Kokkoris Date: Thu, 5 Dec 2013 14:52:15 +0000 Subject: [PATCH 01/13] Add whisper recipe and patch (version 1.2) --- haiku-apps/whisper/patches/whisper-1.2.patch | 400 +++++++++++++++++++ haiku-apps/whisper/whisper-1.2.recipe | 50 +++ 2 files changed, 450 insertions(+) create mode 100644 haiku-apps/whisper/patches/whisper-1.2.patch create mode 100644 haiku-apps/whisper/whisper-1.2.recipe diff --git a/haiku-apps/whisper/patches/whisper-1.2.patch b/haiku-apps/whisper/patches/whisper-1.2.patch new file mode 100644 index 000000000..8c34e0c94 --- /dev/null +++ b/haiku-apps/whisper/patches/whisper-1.2.patch @@ -0,0 +1,400 @@ +diff --git a/Audio/Recorder2.cpp b/Audio/Recorder2.cpp +old mode 100755 +new mode 100644 +index 9e2587f..bc798f5 +--- a/Audio/Recorder2.cpp ++++ b/Audio/Recorder2.cpp +@@ -36,7 +36,7 @@ + + #include + #include +-#include ++#include "locale/Locale.h" + + #include "MediaRecorder.h" + +diff --git a/Audio/ScopeView.cpp b/Audio/ScopeView.cpp +old mode 100755 +new mode 100644 +index 46c6647..f36d076 +--- a/Audio/ScopeView.cpp ++++ b/Audio/ScopeView.cpp +@@ -6,7 +6,7 @@ + #include + + #include // for the memset() +-#include ++#include "locale/Locale.h" + + + ScopeView::ScopeView(BRect frame, bool bShrink) +diff --git a/Audio/SoundControlsView.cpp b/Audio/SoundControlsView.cpp +old mode 100755 +new mode 100644 +index d3117af..4f00ac2 +--- a/Audio/SoundControlsView.cpp ++++ b/Audio/SoundControlsView.cpp +@@ -11,7 +11,7 @@ + #endif + + #include +-#include ++#include "locale/Locale.h" + + SoundControlsView::SoundControlsView(BRect AFrame, bool bShrink) + : ShrinkView(AFrame, (char *) _T("Sound Controls"), bShrink) +diff --git a/Network/client.cpp b/Network/client.cpp +index 7fb44c5..16ea8b8 100755 +--- a/Network/client.cpp ++++ b/Network/client.cpp +@@ -14,7 +14,7 @@ + #include + + #include +-#include ++#include "locale/Locale.h" + + TClient* TClient::m_instance = 0; + +diff --git a/Network/connection.cpp b/Network/connection.cpp +index cafe317..8b8b7ec 100644 +--- a/Network/connection.cpp ++++ b/Network/connection.cpp +@@ -293,7 +293,7 @@ int CConnection::RecvRtcpUdp(char* pchBuffer, int nMaxLen, sockaddr_in& lRemoteA + + lenAddr = sizeof(lRemoteAddress); // OliverESP + // +- int rv = recvfrom(socketRecvRtcpUdp, pchBuffer, nMaxLen, 0, (struct sockaddr *)&lRemoteAddress, &lenAddr); ++ int rv = recvfrom(socketRecvRtcpUdp, pchBuffer, nMaxLen, 0, (struct sockaddr *)&lRemoteAddress, (socklen_t *)&lenAddr); + // int rv = recvfrom(socketRecvRtcpUdp, pchBuffer, nMaxLen, 0, (sockaddr*)&sinRemote, &lenAddr); // OliverESP: following a sure way + + // *lRemoteAddress = (ulong)sinRemote.sin_addr.s_addr; // it updates? don´t need to be done? +diff --git a/Network/network.cpp b/Network/network.cpp +index 3d5a363..ee8a455 100755 +--- a/Network/network.cpp ++++ b/Network/network.cpp +@@ -12,7 +12,7 @@ + #include "Output.h" + #endif + +-#include ++#include "locale/Locale.h" + #include + + +diff --git a/UI/About.cpp b/UI/About.cpp +old mode 100755 +new mode 100644 +index f4e3203..4dd1ffb +--- a/UI/About.cpp ++++ b/UI/About.cpp +@@ -21,7 +21,7 @@ + + #include // experimentals... + //#include "/boot/yt/src/unstable/headers_p/interface/StringView.h" +-#include ++#include "locale/Locale.h" + + // BRect(100,100,220,400) + AboutWindow::AboutWindow() : +diff --git a/UI/BeNetMenu.cpp b/UI/BeNetMenu.cpp +old mode 100755 +new mode 100644 +index 1ec6922..ba39b8c +--- a/UI/BeNetMenu.cpp ++++ b/UI/BeNetMenu.cpp +@@ -6,11 +6,7 @@ + #include "Def.h" + #endif + +-#ifdef ZETA +-#include +-#endif +- +-#include ++#include "locale/Locale.h" + + BeNetMenu::BeNetMenu(BRect frame) + : BMenuBar(frame, "Menu") +@@ -24,14 +20,8 @@ BeNetMenu::BeNetMenu(BRect frame) + m_pFile->AddItem(m_pPreferences = new BMenuItem(_T("Preferences"), new BMessage(MSG_MENU_PREFERENCES), 'P')); + //OliverESP: I think here preferences is better + m_pFile->AddSeparatorItem(); +- m_pFile->AddItem(m_pExit = new BMenuItem(_T("Exit"), new BMessage(MSG_MENU_EXIT), 'X')); +- +-#ifdef ZETA +- BIconMenu* app_menu = new BIconMenu(m_pFile); // Iconified menu app +- AddItem(app_menu); +-#else +- AddItem(m_pFile); // Standard menu app +-#endif ++ m_pFile->AddItem(m_pExit = new BMenuItem(_T("Exit"), new BMessage(MSG_MENU_EXIT), 'X')); ++ AddItem(m_pFile); + + + +diff --git a/UI/BeNetWindow.cpp b/UI/BeNetWindow.cpp +index 63f7943..20b9125 100644 +--- a/UI/BeNetWindow.cpp ++++ b/UI/BeNetWindow.cpp +@@ -30,7 +30,7 @@ + //#include // OliverESP: not needed thanks IRA + #include + +-#include ++#include "locale/Locale.h" + + BeNetWindow::BeNetWindow() : + BWindow(BRect(0,0,230,209),_T("Whisper"), B_TITLED_WINDOW, B_NOT_RESIZABLE | B_NOT_ZOOMABLE), +diff --git a/UI/BookmarksShortcut.cpp b/UI/BookmarksShortcut.cpp +old mode 100755 +new mode 100644 +index 2d9e670..e564b5c +--- a/UI/BookmarksShortcut.cpp ++++ b/UI/BookmarksShortcut.cpp +@@ -1,4 +1,4 @@ +-#include ++#include "locale/Locale.h" + + #ifndef _BookmarksShortcut_h_ + #include "BookmarksShortcut.h" +diff --git a/UI/BookmarksWindow.cpp b/UI/BookmarksWindow.cpp +old mode 100755 +new mode 100644 +index e36fe47..ff005ea +--- a/UI/BookmarksWindow.cpp ++++ b/UI/BookmarksWindow.cpp +@@ -7,7 +7,7 @@ + #endif + + #include +-#include ++#include "locale/Locale.h" + + #include "CLVEasyItem.h" + +diff --git a/UI/ConnectView.cpp b/UI/ConnectView.cpp +old mode 100755 +new mode 100644 +index d8d5d52..97a4647 +--- a/UI/ConnectView.cpp ++++ b/UI/ConnectView.cpp +@@ -38,7 +38,7 @@ + #include + #include + +-#include ++#include "locale/Locale.h" + #include + #include + +diff --git a/UI/InformationView.cpp b/UI/InformationView.cpp +old mode 100755 +new mode 100644 +index 9078284..e0f4cf1 +--- a/UI/InformationView.cpp ++++ b/UI/InformationView.cpp +@@ -1,4 +1,4 @@ +-#include ++#include "locale/Locale.h" + + #ifndef __INFORMATION_VIEW__ + #include "InformationView.h" +diff --git a/UI/OsciloscopeView.cpp b/UI/OsciloscopeView.cpp +old mode 100755 +new mode 100644 +index 363bfef..7969012 +--- a/UI/OsciloscopeView.cpp ++++ b/UI/OsciloscopeView.cpp +@@ -1,4 +1,4 @@ +-#include ++#include "locale/Locale.h" + + #ifndef _PictureView_h + #include "OsciloscopeView.h" +diff --git a/UI/PictureView.cpp b/UI/PictureView.cpp +old mode 100755 +new mode 100644 +index fe442de..dea6ac4 +--- a/UI/PictureView.cpp ++++ b/UI/PictureView.cpp +@@ -1,4 +1,4 @@ +-#include ++#include "locale/Locale.h" + + #ifndef _PictureView_h + #include "PictureView.h" +diff --git a/UI/PreferencesViews.cpp b/UI/PreferencesViews.cpp +old mode 100755 +new mode 100644 +index fa1b510..a291843 +--- a/UI/PreferencesViews.cpp ++++ b/UI/PreferencesViews.cpp +@@ -17,7 +17,7 @@ + #endif + + #include +-#include ++#include "locale/Locale.h" + + /************************************/ + /* General Preferences */ +diff --git a/UI/PreferencesWindow.cpp b/UI/PreferencesWindow.cpp +old mode 100755 +new mode 100644 +index d6185ba..4e6057c +--- a/UI/PreferencesWindow.cpp ++++ b/UI/PreferencesWindow.cpp +@@ -12,7 +12,7 @@ + + //#include + #include +-#include ++#include "locale/Locale.h" + + PreferencesWindow::PreferencesWindow() + : BWindow(BRect(0,0,280,175), _T("Preferences"), B_TITLED_WINDOW, B_NOT_RESIZABLE | B_NOT_ZOOMABLE) +diff --git a/UI/RemoteWindow.cpp b/UI/RemoteWindow.cpp +old mode 100755 +new mode 100644 +index f38514d..e29e1d2 +--- a/UI/RemoteWindow.cpp ++++ b/UI/RemoteWindow.cpp +@@ -18,7 +18,7 @@ + #include "network.h" + #endif + +-#include ++#include "locale/Locale.h" + + RemoteWindow::RemoteWindow(BeNetWindow* window) : + BWindow(BRect(0,0,0,0), "RemoteUser", B_TITLED_WINDOW_LOOK, B_NORMAL_WINDOW_FEEL, B_NOT_RESIZABLE | B_NOT_ZOOMABLE, B_CURRENT_WORKSPACE), +diff --git a/UI/StatusBar.cpp b/UI/StatusBar.cpp +old mode 100755 +new mode 100644 +index d26da7a..4b8cacb +--- a/UI/StatusBar.cpp ++++ b/UI/StatusBar.cpp +@@ -15,7 +15,7 @@ + #endif + + #include +-#include ++#include "locale/Locale.h" + + StatusBar::StatusBar(BRect frame) : + BView(frame, "StatusBar", B_FOLLOW_NONE, B_WILL_DRAW) +diff --git a/UI/ToolBarView.cpp b/UI/ToolBarView.cpp +old mode 100755 +new mode 100644 +index c3ccea7..2160f63 +--- a/UI/ToolBarView.cpp ++++ b/UI/ToolBarView.cpp +@@ -14,7 +14,7 @@ + #include "BitmapCatalog.h" + #endif + +-#include ++#include "locale/Locale.h" + + ToolBarView::ToolBarView(BRect frame) : + BView(frame, "ToolBarView", 0, B_WILL_DRAW) +diff --git a/UI/WaitWindow.cpp b/UI/WaitWindow.cpp +old mode 100755 +new mode 100644 +index e9397d7..a499ae3 +--- a/UI/WaitWindow.cpp ++++ b/UI/WaitWindow.cpp +@@ -8,7 +8,7 @@ + + #include + #include +-#include ++#include "locale/Locale.h" + + WaitWindow::WaitWindow() : + BWindow(BRect(300,300,500,350), "Connecting...",B_MODAL_WINDOW_LOOK, B_MODAL_APP_WINDOW_FEEL, B_NOT_RESIZABLE | B_NOT_ZOOMABLE, B_CURRENT_WORKSPACE) +diff --git a/UI/email/BeNetMailIPPictureView.cpp b/UI/email/BeNetMailIPPictureView.cpp +old mode 100755 +new mode 100644 +index 06db74a..699d94a +--- a/UI/email/BeNetMailIPPictureView.cpp ++++ b/UI/email/BeNetMailIPPictureView.cpp +@@ -1,5 +1,3 @@ +-#include +- + /***********************************************************************************************\ + * BeNetMailIPInfoView.h * + ************************************************************************************************* +@@ -16,6 +14,8 @@ + #include "BitmapCatalog.h" + #endif + ++#include "locale/Locale.h" ++ + /*=============================================================================================*\ + | BeNetMailIPPictureView | + +-----------------------------------------------------------------------------------------------+ +diff --git a/UI/email/EMailIP.cpp b/UI/email/EMailIP.cpp +index bbe4c14..444e179 100755 +--- a/UI/email/EMailIP.cpp ++++ b/UI/email/EMailIP.cpp +@@ -6,6 +6,9 @@ + #include + #include + #include ++#include ++ ++#include + + #include + #include +@@ -46,7 +49,7 @@ bool EMailIP::SendIP(char * pzMailTo, char * pzMyNickName, char * pzMyIPAddress, + { + return true; + } +- send_queued_mail(); ++ BMailDaemon::SendQueuedMail(); + return false; + } + +@@ -60,8 +63,9 @@ PEOPLE_ID_NODE * EMailIP::CheckMail(bool bCheckAll) + int32 iResult = 0; + m_pFirstID = NULL; + +- check_for_mail(&iResult); +- if(!bCheckAll && iResult == 0) ++ status_t err = BMailDaemon::CheckMail(true); ++ iResult = BMailDaemon::CountNewMessages(true); ++ if(!bCheckAll && (iResult == 0 || err < B_OK)) + { + return NULL; + } +@@ -221,7 +225,7 @@ PEOPLE_ID_NODE* EMailIP::GetInfo(BFile * pFile) + + size = pFile->Read(pzBuffer, 64000); + +- size = decode_base64(pzBufferOut, pzBuffer, size, false); ++ size = decode_base64(pzBufferOut, pzBuffer, size); + filePicture.Write(pzBufferOut, size); + + filePicture.Unset(); +diff --git a/makefile b/makefile +index 329245e..1c55f17 100644 +--- a/makefile ++++ b/makefile +@@ -119,7 +119,6 @@ LIBS := \ + translation \ + media \ + socket \ +- zeta \ + bind \ + be \ + stdc++.r4 +@@ -295,5 +294,5 @@ LANG_FILES := $(wildcard Language/Dictionaries/$(NAME).*) + # ie: Language/Dictionaries + LANG_FILES_DIR := Language/Dictionaries + +-include /boot/develop/etc/makefile-engine ++include ${BUILDHOME}/etc/makefile-engine + diff --git a/haiku-apps/whisper/whisper-1.2.recipe b/haiku-apps/whisper/whisper-1.2.recipe new file mode 100644 index 000000000..0e316aa2e --- /dev/null +++ b/haiku-apps/whisper/whisper-1.2.recipe @@ -0,0 +1,50 @@ +DESCRIPTION="Whisper BeNet aims to provide a VoIP solution to the Haiku Platform. It was ported from ZETA." +SUMMARY="VoIP for Haiku" +COPYRIGHT=" + 1998-2001 the BeNet team + 2004-2006 Bernd Korz & Oliver Ruiz Dorantes oliver.ruiz.dorantes@gmail.com + 2008 Oliver Ruiz Dorantes oliver.ruiz.dorantes@gmail.com + " +LICENSE="MIT" +HOMEPAGE="https://github.com/HaikuArchives/WhisperBeNet" +SRC_URI="git+https://github.com/HaikuArchives/WhisperBeNet#1e4d59c" +REVISION="1" + +ARCHITECTURES="x86_gcc2 x86 ?x86_64" + +PROVIDES=" + whisper = $portVersion + app:whisper = $portVersion + " + +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + " + +BUILD_PREREQUIRES=" + makefile_engine + cmd:gcc + cmd:make + cmd:mkdepend + " + +PATCHES="whisper-1.2.patch" + +USER_SETTINGS_FILES=" + settings/BeNet directory" + +BUILD() +{ + make BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` +} + +INSTALL() +{ + architecture=`echo $buildArchitecture | sed 's/_/-/g'` + + mkdir -p $appsDir/Whisper + + cd objects.$architecture-debug + cp Whisper $appsDir/Whisper + addAppDeskbarSymlink $appsDir/Whisper/Whisper +} From 7a95ada75f46e0e5f5e9cf3f208984d8a49e42d6 Mon Sep 17 00:00:00 2001 From: Theodore Kokkoris Date: Thu, 5 Dec 2013 18:49:07 +0000 Subject: [PATCH 02/13] Removed patch --- haiku-apps/whisper/patches/whisper-1.2.patch | 400 ------------------- haiku-apps/whisper/whisper-1.2.recipe | 4 +- 2 files changed, 1 insertion(+), 403 deletions(-) delete mode 100644 haiku-apps/whisper/patches/whisper-1.2.patch diff --git a/haiku-apps/whisper/patches/whisper-1.2.patch b/haiku-apps/whisper/patches/whisper-1.2.patch deleted file mode 100644 index 8c34e0c94..000000000 --- a/haiku-apps/whisper/patches/whisper-1.2.patch +++ /dev/null @@ -1,400 +0,0 @@ -diff --git a/Audio/Recorder2.cpp b/Audio/Recorder2.cpp -old mode 100755 -new mode 100644 -index 9e2587f..bc798f5 ---- a/Audio/Recorder2.cpp -+++ b/Audio/Recorder2.cpp -@@ -36,7 +36,7 @@ - - #include - #include --#include -+#include "locale/Locale.h" - - #include "MediaRecorder.h" - -diff --git a/Audio/ScopeView.cpp b/Audio/ScopeView.cpp -old mode 100755 -new mode 100644 -index 46c6647..f36d076 ---- a/Audio/ScopeView.cpp -+++ b/Audio/ScopeView.cpp -@@ -6,7 +6,7 @@ - #include - - #include // for the memset() --#include -+#include "locale/Locale.h" - - - ScopeView::ScopeView(BRect frame, bool bShrink) -diff --git a/Audio/SoundControlsView.cpp b/Audio/SoundControlsView.cpp -old mode 100755 -new mode 100644 -index d3117af..4f00ac2 ---- a/Audio/SoundControlsView.cpp -+++ b/Audio/SoundControlsView.cpp -@@ -11,7 +11,7 @@ - #endif - - #include --#include -+#include "locale/Locale.h" - - SoundControlsView::SoundControlsView(BRect AFrame, bool bShrink) - : ShrinkView(AFrame, (char *) _T("Sound Controls"), bShrink) -diff --git a/Network/client.cpp b/Network/client.cpp -index 7fb44c5..16ea8b8 100755 ---- a/Network/client.cpp -+++ b/Network/client.cpp -@@ -14,7 +14,7 @@ - #include - - #include --#include -+#include "locale/Locale.h" - - TClient* TClient::m_instance = 0; - -diff --git a/Network/connection.cpp b/Network/connection.cpp -index cafe317..8b8b7ec 100644 ---- a/Network/connection.cpp -+++ b/Network/connection.cpp -@@ -293,7 +293,7 @@ int CConnection::RecvRtcpUdp(char* pchBuffer, int nMaxLen, sockaddr_in& lRemoteA - - lenAddr = sizeof(lRemoteAddress); // OliverESP - // -- int rv = recvfrom(socketRecvRtcpUdp, pchBuffer, nMaxLen, 0, (struct sockaddr *)&lRemoteAddress, &lenAddr); -+ int rv = recvfrom(socketRecvRtcpUdp, pchBuffer, nMaxLen, 0, (struct sockaddr *)&lRemoteAddress, (socklen_t *)&lenAddr); - // int rv = recvfrom(socketRecvRtcpUdp, pchBuffer, nMaxLen, 0, (sockaddr*)&sinRemote, &lenAddr); // OliverESP: following a sure way - - // *lRemoteAddress = (ulong)sinRemote.sin_addr.s_addr; // it updates? don´t need to be done? -diff --git a/Network/network.cpp b/Network/network.cpp -index 3d5a363..ee8a455 100755 ---- a/Network/network.cpp -+++ b/Network/network.cpp -@@ -12,7 +12,7 @@ - #include "Output.h" - #endif - --#include -+#include "locale/Locale.h" - #include - - -diff --git a/UI/About.cpp b/UI/About.cpp -old mode 100755 -new mode 100644 -index f4e3203..4dd1ffb ---- a/UI/About.cpp -+++ b/UI/About.cpp -@@ -21,7 +21,7 @@ - - #include // experimentals... - //#include "/boot/yt/src/unstable/headers_p/interface/StringView.h" --#include -+#include "locale/Locale.h" - - // BRect(100,100,220,400) - AboutWindow::AboutWindow() : -diff --git a/UI/BeNetMenu.cpp b/UI/BeNetMenu.cpp -old mode 100755 -new mode 100644 -index 1ec6922..ba39b8c ---- a/UI/BeNetMenu.cpp -+++ b/UI/BeNetMenu.cpp -@@ -6,11 +6,7 @@ - #include "Def.h" - #endif - --#ifdef ZETA --#include --#endif -- --#include -+#include "locale/Locale.h" - - BeNetMenu::BeNetMenu(BRect frame) - : BMenuBar(frame, "Menu") -@@ -24,14 +20,8 @@ BeNetMenu::BeNetMenu(BRect frame) - m_pFile->AddItem(m_pPreferences = new BMenuItem(_T("Preferences"), new BMessage(MSG_MENU_PREFERENCES), 'P')); - //OliverESP: I think here preferences is better - m_pFile->AddSeparatorItem(); -- m_pFile->AddItem(m_pExit = new BMenuItem(_T("Exit"), new BMessage(MSG_MENU_EXIT), 'X')); -- --#ifdef ZETA -- BIconMenu* app_menu = new BIconMenu(m_pFile); // Iconified menu app -- AddItem(app_menu); --#else -- AddItem(m_pFile); // Standard menu app --#endif -+ m_pFile->AddItem(m_pExit = new BMenuItem(_T("Exit"), new BMessage(MSG_MENU_EXIT), 'X')); -+ AddItem(m_pFile); - - - -diff --git a/UI/BeNetWindow.cpp b/UI/BeNetWindow.cpp -index 63f7943..20b9125 100644 ---- a/UI/BeNetWindow.cpp -+++ b/UI/BeNetWindow.cpp -@@ -30,7 +30,7 @@ - //#include // OliverESP: not needed thanks IRA - #include - --#include -+#include "locale/Locale.h" - - BeNetWindow::BeNetWindow() : - BWindow(BRect(0,0,230,209),_T("Whisper"), B_TITLED_WINDOW, B_NOT_RESIZABLE | B_NOT_ZOOMABLE), -diff --git a/UI/BookmarksShortcut.cpp b/UI/BookmarksShortcut.cpp -old mode 100755 -new mode 100644 -index 2d9e670..e564b5c ---- a/UI/BookmarksShortcut.cpp -+++ b/UI/BookmarksShortcut.cpp -@@ -1,4 +1,4 @@ --#include -+#include "locale/Locale.h" - - #ifndef _BookmarksShortcut_h_ - #include "BookmarksShortcut.h" -diff --git a/UI/BookmarksWindow.cpp b/UI/BookmarksWindow.cpp -old mode 100755 -new mode 100644 -index e36fe47..ff005ea ---- a/UI/BookmarksWindow.cpp -+++ b/UI/BookmarksWindow.cpp -@@ -7,7 +7,7 @@ - #endif - - #include --#include -+#include "locale/Locale.h" - - #include "CLVEasyItem.h" - -diff --git a/UI/ConnectView.cpp b/UI/ConnectView.cpp -old mode 100755 -new mode 100644 -index d8d5d52..97a4647 ---- a/UI/ConnectView.cpp -+++ b/UI/ConnectView.cpp -@@ -38,7 +38,7 @@ - #include - #include - --#include -+#include "locale/Locale.h" - #include - #include - -diff --git a/UI/InformationView.cpp b/UI/InformationView.cpp -old mode 100755 -new mode 100644 -index 9078284..e0f4cf1 ---- a/UI/InformationView.cpp -+++ b/UI/InformationView.cpp -@@ -1,4 +1,4 @@ --#include -+#include "locale/Locale.h" - - #ifndef __INFORMATION_VIEW__ - #include "InformationView.h" -diff --git a/UI/OsciloscopeView.cpp b/UI/OsciloscopeView.cpp -old mode 100755 -new mode 100644 -index 363bfef..7969012 ---- a/UI/OsciloscopeView.cpp -+++ b/UI/OsciloscopeView.cpp -@@ -1,4 +1,4 @@ --#include -+#include "locale/Locale.h" - - #ifndef _PictureView_h - #include "OsciloscopeView.h" -diff --git a/UI/PictureView.cpp b/UI/PictureView.cpp -old mode 100755 -new mode 100644 -index fe442de..dea6ac4 ---- a/UI/PictureView.cpp -+++ b/UI/PictureView.cpp -@@ -1,4 +1,4 @@ --#include -+#include "locale/Locale.h" - - #ifndef _PictureView_h - #include "PictureView.h" -diff --git a/UI/PreferencesViews.cpp b/UI/PreferencesViews.cpp -old mode 100755 -new mode 100644 -index fa1b510..a291843 ---- a/UI/PreferencesViews.cpp -+++ b/UI/PreferencesViews.cpp -@@ -17,7 +17,7 @@ - #endif - - #include --#include -+#include "locale/Locale.h" - - /************************************/ - /* General Preferences */ -diff --git a/UI/PreferencesWindow.cpp b/UI/PreferencesWindow.cpp -old mode 100755 -new mode 100644 -index d6185ba..4e6057c ---- a/UI/PreferencesWindow.cpp -+++ b/UI/PreferencesWindow.cpp -@@ -12,7 +12,7 @@ - - //#include - #include --#include -+#include "locale/Locale.h" - - PreferencesWindow::PreferencesWindow() - : BWindow(BRect(0,0,280,175), _T("Preferences"), B_TITLED_WINDOW, B_NOT_RESIZABLE | B_NOT_ZOOMABLE) -diff --git a/UI/RemoteWindow.cpp b/UI/RemoteWindow.cpp -old mode 100755 -new mode 100644 -index f38514d..e29e1d2 ---- a/UI/RemoteWindow.cpp -+++ b/UI/RemoteWindow.cpp -@@ -18,7 +18,7 @@ - #include "network.h" - #endif - --#include -+#include "locale/Locale.h" - - RemoteWindow::RemoteWindow(BeNetWindow* window) : - BWindow(BRect(0,0,0,0), "RemoteUser", B_TITLED_WINDOW_LOOK, B_NORMAL_WINDOW_FEEL, B_NOT_RESIZABLE | B_NOT_ZOOMABLE, B_CURRENT_WORKSPACE), -diff --git a/UI/StatusBar.cpp b/UI/StatusBar.cpp -old mode 100755 -new mode 100644 -index d26da7a..4b8cacb ---- a/UI/StatusBar.cpp -+++ b/UI/StatusBar.cpp -@@ -15,7 +15,7 @@ - #endif - - #include --#include -+#include "locale/Locale.h" - - StatusBar::StatusBar(BRect frame) : - BView(frame, "StatusBar", B_FOLLOW_NONE, B_WILL_DRAW) -diff --git a/UI/ToolBarView.cpp b/UI/ToolBarView.cpp -old mode 100755 -new mode 100644 -index c3ccea7..2160f63 ---- a/UI/ToolBarView.cpp -+++ b/UI/ToolBarView.cpp -@@ -14,7 +14,7 @@ - #include "BitmapCatalog.h" - #endif - --#include -+#include "locale/Locale.h" - - ToolBarView::ToolBarView(BRect frame) : - BView(frame, "ToolBarView", 0, B_WILL_DRAW) -diff --git a/UI/WaitWindow.cpp b/UI/WaitWindow.cpp -old mode 100755 -new mode 100644 -index e9397d7..a499ae3 ---- a/UI/WaitWindow.cpp -+++ b/UI/WaitWindow.cpp -@@ -8,7 +8,7 @@ - - #include - #include --#include -+#include "locale/Locale.h" - - WaitWindow::WaitWindow() : - BWindow(BRect(300,300,500,350), "Connecting...",B_MODAL_WINDOW_LOOK, B_MODAL_APP_WINDOW_FEEL, B_NOT_RESIZABLE | B_NOT_ZOOMABLE, B_CURRENT_WORKSPACE) -diff --git a/UI/email/BeNetMailIPPictureView.cpp b/UI/email/BeNetMailIPPictureView.cpp -old mode 100755 -new mode 100644 -index 06db74a..699d94a ---- a/UI/email/BeNetMailIPPictureView.cpp -+++ b/UI/email/BeNetMailIPPictureView.cpp -@@ -1,5 +1,3 @@ --#include -- - /***********************************************************************************************\ - * BeNetMailIPInfoView.h * - ************************************************************************************************* -@@ -16,6 +14,8 @@ - #include "BitmapCatalog.h" - #endif - -+#include "locale/Locale.h" -+ - /*=============================================================================================*\ - | BeNetMailIPPictureView | - +-----------------------------------------------------------------------------------------------+ -diff --git a/UI/email/EMailIP.cpp b/UI/email/EMailIP.cpp -index bbe4c14..444e179 100755 ---- a/UI/email/EMailIP.cpp -+++ b/UI/email/EMailIP.cpp -@@ -6,6 +6,9 @@ - #include - #include - #include -+#include -+ -+#include - - #include - #include -@@ -46,7 +49,7 @@ bool EMailIP::SendIP(char * pzMailTo, char * pzMyNickName, char * pzMyIPAddress, - { - return true; - } -- send_queued_mail(); -+ BMailDaemon::SendQueuedMail(); - return false; - } - -@@ -60,8 +63,9 @@ PEOPLE_ID_NODE * EMailIP::CheckMail(bool bCheckAll) - int32 iResult = 0; - m_pFirstID = NULL; - -- check_for_mail(&iResult); -- if(!bCheckAll && iResult == 0) -+ status_t err = BMailDaemon::CheckMail(true); -+ iResult = BMailDaemon::CountNewMessages(true); -+ if(!bCheckAll && (iResult == 0 || err < B_OK)) - { - return NULL; - } -@@ -221,7 +225,7 @@ PEOPLE_ID_NODE* EMailIP::GetInfo(BFile * pFile) - - size = pFile->Read(pzBuffer, 64000); - -- size = decode_base64(pzBufferOut, pzBuffer, size, false); -+ size = decode_base64(pzBufferOut, pzBuffer, size); - filePicture.Write(pzBufferOut, size); - - filePicture.Unset(); -diff --git a/makefile b/makefile -index 329245e..1c55f17 100644 ---- a/makefile -+++ b/makefile -@@ -119,7 +119,6 @@ LIBS := \ - translation \ - media \ - socket \ -- zeta \ - bind \ - be \ - stdc++.r4 -@@ -295,5 +294,5 @@ LANG_FILES := $(wildcard Language/Dictionaries/$(NAME).*) - # ie: Language/Dictionaries - LANG_FILES_DIR := Language/Dictionaries - --include /boot/develop/etc/makefile-engine -+include ${BUILDHOME}/etc/makefile-engine - diff --git a/haiku-apps/whisper/whisper-1.2.recipe b/haiku-apps/whisper/whisper-1.2.recipe index 0e316aa2e..a800305ff 100644 --- a/haiku-apps/whisper/whisper-1.2.recipe +++ b/haiku-apps/whisper/whisper-1.2.recipe @@ -7,7 +7,7 @@ COPYRIGHT=" " LICENSE="MIT" HOMEPAGE="https://github.com/HaikuArchives/WhisperBeNet" -SRC_URI="git+https://github.com/HaikuArchives/WhisperBeNet#1e4d59c" +SRC_URI="git+https://github.com/HaikuArchives/WhisperBeNet#b97da46" REVISION="1" ARCHITECTURES="x86_gcc2 x86 ?x86_64" @@ -28,8 +28,6 @@ BUILD_PREREQUIRES=" cmd:mkdepend " -PATCHES="whisper-1.2.patch" - USER_SETTINGS_FILES=" settings/BeNet directory" From 39a735f6316d234af90ac2c2f7cccbe9d4526758 Mon Sep 17 00:00:00 2001 From: tgkokk Date: Fri, 6 Dec 2013 05:42:10 +0000 Subject: [PATCH 03/13] Removed unnecessary directory --- haiku-apps/whisper/whisper-1.2.recipe | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/haiku-apps/whisper/whisper-1.2.recipe b/haiku-apps/whisper/whisper-1.2.recipe index a800305ff..5eb087cba 100644 --- a/haiku-apps/whisper/whisper-1.2.recipe +++ b/haiku-apps/whisper/whisper-1.2.recipe @@ -40,9 +40,9 @@ INSTALL() { architecture=`echo $buildArchitecture | sed 's/_/-/g'` - mkdir -p $appsDir/Whisper + mkdir -p $appsDir cd objects.$architecture-debug - cp Whisper $appsDir/Whisper - addAppDeskbarSymlink $appsDir/Whisper/Whisper + cp Whisper $appsDir + addAppDeskbarSymlink $appsDir/Whisper } From ff2591246d45f973c2ec4a648193752cdbe442b6 Mon Sep 17 00:00:00 2001 From: Theodore Kokkoris Date: Fri, 6 Dec 2013 20:25:31 +0000 Subject: [PATCH 04/13] Updated recipe file; currently doesn't work --- haiku-apps/whisper/whisper-1.2.recipe | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/haiku-apps/whisper/whisper-1.2.recipe b/haiku-apps/whisper/whisper-1.2.recipe index 5eb087cba..1944ee0b8 100644 --- a/haiku-apps/whisper/whisper-1.2.recipe +++ b/haiku-apps/whisper/whisper-1.2.recipe @@ -7,7 +7,7 @@ COPYRIGHT=" " LICENSE="MIT" HOMEPAGE="https://github.com/HaikuArchives/WhisperBeNet" -SRC_URI="git+https://github.com/HaikuArchives/WhisperBeNet#b97da46" +SRC_URI="git+https://github.com/HaikuArchives/WhisperBeNet#832724f" REVISION="1" ARCHITECTURES="x86_gcc2 x86 ?x86_64" @@ -33,7 +33,8 @@ USER_SETTINGS_FILES=" BUILD() { - make BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` + rc -o BeNet.rsrc BeNet.rdef + make -j$jobArgs BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` LIBSTDC=stdc++.r4 } INSTALL() From 5acc582f85fb3c6001b2095aff6cd18dc69c4150 Mon Sep 17 00:00:00 2001 From: Theodore Kokkoris Date: Sat, 7 Dec 2013 08:43:49 +0000 Subject: [PATCH 05/13] Fixed recipe file --- haiku-apps/whisper/whisper-1.2.recipe | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/haiku-apps/whisper/whisper-1.2.recipe b/haiku-apps/whisper/whisper-1.2.recipe index 1944ee0b8..a7065c7af 100644 --- a/haiku-apps/whisper/whisper-1.2.recipe +++ b/haiku-apps/whisper/whisper-1.2.recipe @@ -7,7 +7,7 @@ COPYRIGHT=" " LICENSE="MIT" HOMEPAGE="https://github.com/HaikuArchives/WhisperBeNet" -SRC_URI="git+https://github.com/HaikuArchives/WhisperBeNet#832724f" +SRC_URI="git+https://github.com/HaikuArchives/WhisperBeNet#902635a" REVISION="1" ARCHITECTURES="x86_gcc2 x86 ?x86_64" @@ -34,16 +34,14 @@ USER_SETTINGS_FILES=" BUILD() { rc -o BeNet.rsrc BeNet.rdef - make -j$jobArgs BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` LIBSTDC=stdc++.r4 + make -j$jobArgs BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` STDCPPLIBS=stdc++.r4 OBJ_DIR=build } INSTALL() { - architecture=`echo $buildArchitecture | sed 's/_/-/g'` - mkdir -p $appsDir - cd objects.$architecture-debug + cd build cp Whisper $appsDir addAppDeskbarSymlink $appsDir/Whisper } From 9e81711a81051058ad0b1fe907591e2f9d830d7e Mon Sep 17 00:00:00 2001 From: tgkokk Date: Sat, 7 Dec 2013 17:31:12 +0000 Subject: [PATCH 06/13] Removed -j argument --- haiku-apps/whisper/whisper-1.2.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/haiku-apps/whisper/whisper-1.2.recipe b/haiku-apps/whisper/whisper-1.2.recipe index a7065c7af..8616204e1 100644 --- a/haiku-apps/whisper/whisper-1.2.recipe +++ b/haiku-apps/whisper/whisper-1.2.recipe @@ -34,7 +34,7 @@ USER_SETTINGS_FILES=" BUILD() { rc -o BeNet.rsrc BeNet.rdef - make -j$jobArgs BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` STDCPPLIBS=stdc++.r4 OBJ_DIR=build + make $jobArgs BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` } INSTALL() From 5fedbdaca7942be94d109035522aac765acf36ad Mon Sep 17 00:00:00 2001 From: Michael Lotz Date: Sat, 7 Dec 2013 20:34:44 +0000 Subject: [PATCH 07/13] Convert pixman 0.20.0 recipe to actual recipe. --- x11-libs/pixman/pixman-0.20.0.recipe | 96 ++++++++++++++++++++-------- 1 file changed, 71 insertions(+), 25 deletions(-) diff --git a/x11-libs/pixman/pixman-0.20.0.recipe b/x11-libs/pixman/pixman-0.20.0.recipe index ffa1be8dd..e0ccec93a 100644 --- a/x11-libs/pixman/pixman-0.20.0.recipe +++ b/x11-libs/pixman/pixman-0.20.0.recipe @@ -1,32 +1,8 @@ +SUMMARY="pixman" DESCRIPTION="Pixman - The pixel-manipulation library for X and cairo" HOMEPAGE="http://cgit.freedesktop.org/pixman/" SRC_URI="http://cairographics.org/releases/pixman-0.20.0.tar.gz" CHECKSUM_MD5="c1a31d5cedfa97c5af7148a2d1fd4356" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd pixman-0.20.0 - libtoolize --force --copy --install - aclocal - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL() -{ - cd pixman-0.20.0 - make install -} - -TEST() -{ - cd pixman-0.20.0 - make check -} - LICENSE="MIT" COPYRIGHT="1987-1998 The Open Group 1987-1989 Digital Equipment Corporation @@ -34,3 +10,73 @@ COPYRIGHT="1987-1998 The Open Group 2004-2010 Red Hat, Inc. 2009-2010 Sun Microsystems, Inc. and many others" + +REVISION="1" + +ARCHITECTURES="x86" +SECONDARY_ARCHITECTURES="x86" + +PROVIDES=" + pixman$secondaryArchSuffix = $portVersion + lib:libpixman_1$secondaryArchSuffix = $portVersion + " + +PROVIDES_devel=" + pixman${secondaryArchSuffix}_devel = $portVersion + devel:libpixman_1$secondaryArchSuffix = $portVersion + " + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + " + +REQUIRES_devel=" + pixman$secondaryArchSuffix == $portVersion base + " + +BUILD_REQUIRES=" + " + +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:aclocal + cmd:autoconf + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize + cmd:make + cmd:perl + cmd:pkg_config + " + +PATCH() +{ + sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac +} + +BUILD() +{ + aclocal + libtoolize --force --copy --install + automake --add-missing + autoconf + runConfigure ./configure + make $jobArgs +} + +INSTALL() +{ + make install + + prepareInstalledDevelLibs libpixman-1 + + fixPkgconfig + + packageEntries devel \ + $developDir +} + +TEST() +{ + make check +} From fce154625b9b565a34471023466efce05887648b Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Sat, 7 Dec 2013 21:09:37 +0000 Subject: [PATCH 08/13] Add BeIndexed recipe --- .../beindexed/beindexed-0.2.0_alpha.recipe | 67 +++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 haiku-apps/beindexed/beindexed-0.2.0_alpha.recipe diff --git a/haiku-apps/beindexed/beindexed-0.2.0_alpha.recipe b/haiku-apps/beindexed/beindexed-0.2.0_alpha.recipe new file mode 100644 index 000000000..2ac0c14bd --- /dev/null +++ b/haiku-apps/beindexed/beindexed-0.2.0_alpha.recipe @@ -0,0 +1,67 @@ +SUMMARY="Search through your files with ease!" + +DESCRIPTION=" + BeIndexed searches all your files and builds a database with + their content. You can then search for files by content, + like on Google etc. Index files with Indexer, Find files with + Finder. + " + +HOMEPAGE="https://github.com/HaikuArchives/BeIndexed" #Or web.archive.org and eiman.tv/BeIndexed +SRC_URI="git://github.com/HaikuArchives/BeIndexed.git#4bbd3e9709d7288ffefbc215ab41a152a24a2276" + +REVISION="1" + +LICENSE="BSD (3-clause)" +COPYRIGHT="2003 Mikael Eiman" + +ARCHITECTURES="x86_gcc2 x86" + + +PROVIDES=" + beindexed = $portVersion + app:Finder = $portVersion + cmd:Indexer = $portVersion + " + +REQUIRES=" + haiku >= $haikuVersion + lib:libsqlite3 + lib:liblayout + " + +BUILD_PREREQUIRES=" + makefile_engine + cmd:g++ + cmd:xres + cmd:make + cmd:mkdepend + " + +BUILD_REQUIRES=" + makefile_engine + haiku_devel >= $haikuVersion + devel:libsqlite3 + devel:liblayout + " + +USER_SETTINGS_FILES=" + data/BeIndexed directory + " + +BUILD() +{ + mkdir bin || true + make +} + +INSTALL() +{ + mkdir -p $binDir + mkdir -p $appsDir + + cp bin/Indexer $binDir + cp bin/Finder $appsDir + + addAppDeskbarSymlink $appsDir/Finder +} From cfdced4d7fd2ab1afa1c8ce171729da7cf5c26ed Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sun, 8 Dec 2013 02:30:54 +0100 Subject: [PATCH 09/13] openjdk: Fix data/profile.d/openjdk.sh Quoting was missing, so we'd always get an empty JAVA_HOME. --- dev-lang/openjdk/openjdk-1.7_2013_11_08.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 39f1085dd..8d2d49743 100644 --- a/dev-lang/openjdk/openjdk-1.7_2013_11_08.recipe +++ b/dev-lang/openjdk/openjdk-1.7_2013_11_08.recipe @@ -202,6 +202,6 @@ INSTALL() # create a profile.d file that sets up JAVA_HOME jdkProfile=$dataDir/profile.d/openjdk.sh mkdir -p $(dirname $jdkProfile) - echo JAVA_HOME=`java-config -H` > $jdkProfile + echo 'JAVA_HOME=`java-config -H`' > $jdkProfile echo "export JAVA_HOME" >> $jdkProfile } From 01a223c88a43d1d77247f9dc7b77455b8da9a10c Mon Sep 17 00:00:00 2001 From: Michael Lotz Date: Sun, 8 Dec 2013 02:41:24 +0000 Subject: [PATCH 10/13] Convert bison-2.5 to recipe but marked untested on x86 only. It builds and works on x86, but won't build on x86_gcc2 due to C99. --- sys-devel/bison/bison-2.5.recipe | 67 ++++++++++++++++++++++++-------- 1 file changed, 51 insertions(+), 16 deletions(-) diff --git a/sys-devel/bison/bison-2.5.recipe b/sys-devel/bison/bison-2.5.recipe index fd0151916..2d61f06b9 100644 --- a/sys-devel/bison/bison-2.5.recipe +++ b/sys-devel/bison/bison-2.5.recipe @@ -1,33 +1,68 @@ -DESCRIPTION="bison - A yacc-compatible parser generator" +SUMMARY="A yacc-compatible parser generator" +DESCRIPTION=" + Bison is a general-purpose parser generator that converts an annotated + context-free grammar into an LALR(1) or GLR parser for that grammar. Once + you are proficient with Bison, you can use it to develop a wide range of + language parsers, from those used in simple desk calculators to complex + programming languages. + + Bison is upward compatible with Yacc: all properly-written Yacc grammars + ought to work with Bison with no change. Anyone familiar with Yacc should + be able to use Bison with little trouble. You need to be fluent in C or + C++ programming in order to use Bison. + " HOMEPAGE="http://www.gnu.org/software/bison/bison.html" +COPYRIGHT="1992-2011 Free Software Foundation, Inc." +LICENSE="GNU GPL v3" SRC_URI="http://ftp.gnu.org/gnu/bison/bison-2.5.tar.gz" CHECKSUM_MD5="687e1dcd29452789d34eaeea4c25abe4" REVISION="1" -STATUS_HAIKU="stable" -MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." -DEPEND="" + +ARCHITECTURES="?x86" + +PATCHES="${portVersionedName}.patch" + +PROVIDES=" + bison = $portVersion compat >= 2.5 + cmd:bison = $portVersion compat >= 2.5 + cmd:yacc + devel:liby = $portVersion compat >= 2.5 + " + +REQUIRES=" + haiku >= $haikuVersion + cmd:m4 + " + +BUILD_REQUIRES=" + " + +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:gcc + cmd:ld + cmd:m4 + cmd:make + cmd:sed + " + BUILD() { - cd bison-2.5 - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ - --infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ - --disable-nls - make + runConfigure ./configure + make $jobArgs } INSTALL() { - cd bison-2.5 make install + + prepareInstalledDevelLibs liby + + rm $libDir/charset.alias + rmdir $libDir } TEST() { - cd bison-2.5 make check } - -LICENSE="GNU GPL v3" -COPYRIGHT="1992-2011 Free Software Foundation, Inc." From 780777f1d95b6718200df2d567d629ab659e6a70 Mon Sep 17 00:00:00 2001 From: Michael Lotz Date: Sun, 8 Dec 2013 03:03:30 +0000 Subject: [PATCH 11/13] Convert and update dtc recipe to 1.4.0 and remove old versions. --- sys-apps/dtc/dtc-1.3.0_git.recipe | 30 --------- sys-apps/dtc/dtc-1.4.0.recipe | 53 +++++++++++++++ sys-apps/dtc/patches/dtc-1.3.0_git.patch | 66 ------------------- .../{dtc-1.3.0-git.patch => dtc-1.4.0.patch} | 0 4 files changed, 53 insertions(+), 96 deletions(-) delete mode 100644 sys-apps/dtc/dtc-1.3.0_git.recipe create mode 100644 sys-apps/dtc/dtc-1.4.0.recipe delete mode 100644 sys-apps/dtc/patches/dtc-1.3.0_git.patch rename sys-apps/dtc/patches/{dtc-1.3.0-git.patch => dtc-1.4.0.patch} (100%) diff --git a/sys-apps/dtc/dtc-1.3.0_git.recipe b/sys-apps/dtc/dtc-1.3.0_git.recipe deleted file mode 100644 index d29ddcb4f..000000000 --- a/sys-apps/dtc/dtc-1.3.0_git.recipe +++ /dev/null @@ -1,30 +0,0 @@ -DESCRIPTION="The Device Tree Compiler" -HOMEPAGE="http://git.jdl.com/gitweb/?p=dtc.git;a=summary" -SRC_URI="git://git.jdl.com/software/dtc.git" -REVISION="1" -STATUS_HAIKU="untested" -DEPEND="sys-devel/bison >= 2.5" -# TODO: test gcc2 build -MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." -#CHECKSUM_MD5="" -BUILD() -{ - cd dtc-1.3.0-git - make PREFIX=`finddir B_COMMON_DIRECTORY` -} - -INSTALL() -{ - cd dtc-1.3.0-git - make install PREFIX=`finddir B_COMMON_DIRECTORY` -} - -TEST() -{ - cd dtc-1.3.0-git - make tests -} - -LICENSE="GNU GPL v2" -COPYRIGHT="2005 David Gibson, IBM Corporation" - diff --git a/sys-apps/dtc/dtc-1.4.0.recipe b/sys-apps/dtc/dtc-1.4.0.recipe new file mode 100644 index 000000000..907703ff7 --- /dev/null +++ b/sys-apps/dtc/dtc-1.4.0.recipe @@ -0,0 +1,53 @@ +SUMMARY="The Device Tree Compiler" +DESCRIPTION="The Device Tree Compiler" +HOMEPAGE="http://git.jdl.com/gitweb/?p=dtc.git;a=summary" +SRC_URI="git://git.jdl.com/software/dtc.git#v1.4.0" +LICENSE="GNU GPL v2" +COPYRIGHT="2005 David Gibson, IBM Corporation" +REVISION="1" + +ARCHITECTURES="x86" + +PROVIDES=" + dtc = $portVersion + cmd:convert_dtsv0 = $portVersion + cmd:dtc = $portVersion + cmd:dtdiff = $portVersion + cmd:fdtdump = $portVersion + cmd:fdtget = $portVersion + cmd:fdtput = $portVersion + lib:libfdt = $portVersion + lib:libfdt_1.4.0 = $portVersion + devel:libfdt = $portVersion + " + +REQUIRES=" + haiku >= $haikuVersion + " + +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:bison >= 2.5 + cmd:flex + cmd:gcc$secondaryArchSuffix + cmd:make + " + +PATCHES="${portVersionedName}.patch" + +BUILD() +{ + make PREFIX=$prefix $jobArgs +} + +INSTALL() +{ + make install PREFIX=$prefix INCLUDEDIR=$includeDir + + prepareInstalledDevelLibs libfdt +} + +TEST() +{ + make tests +} diff --git a/sys-apps/dtc/patches/dtc-1.3.0_git.patch b/sys-apps/dtc/patches/dtc-1.3.0_git.patch deleted file mode 100644 index 64b4229f5..000000000 --- a/sys-apps/dtc/patches/dtc-1.3.0_git.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff --git a/Makefile dtc-1.3.0-git/Makefile -index 1169e6c..60077a5 100644 ---- a/Makefile -+++ dtc-1.3.0-git/Makefile -@@ -41,6 +41,15 @@ SHAREDLIB_EXT=so - SHAREDLIB_LINK_OPTIONS=-shared -Wl,--version-script=$(LIBFDT_version) -Wl,-soname, - endif - -+ifeq ($(HOSTOS),haiku) -+INSTALL = /bin/install -+endif -+ -+ifneq ($(HOSTOS),haiku) -+LIBDL = -ldl -+endif -+ -+ - # - # Overall rules - # -diff --git a/tests/Makefile.tests dtc-1.3.0-git/tests/Makefile.tests -index 1795466..97b6131 100644 ---- a/tests/Makefile.tests -+++ dtc-1.3.0-git/tests/Makefile.tests -@@ -50,7 +50,7 @@ $(LIB_TESTS): %: $(TESTS_PREFIX)testutils.o util.o $(LIBFDT_archive) - - $(DL_LIB_TESTS): %: %.o $(TESTS_PREFIX)testutils.o util.o $(LIBFDT_archive) - @$(VECHO) LD [libdl] $@ -- $(LINK.c) -o $@ $^ -ldl -+ $(LINK.c) -o $@ $^ $(LIBDL) - - $(LIBTREE_TESTS): %: $(TESTS_PREFIX)testutils.o $(TESTS_PREFIX)trees.o \ - util.o $(LIBFDT_archive) -diff --git a/tests/testutils.c dtc-1.3.0-git/tests/testutils.c -index f185133..66b34df 100644 ---- a/tests/testutils.c -+++ dtc-1.3.0-git/tests/testutils.c -@@ -45,16 +45,15 @@ static void sigint_handler(int signum, siginfo_t *si, void *uc) - { - cleanup(); - fprintf(stderr, "%s: %s (pid=%d)\n", test_name, -- strsignal(signum), getpid()); -+ strsignal(signum), (int)getpid()); - exit(RC_BUG); - } - - void test_init(int argc, char *argv[]) - { - int err; -- struct sigaction sa_int = { -- .sa_sigaction = sigint_handler, -- }; -+ struct sigaction sa_int = { }; -+ sa_int.sa_sigaction = sigint_handler; - - test_name = argv[0]; - -@@ -66,7 +65,7 @@ void test_init(int argc, char *argv[]) - verbose_test = 0; - - verbose_printf("Starting testcase \"%s\", pid %d\n", -- test_name, getpid()); -+ test_name, (int)getpid()); - } - - void check_mem_rsv(void *fdt, int n, uint64_t addr, uint64_t size) diff --git a/sys-apps/dtc/patches/dtc-1.3.0-git.patch b/sys-apps/dtc/patches/dtc-1.4.0.patch similarity index 100% rename from sys-apps/dtc/patches/dtc-1.3.0-git.patch rename to sys-apps/dtc/patches/dtc-1.4.0.patch From 4869c3d3b332f00e7dcc6042504810a4ea770294 Mon Sep 17 00:00:00 2001 From: Michael Lotz Date: Sun, 8 Dec 2013 04:07:18 +0000 Subject: [PATCH 12/13] Add qemu-1.7.0 recipe. --- app-emulation/qemu/qemu-1.7.0.recipe | 86 ++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) create mode 100644 app-emulation/qemu/qemu-1.7.0.recipe diff --git a/app-emulation/qemu/qemu-1.7.0.recipe b/app-emulation/qemu/qemu-1.7.0.recipe new file mode 100644 index 000000000..066f62818 --- /dev/null +++ b/app-emulation/qemu/qemu-1.7.0.recipe @@ -0,0 +1,86 @@ +SUMMARY="QEMU is a generic and open source machine emulator and virtualizer." +DESCRIPTION="QEMU is a generic and open source machine emulator and virtualizer." +HOMEPAGE="http://wiki.qemu.org/" +SRC_URI="git+https://github.com/mmlr/qemu-haiku.git#e57972be33c91222a580d47c68b135aa8fa7b4c3" +COPYRIGHT="2003-2008 Fabrice Bellard" +LICENSE="GNU GPL v2" +REVISION="1" +ARCHITECTURES="x86" + +PROVIDES=" + qemu = $portVersion + cmd:qemu = $portVersion + cmd:qemu_img = $portVersion + cmd:qemu_io = $portVersion + cmd:qemu_system_alpha = $portVersion + cmd:qemu_system_arm = $portVersion + cmd:qemu_system_cris = $portVersion + cmd:qemu_system_i386 = $portVersion + cmd:qemu_system_lm32 = $portVersion + cmd:qemu_system_m68k = $portVersion + cmd:qemu_system_microblaze = $portVersion + cmd:qemu_system_microblazeel = $portVersion + cmd:qemu_system_mips = $portVersion + cmd:qemu_system_mips64 = $portVersion + cmd:qemu_system_mips64el = $portVersion + cmd:qemu_system_mipsel = $portVersion + cmd:qemu_system_moxie = $portVersion + cmd:qemu_system_or32 = $portVersion + cmd:qemu_system_ppc = $portVersion + cmd:qemu_system_ppc64 = $portVersion + cmd:qemu_system_ppcemb = $portVersion + cmd:qemu_system_s390x = $portVersion + cmd:qemu_system_sh4 = $portVersion + cmd:qemu_system_sh4eb = $portVersion + cmd:qemu_system_sparc = $portVersion + cmd:qemu_system_sparc64 = $portVersion + cmd:qemu_system_unicore32 = $portVersion + cmd:qemu_system_x86_64 = $portVersion + cmd:qemu_system_xtensa = $portVersion + cmd:qemu_system_xtensaeb = $portVersion + " + +REQUIRES=" + haiku >= $haikuVersion + lib:libz + lib:libintl + glib >= 2.12 + pixman + " + +BUILD_REQUIRES=" + devel:libz + devel:libfdt + glib_devel >= 2.12 + pixman_devel + " + +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:gcc + cmd:ld + cmd:make + cmd:pkg_config + cmd:pod2man + cmd:python + " + +BUILD() +{ + chmod +x configure + ./configure --prefix=$prefix --mandir=$manDir --datadir=$dataDir/qemu \ + --docdir=$docDir --bindir=$binDir --libdir=$libDir \ + --sysconfdir=$settingsDir/qemu + make $jobArgs +} + +INSTALL() +{ + make install + + # provide convenience symlink to just "qemu" + ln -s qemu-system-i386 $binDir/qemu + + # remove empty target config file + rm $settingsDir/qemu/target-x86_64.conf +} From af0dd292586abeb67bb36dfd3290bf7a259cb545 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Sun, 8 Dec 2013 09:54:52 +0000 Subject: [PATCH 13/13] Updated recipe to use rdef instead of rsrc --- haiku-apps/fortuna/fortuna-1.0.0.recipe | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/haiku-apps/fortuna/fortuna-1.0.0.recipe b/haiku-apps/fortuna/fortuna-1.0.0.recipe index a64b8da0e..f7ce8092e 100644 --- a/haiku-apps/fortuna/fortuna-1.0.0.recipe +++ b/haiku-apps/fortuna/fortuna-1.0.0.recipe @@ -9,7 +9,7 @@ DESCRIPTION=" " # Taken from homepage HOMEPAGE="http://darkwyrm.beemulated.net/apps/fortuna.htm" -SRC_URI="git://github.com/HaikuArchives/Fortuna.git#eacb3689800064b948d3b943302b2d4bf18c9dbc" +SRC_URI="git://github.com/HaikuArchives/Fortuna.git#9e0cd6c1e6" REVISION="1" LICENSE="MIT" @@ -39,6 +39,8 @@ BUILD_REQUIRES=" BUILD() { + + rc src/Fortuna.rdef g++ -o Fortuna -lbe src/main.cpp src/FortuneWindow.cpp src/FortuneFunctions.cpp xres -o Fortuna src/Fortuna.rsrc mimeset -f Fortuna