From 02f00a5bd167471e715407ddfc53dcb319b9441d Mon Sep 17 00:00:00 2001 From: Josef Gajdusek Date: Tue, 2 Dec 2014 19:38:38 +0100 Subject: [PATCH] globe: Fix the Globe recipe --- haiku-apps/globe/globe-0.4.recipe | 50 +++++--- haiku-apps/globe/patches/globe-0.4.patch | 141 +++++++++++++++++++++-- 2 files changed, 164 insertions(+), 27 deletions(-) diff --git a/haiku-apps/globe/globe-0.4.recipe b/haiku-apps/globe/globe-0.4.recipe index 99039727e..07e34bab4 100644 --- a/haiku-apps/globe/globe-0.4.recipe +++ b/haiku-apps/globe/globe-0.4.recipe @@ -1,27 +1,47 @@ -DESCRIPTION="Globe Web Editor" -HOMEPAGE="http://globe.beos.hu/index_en.html" +SUMMARY="Globe Web Editor" +DESCRIPTION=" +Globe is an editor with support for HTML and PHP. It offers syntax \ +highlighting and basic project management. +" +HOMEPAGE="http://globe.beos.hu/index_en.html" SRC_URI="http://ports-space.haiku-files.org/source/globe-0.4.zip" -CHECKSUM_MD5="61601576e59b0dc5ab6364f684a47236" -REVISION="1" +CHECKSUM_SHA256="1ed42fa741a7b7923cd9accb759395b6ddaa5287695f7dfceeaa5112ebe3c765" +SOURCE_DIR="globe0.4" +REVISION="2" STATUS_HAIKU="stable" DEPEND="" + +ARCHITECTURES="x86_gcc2 x86 x86_64" + +REQUIRES=" + haiku >= $haikuVersion + " + +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + makefile_engine + cmd:gcc + cmd:make + " + +PROVIDES=" + globe = $portVersion + app:Globe = $portVersion + " + +PATCHES="globe-0.4.patch" + BUILD() { - cd globe0.4 - make + make $jobArgs OBJ_DIR=objects } INSTALL() { - cd globe0.4 - TARGET_DIR=${DESTDIR}`finddir B_APPS_DIRECTORY`/Globe - mkdir -p $TARGET_DIR - cp Globe $TARGET_DIR - cp GlobeBUGList.txt $TARGET_DIR - cp globe* $TARGET_DIR - cp LICENSE.txt $TARGET_DIR - cp NewFeatures.txt $TARGET_DIR - cp objects.*/Globe* $TARGET_DIR + mkdir -p $appsDir + cp objects/Globe $appsDir/Globe + addAppDeskbarSymlink $appsDir/Globe } + LICENSE="GNU GPL v2" COPYRIGHT="2001-2004 Gergely Rózsahegyi" diff --git a/haiku-apps/globe/patches/globe-0.4.patch b/haiku-apps/globe/patches/globe-0.4.patch index 64a1f4be6..d12c55ecd 100644 --- a/haiku-apps/globe/patches/globe-0.4.patch +++ b/haiku-apps/globe/patches/globe-0.4.patch @@ -1,14 +1,14 @@ -diff -Naur globe0.4/Makefile globe0.4-haiku/Makefile ---- globe0.4/Makefile 1970-01-01 00:00:00.000000000 +0000 -+++ globe0.4-haiku/Makefile 2012-12-30 19:40:59.058720256 +0000 +diff -x .git -Naur ../globe0.4/Makefile ./Makefile +--- ../globe0.4/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ ./Makefile 2014-12-02 19:15:53.759918816 +0100 @@ -0,0 +1,27 @@ +NAME= Globe +TYPE= APP +SRCS= RHTML_app.cpp RHTML_win.cpp RHTML_numview.cpp RHTML_savewin.cpp RHTML_aboutwin.cpp RHTML_prefwin.cpp RHTML_fmenu.cpp RHTML_buttonmenu.cpp RHTML_bmenu.cpp RHTML_parammenu.cpp RHTML_colorwin.cpp RHTML_amenu.cpp RHTML_textview.cpp RHTML_tabbutton.cpp RHTML_tagmenu.cpp RHTML_filetypes.cpp RHTML_options.cpp ToolTip/TToolTip.cpp Timer/RTimer.cpp URLView/URLView.cpp Tool/RadioBar.cpp Tool/ToolBar.cpp Tool/ToolItem.cpp Tool/ToolView.cpp +RSRCS= Globe.rsrc -+LIBS= /boot/system/lib/libbe.so /boot/system/lib/libtextencoding.so /boot/system/lib/libtracker.so /boot/system/lib/libroot.so /boot/system/lib/libtranslation.so /boot/system/lib/libgame.so /boot/system/lib/libstdc++.r4.so ++LIBS= /boot/system/lib/libbe.so /boot/system/lib/libtextencoding.so /boot/system/lib/libtracker.so /boot/system/lib/libroot.so /boot/system/lib/libtranslation.so /boot/system/lib/libgame.so /boot/system/lib/libstdc++.so +LIBPATHS= -+SYSTEM_INCLUDE_PATHS= /boot/develop/headers/be /boot/develop/headers/cpp /boot/develop/headers/posix /boot/develop/lib /boot/beos/system/lib ++SYSTEM_INCLUDE_PATHS= /boot/system/develop/headers/be /boot/system/develop/headers/cpp /boot/system/develop/headers/posix /boot/system/develop/headers/os/storage /boot/system/develop/lib /boot/system/beos/system/lib +LOCAL_INCLUDE_PATHS= ./../../../config/lib ./Genesis ToolTip Timer URLView Tool +OPTIMIZE=FULL +# specify any preprocessor symbols to be defined. The symbols will not @@ -28,10 +28,97 @@ diff -Naur globe0.4/Makefile globe0.4-haiku/Makefile +LINKER_FLAGS= + +## include the makefile-engine -+include $(BUILDHOME)/etc/makefile-engine -diff -Naur globe0.4/RHTML_win.cpp globe0.4-haiku/RHTML_win.cpp ---- globe0.4/RHTML_win.cpp 2004-10-21 14:16:28.000000000 +0000 -+++ globe0.4-haiku/RHTML_win.cpp 2012-12-30 18:28:09.000000000 +0000 ++include /boot/system/develop/etc/makefile-engine +diff -x .git -Naur ../globe0.4/RHTML_filetypes.cpp ./RHTML_filetypes.cpp +--- ../globe0.4/RHTML_filetypes.cpp 2004-10-21 16:18:44.000000000 +0200 ++++ ./RHTML_filetypes.cpp 2014-12-02 18:56:43.069920922 +0100 +@@ -39,7 +39,7 @@ + // - End - RHTML_File_Types - RHTMLFileTypes ----------------------------------------------------------------- + + // ---------------------------------------------------------------------- RHTML_File_Types - SetFontAndColor - +-void RHTMLFileTypes::SetFontAndColor(BString *oldtext,BString *currenttext,int mode=0,int offset1=-1,int offset2=-1) ++void RHTMLFileTypes::SetFontAndColor(BString *oldtext,BString *currenttext,int mode,int offset1,int offset2) + { + if (fOptions->FileTypes[FileType]->Name->ICompare("HTML")==0) + { +diff -x .git -Naur ../globe0.4/RHTML_options.cpp ./RHTML_options.cpp +--- ../globe0.4/RHTML_options.cpp 2004-10-21 16:18:57.000000000 +0200 ++++ ./RHTML_options.cpp 2014-12-02 19:07:34.499919730 +0100 +@@ -34,6 +34,8 @@ + #include + #include + ++using std::ifstream; ++ + RHTMLOptions *fOptions; + + // ---------------------------------------------------------------------------- RHTML_Options - RHTMLOptions - +@@ -554,7 +556,7 @@ + tmp.CopyInto(val1,tmp.FindFirst('=')+1,tmp.Length()-tmp.FindFirst('=')-1); + val1=rgetstring(val1); + font_style fstyle; +- get_font_style((font_family) val1.String(), 0, &fstyle); ++ get_font_style((char *) val1.String(), 0, &fstyle); + DefaultFont->SetFamilyAndStyle(val1.String(),fstyle); + } else + if (name.ICompare("Default_Font_Style")==0) // - Default_Font_Style +diff -x .git -Naur ../globe0.4/RHTML_options.h ./RHTML_options.h +--- ../globe0.4/RHTML_options.h 2004-10-21 16:19:01.000000000 +0200 ++++ ./RHTML_options.h 2014-12-02 18:31:28.159923695 +0100 +@@ -33,7 +33,7 @@ + #include + #include + #include +-#include ++#include + + class RHTMLOptions; + +diff -x .git -Naur ../globe0.4/RHTML_parammenu.cpp ./RHTML_parammenu.cpp +--- ../globe0.4/RHTML_parammenu.cpp 2004-10-21 16:17:48.000000000 +0200 ++++ ./RHTML_parammenu.cpp 2014-12-02 18:53:29.809921276 +0100 +@@ -35,7 +35,7 @@ + #include + #include + #include +-#include ++#include + #include + + // ------------------------------------------------------------------------ RHTML_parammenu - RHTMLparammenu - +@@ -602,7 +602,7 @@ + void RHTMLptextview::Paste(BClipboard *clipboard) + { + const char *text; +- int32 textlen; ++ ssize_t textlen; + BMessage *clip = (BMessage *) NULL; + + if (clipboard->Lock()) +diff -x .git -Naur ../globe0.4/RHTML_prefwin.cpp ./RHTML_prefwin.cpp +--- ../globe0.4/RHTML_prefwin.cpp 2004-10-21 16:17:14.000000000 +0200 ++++ ./RHTML_prefwin.cpp 2014-12-02 18:49:57.739921664 +0100 +@@ -386,7 +386,7 @@ + // - End - RHTML_Preferences_Win - FTCreateKitList ----------------------------------------------------------- + + // ----------------------------------------------------------------------- RHTML_Preferences_Win - FTSetFont - +-void RHTMLPreferencesWin::FTSetFont(const char *font,const char *style ="") ++void RHTMLPreferencesWin::FTSetFont(const char *font,const char *style) + { + fFTFontsBox->RemoveChild(fFTDFStyle); + +@@ -649,7 +649,7 @@ + msg->FindString("font_family",&family); + FTSetFont(family); + font_style fStyle; +- get_font_style((font_family) family, 0, &fStyle); ++ get_font_style((char *) family, 0, &fStyle); + fOptions->DefaultFont->SetFamilyAndStyle(family,fStyle); + fOptions->Save(); + } +diff -x .git -Naur ../globe0.4/RHTML_win.cpp ./RHTML_win.cpp +--- ../globe0.4/RHTML_win.cpp 2004-10-21 16:16:28.000000000 +0200 ++++ ./RHTML_win.cpp 2014-12-02 18:30:50.089923764 +0100 @@ -288,7 +288,9 @@ if (textdb>0) { @@ -72,9 +159,39 @@ diff -Naur globe0.4/RHTML_win.cpp globe0.4-haiku/RHTML_win.cpp } break; case 'ABWQ': -diff -Naur globe0.4/URLView/URLView.cpp globe0.4-haiku/URLView/URLView.cpp ---- globe0.4/URLView/URLView.cpp 2002-03-10 00:38:20.000000000 +0000 -+++ globe0.4-haiku/URLView/URLView.cpp 2012-12-29 14:17:53.000000000 +0000 +diff -x .git -Naur ../globe0.4/Timer/RTimer.cpp ./Timer/RTimer.cpp +--- ../globe0.4/Timer/RTimer.cpp 2004-10-21 16:22:13.000000000 +0200 ++++ ./Timer/RTimer.cpp 2014-12-02 19:09:02.649919568 +0100 +@@ -28,7 +28,7 @@ + // - Includes + #include "RTimer.h" + #include +-#include ++#include + + #define SLEEP_TIME 1000 + // ---------------------------------------------------------------------------------------- R_Timer - RTimer - +diff -x .git -Naur ../globe0.4/Tool/ToolItem.cpp ./Tool/ToolItem.cpp +--- ../globe0.4/Tool/ToolItem.cpp 2004-10-21 16:23:12.000000000 +0200 ++++ ./Tool/ToolItem.cpp 2014-12-02 19:13:26.509919086 +0100 +@@ -31,10 +31,13 @@ + #include + #include + #include +-#include ++#include ++#include + + #include "ToolItem.h" + ++using namespace std; ++ + const uint32 B_UPDATE_SIZE_MSG = 'BUSM'; + const uint32 B_MOUSE_DOWN_MSG = 'BMDM'; + const uint32 B_MOUSE_UP_MSG = 'BMUM'; +diff -x .git -Naur ../globe0.4/URLView/URLView.cpp ./URLView/URLView.cpp +--- ../globe0.4/URLView/URLView.cpp 2002-03-10 01:38:20.000000000 +0100 ++++ ./URLView/URLView.cpp 2014-12-02 18:30:50.089923764 +0100 @@ -30,9 +30,13 @@ #include