From 03dc9fed9be8a4622b4e78aaa68242f83c7921e6 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Wed, 21 Aug 2013 15:52:25 +0200 Subject: [PATCH 1/8] doxygen: fix gcc 4 build --- app-doc/doxygen/doxygen-1.6.3.recipe | 4 +- ...gen-1.6.3.patch => doxygen-1.6.3.patchset} | 101 +++++++++++++----- 2 files changed, 75 insertions(+), 30 deletions(-) rename app-doc/doxygen/patches/{doxygen-1.6.3.patch => doxygen-1.6.3.patchset} (53%) diff --git a/app-doc/doxygen/doxygen-1.6.3.recipe b/app-doc/doxygen/doxygen-1.6.3.recipe index 5e1ce9305..282f45c1e 100644 --- a/app-doc/doxygen/doxygen-1.6.3.recipe +++ b/app-doc/doxygen/doxygen-1.6.3.recipe @@ -11,10 +11,10 @@ COPYRIGHT="1997-2010 Dimitri van Heesch" LICENSE="GNU GPL v2" SRC_URI="http://ftp.stack.nl/pub/users/dimitri/doxygen-1.6.3.src.tar.gz" CHECKSUM_MD5="2d6ea20a9d850d94321cee78bab7bb87" -REVISION="3" +REVISION="4" ARCHITECTURES="x86_gcc2 x86" -PATCHES="doxygen-1.6.3.patch" +PATCHES="doxygen-1.6.3.patchset" PROVIDES=" doxygen = $portVersion compat >= 1.6 diff --git a/app-doc/doxygen/patches/doxygen-1.6.3.patch b/app-doc/doxygen/patches/doxygen-1.6.3.patchset similarity index 53% rename from app-doc/doxygen/patches/doxygen-1.6.3.patch rename to app-doc/doxygen/patches/doxygen-1.6.3.patchset index e087c2974..68b9cf3e8 100644 --- a/app-doc/doxygen/patches/doxygen-1.6.3.patch +++ b/app-doc/doxygen/patches/doxygen-1.6.3.patchset @@ -1,6 +1,13 @@ -diff -up doxygen-1.6.3/Makefile.in.orig doxygen-1.6.3/Makefile.in ---- doxygen-1.6.3/Makefile.in.orig 2010-03-18 22:18:10.189005824 -0600 -+++ doxygen-1.6.3/Makefile.in 2010-03-18 22:18:16.079953920 -0600 +From 9612cfcd716d5924547e90229bd6e3cb51c950e9 Mon Sep 17 00:00:00 2001 +From: Chris Roberts +Date: Wed, 21 Aug 2013 12:02:33 +0200 +Subject: add support for Haiku + + +diff --git a/Makefile.in b/Makefile.in +index 781d359..9cd43eb 100644 +--- a/Makefile.in ++++ b/Makefile.in @@ -2,7 +2,7 @@ # cd qtools ; $(MAKE) # cd src ; $(MAKE) @@ -10,9 +17,10 @@ diff -up doxygen-1.6.3/Makefile.in.orig doxygen-1.6.3/Makefile.in clean: FORCE cd examples ; $(MAKE) clean -diff -up doxygen-1.6.3/PLATFORMS.orig doxygen-1.6.3/PLATFORMS ---- doxygen-1.6.3/PLATFORMS.orig 2007-11-24 09:12:35.009437184 -0700 -+++ doxygen-1.6.3/PLATFORMS 2010-03-18 22:17:57.002097152 -0600 +diff --git a/PLATFORMS b/PLATFORMS +index c358a1d..18c4ed5 100644 +--- a/PLATFORMS ++++ b/PLATFORMS @@ -4,6 +4,7 @@ beos-g++ dgux-g++ freebsd-g++ @@ -21,9 +29,10 @@ diff -up doxygen-1.6.3/PLATFORMS.orig doxygen-1.6.3/PLATFORMS hpux-acc hpux-cc hpux-g++ -diff -up doxygen-1.6.3/configure.orig doxygen-1.6.3/configure ---- doxygen-1.6.3/configure.orig 2010-02-20 15:19:31.059244544 -0700 -+++ doxygen-1.6.3/configure 2010-03-18 22:17:57.024903680 -0600 +diff --git a/configure b/configure +index c0db1c6..d631e47 100755 +--- a/configure ++++ b/configure @@ -180,6 +180,9 @@ if test -z "$f_platform"; then f_insttool=/usr/bin/install fi @@ -34,9 +43,10 @@ diff -up doxygen-1.6.3/configure.orig doxygen-1.6.3/configure HP-UX:*) f_platform=hpux-g++ if test "$f_insttool" = NO; then -diff -up doxygen-1.6.3/qtools/qglobal.h.orig doxygen-1.6.3/qtools/qglobal.h ---- doxygen-1.6.3/qtools/qglobal.h.orig 2009-10-25 09:44:29.014680064 -0600 -+++ doxygen-1.6.3/qtools/qglobal.h 2010-03-18 22:17:57.054001664 -0600 +diff --git a/qtools/qglobal.h b/qtools/qglobal.h +index 700cb80..259446d 100644 +--- a/qtools/qglobal.h ++++ b/qtools/qglobal.h @@ -150,6 +150,8 @@ #define _OS_CYGWIN_ #elif defined(__BEOS__) @@ -46,10 +56,11 @@ diff -up doxygen-1.6.3/qtools/qglobal.h.orig doxygen-1.6.3/qtools/qglobal.h #elif defined(__MINT__) #define _OS_MINT_ #else -diff -up doxygen-1.6.3/src/doxygen.pro.in.orig doxygen-1.6.3/src/doxygen.pro.in ---- doxygen-1.6.3/src/doxygen.pro.in.orig 2010-01-01 04:53:11.034078720 -0700 -+++ doxygen-1.6.3/src/doxygen.pro.in 2010-03-18 22:17:57.078381056 -0600 -@@ -19,6 +19,7 @@ CONFIG = console warn_on $extraopt +diff --git a/src/doxygen.pro.in b/src/doxygen.pro.in +index cc93820..c8a8d50 100644 +--- a/src/doxygen.pro.in ++++ b/src/doxygen.pro.in +@@ -19,6 +19,7 @@ CONFIG = console warn_on $extraopts HEADERS = doxygen.h SOURCES = main.cpp unix:LIBS += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 @@ -57,27 +68,35 @@ diff -up doxygen-1.6.3/src/doxygen.pro.in.orig doxygen-1.6.3/src/doxygen.pro.in win32:INCLUDEPATH += . win32-mingw:LIBS += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 win32-msvc:LIBS += qtools.lib md5.lib doxygen.lib doxycfg.lib shell32.lib iconv.lib -diff -up doxygen-1.6.3/tmake/lib/haiku-g++/app.t.orig doxygen-1.6.3/tmake/lib/haiku-g++/app.t ---- doxygen-1.6.3/tmake/lib/haiku-g++/app.t.orig 2010-03-18 22:17:57.103284736 -0600 -+++ doxygen-1.6.3/tmake/lib/haiku-g++/app.t 2010-03-18 22:17:57.105119744 -0600 +diff --git a/tmake/lib/haiku-g++/app.t b/tmake/lib/haiku-g++/app.t +new file mode 100644 +index 0000000..867725e +--- /dev/null ++++ b/tmake/lib/haiku-g++/app.t @@ -0,0 +1,2 @@ +#! Use the common Unix template +#$ IncludeTemplate("../unix/app.t"); -diff -up doxygen-1.6.3/tmake/lib/haiku-g++/lib.t.orig doxygen-1.6.3/tmake/lib/haiku-g++/lib.t ---- doxygen-1.6.3/tmake/lib/haiku-g++/lib.t.orig 2010-03-18 22:17:57.126615552 -0600 -+++ doxygen-1.6.3/tmake/lib/haiku-g++/lib.t 2010-03-18 22:17:57.128188416 -0600 +diff --git a/tmake/lib/haiku-g++/lib.t b/tmake/lib/haiku-g++/lib.t +new file mode 100644 +index 0000000..2523b2f +--- /dev/null ++++ b/tmake/lib/haiku-g++/lib.t @@ -0,0 +1,2 @@ +#! Use the common Unix template +#$ IncludeTemplate("../unix/lib.t"); -diff -up doxygen-1.6.3/tmake/lib/haiku-g++/subdirs.t.orig doxygen-1.6.3/tmake/lib/haiku-g++/subdirs.t ---- doxygen-1.6.3/tmake/lib/haiku-g++/subdirs.t.orig 2010-03-18 22:17:57.152043520 -0600 -+++ doxygen-1.6.3/tmake/lib/haiku-g++/subdirs.t 2010-03-18 22:17:57.153354240 -0600 +diff --git a/tmake/lib/haiku-g++/subdirs.t b/tmake/lib/haiku-g++/subdirs.t +new file mode 100644 +index 0000000..5e888af +--- /dev/null ++++ b/tmake/lib/haiku-g++/subdirs.t @@ -0,0 +1,2 @@ +#! Use the common Unix template +#$ IncludeTemplate("../unix/subdirs.t"); -diff -up doxygen-1.6.3/tmake/lib/haiku-g++/tmake.conf.orig doxygen-1.6.3/tmake/lib/haiku-g++/tmake.conf ---- doxygen-1.6.3/tmake/lib/haiku-g++/tmake.conf.orig 2010-03-18 22:17:57.175112192 -0600 -+++ doxygen-1.6.3/tmake/lib/haiku-g++/tmake.conf 2010-03-18 22:17:57.176685056 -0600 +diff --git a/tmake/lib/haiku-g++/tmake.conf b/tmake/lib/haiku-g++/tmake.conf +new file mode 100644 +index 0000000..23a2738 +--- /dev/null ++++ b/tmake/lib/haiku-g++/tmake.conf @@ -0,0 +1,51 @@ +# +# @@ -130,3 +149,29 @@ diff -up doxygen-1.6.3/tmake/lib/haiku-g++/tmake.conf.orig doxygen-1.6.3/tmake/l + +TMAKE_TAR = tar -cf +TMAKE_GZIP = gzip -9f +-- +1.8.3.4 + + +From 2e7199416501ace72e5ab2a548cc07ab25ef910e Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Wed, 21 Aug 2013 12:21:09 +0200 +Subject: qvaluestack.h: fix gcc 4 build + + +diff --git a/qtools/qvaluestack.h b/qtools/qvaluestack.h +index 3fb61fd..7438fcb 100644 +--- a/qtools/qvaluestack.h ++++ b/qtools/qvaluestack.h +@@ -49,7 +49,7 @@ class Q_EXPORT QValueStack : public QValueList + public: + QValueStack() {} + ~QValueStack() {} +- void push( const T& d ) { append(d); } ++ void push( const T& d ) { this->append(d); } + T pop() + { + T elem( this->last() ); +-- +1.8.3.4 + From 8bf85116be600af4e1eb7a1dca94b600f8faef54 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Wed, 21 Aug 2013 15:53:52 +0200 Subject: [PATCH 2/8] python: the zlib module wasn't built setup.py: /boot/system/develop/headers wasn't added to the include search paths, so zlib.h wasn't found. --- dev-lang/python/patches/python-2.6.8.patch | 21 +++++++++++++-------- dev-lang/python/python-2.6.8.recipe | 2 +- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/dev-lang/python/patches/python-2.6.8.patch b/dev-lang/python/patches/python-2.6.8.patch index cf46984a2..7e0bb5548 100644 --- a/dev-lang/python/patches/python-2.6.8.patch +++ b/dev-lang/python/patches/python-2.6.8.patch @@ -559,18 +559,23 @@ diff -urN orig/Python-2.6.8/Python/bltinmodule.c Python-2.6.8/Python/bltinmodule diff -urN orig/Python-2.6.8/setup.py Python-2.6.8/setup.py --- orig/Python-2.6.8/setup.py 2012-04-10 17:32:11.008388608 +0200 +++ Python-2.6.8/setup.py 2013-05-04 00:18:11.938737664 +0200 -@@ -428,6 +428,10 @@ +@@ -428,6 +428,15 @@ inc_dirs += ['/system/include', '/atheos/autolnk/include'] inc_dirs += os.getenv('C_INCLUDE_PATH', '').split(os.pathsep) + if platform == 'haiku1': -+ inc_dirs += ['/boot/common/non-packaged/develop/headers', '/boot/common/develop/headers', '/boot/system/develop/headers/posix', '/boot/system/develop/headers/3rdparty'] -+ lib_dirs += ['/boot/common/non-packaged/develop/lib', '/boot/common/develop/lib', '/boot/system/develop/lib'] ++ inc_dirs += ['/boot/common/non-packaged/develop/headers', ++ '/boot/common/develop/headers', ++ '/boot/system/develop/headers/posix', ++ '/boot/system/develop/headers'] ++ lib_dirs += ['/boot/common/non-packaged/develop/lib', ++ '/boot/common/develop/lib', ++ '/boot/system/develop/lib'] + # OSF/1 and Unixware have some stuff in /usr/ccs/lib (like -ldb) if platform in ['osf1', 'unixware7', 'openunix8']: lib_dirs += ['/usr/ccs/lib'] -@@ -451,7 +455,7 @@ +@@ -451,7 +460,7 @@ # Check for MacOS X, which doesn't need libm.a at all math_libs = ['m'] @@ -579,7 +584,7 @@ diff -urN orig/Python-2.6.8/setup.py Python-2.6.8/setup.py math_libs = [] # XXX Omitted modules: gl, pure, dl, SGI-specific modules -@@ -694,15 +698,22 @@ +@@ -694,15 +703,22 @@ '/usr/local/ssl/include', '/usr/contrib/ssl/include/' ] @@ -605,7 +610,7 @@ diff -urN orig/Python-2.6.8/setup.py Python-2.6.8/setup.py ['/usr/local/ssl/lib', '/usr/contrib/ssl/lib/' ] ) -@@ -710,8 +721,8 @@ +@@ -710,8 +726,8 @@ if (ssl_incs is not None and ssl_libs is not None): exts.append( Extension('_ssl', ['_ssl.c'], @@ -616,7 +621,7 @@ diff -urN orig/Python-2.6.8/setup.py Python-2.6.8/setup.py libraries = ['ssl', 'crypto'], depends = ['socketmodule.h']), ) else: -@@ -746,8 +757,8 @@ +@@ -746,8 +762,8 @@ # The _hashlib module wraps optimized implementations # of hash functions from the OpenSSL library. exts.append( Extension('_hashlib', ['_hashopenssl.c'], @@ -627,7 +632,7 @@ diff -urN orig/Python-2.6.8/setup.py Python-2.6.8/setup.py libraries = ['ssl', 'crypto']) ) # these aren't strictly missing since they are unneeded. #missing.extend(['_sha', '_md5']) -@@ -1176,7 +1187,7 @@ +@@ -1176,7 +1192,7 @@ missing.append('resource') # Sun yellow pages. Some systems have the functions in libc. diff --git a/dev-lang/python/python-2.6.8.recipe b/dev-lang/python/python-2.6.8.recipe index 19d375342..0ff8bdbc2 100644 --- a/dev-lang/python/python-2.6.8.recipe +++ b/dev-lang/python/python-2.6.8.recipe @@ -9,7 +9,7 @@ LICENSE="Python" COPYRIGHT="1990-2012, Python Software Foundation" SRC_URI="http://www.python.org/ftp/python/2.6.8/Python-2.6.8.tar.bz2" CHECKSUM_MD5="c6e0420a21d8b23dee8b0195c9b9a125" -REVISION="4" +REVISION="5" ARCHITECTURES="x86_gcc2 x86" PATCHES="python-2.6.8.patch" From 80cdea23b3a9824a523c0e1c9b2f6009a6a599bd Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Wed, 21 Aug 2013 15:56:11 +0200 Subject: [PATCH 3/8] pe: fix build on newer Haiku node_ref::operator<() is now provided by , so don't redefine it. --- haiku-apps/pe/patches/pe-2.4.3_hg602.patch | 24 ---- haiku-apps/pe/patches/pe-2.4.3_hg602.patchset | 104 ++++++++++++++++++ haiku-apps/pe/pe-2.4.3_hg602.recipe | 4 +- 3 files changed, 106 insertions(+), 26 deletions(-) delete mode 100644 haiku-apps/pe/patches/pe-2.4.3_hg602.patch create mode 100644 haiku-apps/pe/patches/pe-2.4.3_hg602.patchset diff --git a/haiku-apps/pe/patches/pe-2.4.3_hg602.patch b/haiku-apps/pe/patches/pe-2.4.3_hg602.patch deleted file mode 100644 index eb2e98304..000000000 --- a/haiku-apps/pe/patches/pe-2.4.3_hg602.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -r 4bb6aa3dee15 Jamrules ---- pe-2.4.3_hg602/Jamrules Wed Dec 26 21:33:51 2012 +0100 -+++ pe-2.4.3_hg602/Jamrules Sun Apr 28 01:12:55 2013 +0200 -@@ -11,7 +11,7 @@ - # /boot/develop/lib/x86 to judge whether this is a BeOS compatible and thus - # gcc 2 platform. This is not entirely correct, but should be good enough - # for the time being. -- local hasLibStdC++.R4 = [ Glob /boot/develop/lib/x86 : libstdc++.r4.so ] ; -+ local hasLibStdC++.R4 = [ Glob /boot/system/lib : libstdc++.r4.so ] ; - if ! $(hasLibStdC++.R4) { - IS_GCC_4_PLATFORM = 1 ; - } -diff -r 4bb6aa3dee15 build/BuildSettings ---- pe-2.4.3_hg602/build/BuildSettings Wed Dec 26 21:33:51 2012 +0100 -+++ pe-2.4.3_hg602/build/BuildSettings Sun Apr 28 01:12:55 2013 +0200 -@@ -48,7 +48,7 @@ - CCFLAGS += -isystem /boot/develop/headers/pcre ; - C++FLAGS += -isystem /boot/develop/headers/pcre ; - } else { -- haveHeadersPcre = [ GLOB /boot/common/include : pcre.h ] ; -+ haveHeadersPcre = [ GLOB /boot/common/develop/headers : pcre.h ] ; - if ! $(haveHeadersPcre) { - haveHeadersPcre = [ GLOB /boot/home/config/include : pcre.h ] ; - if ! $(haveHeadersPcre) { diff --git a/haiku-apps/pe/patches/pe-2.4.3_hg602.patchset b/haiku-apps/pe/patches/pe-2.4.3_hg602.patchset new file mode 100644 index 000000000..4173d4e5c --- /dev/null +++ b/haiku-apps/pe/patches/pe-2.4.3_hg602.patchset @@ -0,0 +1,104 @@ +From 38fe29f686b24b11bd946e9cb26975d5b0e540da Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Tue, 20 Aug 2013 21:09:09 +0000 +Subject: Fix development library and header paths + + +diff --git a/Jamrules b/Jamrules +index a3c76de..a18dc02 100644 +--- a/Jamrules ++++ b/Jamrules +@@ -11,7 +11,7 @@ if $(OS) = HAIKU { + # /boot/develop/lib/x86 to judge whether this is a BeOS compatible and thus + # gcc 2 platform. This is not entirely correct, but should be good enough + # for the time being. +- local hasLibStdC++.R4 = [ Glob /boot/develop/lib/x86 : libstdc++.r4.so ] ; ++ local hasLibStdC++.R4 = [ Glob /boot/system/lib : libstdc++.r4.so ] ; + if ! $(hasLibStdC++.R4) { + IS_GCC_4_PLATFORM = 1 ; + } +diff --git a/build/BuildSettings b/build/BuildSettings +index 31b03c4..2b79ca7 100644 +--- a/build/BuildSettings ++++ b/build/BuildSettings +@@ -48,7 +48,7 @@ if $(haveHeadersPcre) { + CCFLAGS += -isystem /boot/develop/headers/pcre ; + C++FLAGS += -isystem /boot/develop/headers/pcre ; + } else { +- haveHeadersPcre = [ GLOB /boot/common/include : pcre.h ] ; ++ haveHeadersPcre = [ GLOB /boot/common/develop/headers : pcre.h ] ; + if ! $(haveHeadersPcre) { + haveHeadersPcre = [ GLOB /boot/home/config/include : pcre.h ] ; + if ! $(haveHeadersPcre) { +-- +1.8.3.4 + + +From 84b46dea0f1addae8e3fc1248a3f58e73a799690 Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Tue, 20 Aug 2013 21:11:55 +0000 +Subject: MainBuildRules: Use -shared instead of -nostart + + +diff --git a/build/MainBuildRules b/build/MainBuildRules +index 8bd12be..119b081 100644 +--- a/build/MainBuildRules ++++ b/build/MainBuildRules +@@ -64,7 +64,7 @@ rule SharedLibrary + MakeLocate $(lib) : $(LOCATE_MAIN_TARGET) ; + local linkFlags ; + if $(OSPLAT) = X86 { +- linkFlags = -nostart -Xlinker -soname=\"$(lib)\" ++ linkFlags = -shared -Xlinker -soname=\"$(lib)\" + -Xlinker --no-undefined ; + } else { + linkFlags = -xms ; +-- +1.8.3.4 + + +From d1ebe32fb70e71545959bfd6b848f6c1858ea96a Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Tue, 20 Aug 2013 21:19:16 +0000 +Subject: node_ref::operator<() is now defined in Haiku + + +diff --git a/Sources/CDocIO.cpp b/Sources/CDocIO.cpp +index 6ad237e..e4f19aa 100644 +--- a/Sources/CDocIO.cpp ++++ b/Sources/CDocIO.cpp +@@ -199,16 +199,6 @@ static bool CopyFile(BEntry& srcEntry, BEntry& dstEntry) + return true; + } + +-#ifndef B_ZETA_VERSION_1_2_0 // maybe even B_ZETA_VERSION_1_1_0 +-bool operator< (const node_ref& left, const node_ref& right) +-{ +- if (left.node < right.node) +- return true; +- else +- return left.device < right.device; +-} +-#endif +- + + // #pragma mark - CDocIO + +diff --git a/Sources/CDocIO.h b/Sources/CDocIO.h +index 1eed6ef..b81280c 100644 +--- a/Sources/CDocIO.h ++++ b/Sources/CDocIO.h +@@ -58,10 +58,6 @@ inline time_t CDocIO::LastSaved() const + return fLastSaved; + } + +-#ifndef B_ZETA_VERSION_1_2_0 // maybe even B_ZETA_VERSION_1_1_0 +-bool operator< (const node_ref& left, const node_ref& right); +-#endif +- + class CLocalDocIO : public CDocIO + { + public: +-- +1.8.3.4 + diff --git a/haiku-apps/pe/pe-2.4.3_hg602.recipe b/haiku-apps/pe/pe-2.4.3_hg602.recipe index 4c2f4bc06..1fd231bfc 100644 --- a/haiku-apps/pe/pe-2.4.3_hg602.recipe +++ b/haiku-apps/pe/pe-2.4.3_hg602.recipe @@ -10,10 +10,10 @@ COPYRIGHT=" 2003-2012 Team Pe " SRC_URI="hg+http://hg.berlios.de/repos/pe-editor#602" -REVISION="4" +REVISION="5" ARCHITECTURES="x86_gcc2 x86" -PATCHES="pe-2.4.3_hg602.patch" +PATCHES="pe-2.4.3_hg602.patchset" PROVIDES=" pe = $portVersion From 3a5263d97028b14cd438925c68d8536d9618af36 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Wed, 21 Aug 2013 15:59:04 +0200 Subject: [PATCH 4/8] haikuwebkit: rename patch and explicitly set PATCHES The patch wasn't found automatically since the secondary port name differs. That's another reason why PATCHES should always be specified explicitly. --- haiku-libs/haikuwebkit/haikuwebkit-1.1.3_2013_08_09.recipe | 2 ++ ...013_08_09.patchset => haikuwebkit-1.1.3_2013_08_09.patchset} | 0 2 files changed, 2 insertions(+) rename haiku-libs/haikuwebkit/patches/{haikuwebkit_x86-1.1.3_2013_08_09.patchset => haikuwebkit-1.1.3_2013_08_09.patchset} (100%) diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.1.3_2013_08_09.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.1.3_2013_08_09.recipe index 1a339405f..524e9d3dd 100644 --- a/haiku-libs/haikuwebkit/haikuwebkit-1.1.3_2013_08_09.recipe +++ b/haiku-libs/haikuwebkit/haikuwebkit-1.1.3_2013_08_09.recipe @@ -19,6 +19,8 @@ if [ $effectiveTargetArchitecture != x86_gcc2 ]; then fi SECONDARY_ARCHITECTURES="x86" +PATCHES="haikuwebkit-1.1.3_2013_08_09.patchset" + # version info -- usually derived from the git repository webkitRevision=r115944 haikuWebkitRevision=de778f7 diff --git a/haiku-libs/haikuwebkit/patches/haikuwebkit_x86-1.1.3_2013_08_09.patchset b/haiku-libs/haikuwebkit/patches/haikuwebkit-1.1.3_2013_08_09.patchset similarity index 100% rename from haiku-libs/haikuwebkit/patches/haikuwebkit_x86-1.1.3_2013_08_09.patchset rename to haiku-libs/haikuwebkit/patches/haikuwebkit-1.1.3_2013_08_09.patchset From 3033898201a2b1115c26220f0647ff447f4581a0 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Wed, 21 Aug 2013 16:02:19 +0200 Subject: [PATCH 5/8] man: don't link against -llocale It doesn't exist anymore on newer Haikus. --- sys-apps/man/man-1.6g.recipe | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/sys-apps/man/man-1.6g.recipe b/sys-apps/man/man-1.6g.recipe index 1809240b1..f82f92c32 100644 --- a/sys-apps/man/man-1.6g.recipe +++ b/sys-apps/man/man-1.6g.recipe @@ -49,14 +49,13 @@ SOURCE_DIR="$portVersionedName" BUILD() { - LIBS="-L/boot/system/lib -llocale" \ - groff=/packages/$portVersionedName/cmd:groff/bin/groff \ - ./configure -prefix=$prefix \ - -bindir=$binDir \ - -sbindir=$sbinDir \ - -confdir=$sysconfDir \ - -mandir=$manDir - # no autotools configure + groff=/packages/$portVersionedName/cmd:groff/bin/groff \ + ./configure -prefix=$prefix \ + -bindir=$binDir \ + -sbindir=$sbinDir \ + -confdir=$sysconfDir \ + -mandir=$manDir + # no autotools configure make $jobArgs } From e8da29bb1af16360b8a76f03b089dff17aea6915 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Wed, 21 Aug 2013 16:03:42 +0200 Subject: [PATCH 6/8] gcc 2: fix recipe * Use current source revision. * Copy and paste error in INSTALL(): installDir was used instead of gccInstallDir. Notsure why the bootstrap recipe and this one use different variable names. * Fix stdc++ library symlink when built for secondary architecture. --- sys-devel/gcc/gcc-2.95.3_2013_08_15.recipe | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys-devel/gcc/gcc-2.95.3_2013_08_15.recipe b/sys-devel/gcc/gcc-2.95.3_2013_08_15.recipe index b9f78b7f0..2e0d0f70b 100644 --- a/sys-devel/gcc/gcc-2.95.3_2013_08_15.recipe +++ b/sys-devel/gcc/gcc-2.95.3_2013_08_15.recipe @@ -7,8 +7,8 @@ LICENSE=" " COPYRIGHT="1988-2000 Free Software Foundation, Inc." SRC_URI=" - git+file://$portBaseDir/../binutils/download/BuildtoolsPM.git#2d0a2c6404ffae1a46eb7e74daab08099b45af2c - git+git://github.com/haiku/BuildtoolsPM.git#2d0a2c6404ffae1a46eb7e74daab08099b45af2c + git+file://$portBaseDir/../binutils/download/BuildtoolsPM.git#6ff546f23b0259bcd27550aa6ad8aaef89fd1bf6 + git+git://github.com/haiku/BuildtoolsPM.git#6ff546f23b0259bcd27550aa6ad8aaef89fd1bf6 " REVISION="2" ARCHITECTURES="x86_gcc2" @@ -123,7 +123,7 @@ INSTALL() # make all tools available via default paths echo "Symlinking binaries into default path" mkdir -p $binDir - symlinkRelative -s $installDir/bin/* $binDir + symlinkRelative -s $gccInstallDir/bin/* $binDir ### Strip ################################################# @@ -150,5 +150,5 @@ INSTALL() rm -rf $gccInstallDir/include/g++ ln -snf /boot/system/develop/headers/c++/2.95.3 $gccInstallDir/include/g++ - ln -snf /boot/system/lib/libstdc++.r4.so $gccInstallDir/lib/ + ln -snf /boot/system/lib$secondaryArchSubDir/libstdc++.r4.so $gccInstallDir/lib/ } From f37a4d0e22d969c7e3d50e969dc8899732338606 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Wed, 21 Aug 2013 16:06:11 +0200 Subject: [PATCH 7/8] mesa-7.8.2: declare PATCHES explicitly --- sys-libs/mesa/mesa-7.8.2.recipe | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys-libs/mesa/mesa-7.8.2.recipe b/sys-libs/mesa/mesa-7.8.2.recipe index f1a634fe8..879b1820c 100644 --- a/sys-libs/mesa/mesa-7.8.2.recipe +++ b/sys-libs/mesa/mesa-7.8.2.recipe @@ -23,6 +23,8 @@ then fi SECONDARY_ARCHITECTURES="x86_gcc2" +PATCHES="mesa-7.8.2.patch" + PROVIDES=" mesa$secondaryArchSuffix = $portVersion " From 47074781fb54c3d21b70f04a3137058f4a4a3ab2 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Wed, 21 Aug 2013 16:06:53 +0200 Subject: [PATCH 8/8] ncurses: fix build issues * We no longer try to install the terminfo DB when we don't need it (and can't build it anyway due to not building tic). * When building the wide-char version of the libraries, build only the libraries, not the programs or any documentation/data. That's already done for the non-wide-char version anyway. --- sys-libs/ncurses/ncurses-5.9.recipe | 66 +++++++++++++++++++++++------ 1 file changed, 54 insertions(+), 12 deletions(-) diff --git a/sys-libs/ncurses/ncurses-5.9.recipe b/sys-libs/ncurses/ncurses-5.9.recipe index 888464f56..cf04be857 100644 --- a/sys-libs/ncurses/ncurses-5.9.recipe +++ b/sys-libs/ncurses/ncurses-5.9.recipe @@ -4,7 +4,7 @@ SRC_URI="http://ftp.gnu.org/pub/gnu/ncurses/ncurses-5.9.tar.gz" CHECKSUM_MD5="8cb9c412e5f2d96bc6f459aa8c6282a1" LICENSE="MIT" COPYRIGHT="1998-2011 Free Software Foundation, Inc." -REVISION="9" +REVISION="10" ARCHITECTURES="x86_gcc2 x86" SECONDARY_ARCHITECTURES="x86_gcc2 x86" @@ -69,6 +69,27 @@ doBuild() targetDir=$(pwd)/$1 shift 1 + # Parse additional arguments. "--libs-only" means we only want the + # libraries, nothing else. "--without-progs" means no programs and no + # terminfo DB (requires tic). + local noData + local libsOnly + local configureArgs + local arg + for arg in $@; do + case "$arg" in + --libs-only) + noData=1 + libsOnly=1 + arg="--without-progs" + ;; + --without-progs) + noData=1 + ;; + esac + configureArgs="$configureArgs $arg" + done + rm -rf $targetDir mkdir $targetDir @@ -77,21 +98,44 @@ doBuild() --with-libtool \ --enable-termcap \ --enable-hard-tabs \ - $@ + $configureArgs make $jobArgs - make install DESTDIR=$targetDir + + if [ -z "$noData" ]; then + # We need LIBRARY_PATH to include the library installation directory, + # since the installation process for the terminfo database will run tic + # and the built-in rpath doesn't consider the DESTDIR we're using. + LIBRARY_PATH="$targetDir/$prefix/lib:$LIBRARY_PATH" \ + make install DESTDIR=$targetDir + else + make install.libs DESTDIR=$targetDir + if [ -z "$libsOnly" ]; then + make install.includes DESTDIR=$targetDir + make install.man DESTDIR=$targetDir + fi + fi + + # clean up for the next build + make clean } BUILD() { # Unfortunately building only works in the source directory. So we build - # two times, installing in temporary directories from which we copy to the - # actual installation directory in INSTALL(). - doBuild build-nowidec - # Note: For the secondary architecture we discard the programs later, - # but since building the terminfo DB can't be disabled, we need to build - # the anyway. - doBuild build-widec --enable-widec --without-progs + # two times -- once without and once with wide-char support -- installing in + # temporary directories from which we copy to the actual installation + # directory in INSTALL(). + + # For the secondary architecture we don't want the programs nor the + # terminfo DB. The main package will depend on the primary package which + # provides all this. + local withoutProgramArgs + if [ -n "$secondaryArchSuffix" ]; then + withoutProgramArgs="--without-progs" + fi + + doBuild build-nowidec $withoutProgramArgs + doBuild build-widec --enable-widec --libs-only } INSTALL() @@ -107,7 +151,6 @@ INSTALL() # fix ncurses[w]5-config fixDevelopLibDirReferences $binDir/ncurses5-config $binDir/ncursesw5-config - # devel package packageEntries devel \ $binDir/ncurses5-config \ @@ -119,7 +162,6 @@ INSTALL() # we make it depend on the primary architecture package. if [ -n "$secondaryArchSuffix" ]; then rm -rf $binDir - rm -rf $dataDir rm -rf $documentationDir fi }