From d7ac69f8dd1eb200236d1eb0f632a9a9f545a78d Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Sun, 11 Jan 2015 13:05:38 +0100 Subject: [PATCH 1/9] Add libHTTP recipe --- net-libs/libhttp/libhttp-0.9.mod.recipe | 61 +++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 net-libs/libhttp/libhttp-0.9.mod.recipe diff --git a/net-libs/libhttp/libhttp-0.9.mod.recipe b/net-libs/libhttp/libhttp-0.9.mod.recipe new file mode 100644 index 000000000..c2e6d6ce4 --- /dev/null +++ b/net-libs/libhttp/libhttp-0.9.mod.recipe @@ -0,0 +1,61 @@ +SUMMARY="An HTTP protocol handler" +DESCRIPTION="libHTTP is a helper library used by RobinHood to simplify \ +HTTP and other protocols. It is a legacy library and shouldn't be used in new \ +code anymore." +HOMEPAGE="https://github.com/HaikuArchives/libHTTP" +SRC_URI="https://github.com/HaikuArchives/libHTTP/archive/4a94696b445d88bc48c070ca3e9276e2e942059a.tar.gz" +CHECKSUM_SHA256="34185c19a76d4c35730795e1b5c115bee749508f3fd2bded25bba69a7ad68c62" +SOURCE_DIR="libHTTP-4a94696b445d88bc48c070ca3e9276e2e942059a" +REVISION="1" +LICENSE="GNU GPL v2" +COPYRIGHT="1999 Joe Kloss +2015 Puck Meerburg" + +ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" +SECONDARY_ARCHITECTURES="x86" + +PROVIDES=" + libhttp$secondaryArchSuffix = $portVersion + lib:libHTTP$secondaryArchSuffix = $portVersion + " +PROVIDES_devel=" + libhttp${secondaryArchSuffix}_devel = $portVersion + devel:libHTTP$secondaryArchSuffix = $portVersion + " + +REQUIRES=" + haiku$secondaryArchSuffix + " +REQUIRES_devel=" + haiku${secondaryArchSuffix}_devel + libhttp$secondaryArchSuffix == $portVersion base + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + " +BUILD_PREREQUIRES=" + makefile_engine + cmd:make + cmd:gcc$secondaryArchSuffix + cmd:mkdepend + " + +BUILD() +{ + make $jobArgs OBJ_DIR=objects +} + +INSTALL() +{ + mkdir -p $libDir + mkdir -p $includeDir/libHTTP + + cp -a objects/libHTTP.so $libDir + cp -R headers/* $includeDir/libHTTP + + prepareInstalledDevelLibs \ + libHTTP + packageEntries devel \ + $developDir +} From d161275d82f99d64d64c14dc462a34ad91f8acc4 Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Sun, 11 Jan 2015 13:34:12 +0100 Subject: [PATCH 2/9] Add RobinHood recipe --- www-servers/robinhood/robinhood-1.2.recipe | 64 ++++++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 www-servers/robinhood/robinhood-1.2.recipe diff --git a/www-servers/robinhood/robinhood-1.2.recipe b/www-servers/robinhood/robinhood-1.2.recipe new file mode 100644 index 000000000..38bd5493b --- /dev/null +++ b/www-servers/robinhood/robinhood-1.2.recipe @@ -0,0 +1,64 @@ +SUMMARY="A Haiku-native HTTP/1.1 server" +DESCRIPTION="RobinHood is a native web server containing many features like \ +authentication, virtual hosts, virtual folders, CGI, SSI, Ranges, and much more\ +!" +HOMEPAGE="https://haikuarchives.github.io/RobinHood/" +SRC_URI="https://github.com/HaikuArchives/RobinHood/archive/a1a81cddf007bd81d53c3b9d5fc23197c0da554d.tar.gz" +CHECKSUM_SHA256="37e297cf2c73907ec7694fa697c7ac765f6c068aac2effc24e4b89a7e770c556" +SOURCE_DIR="RobinHood-a1a81cddf007bd81d53c3b9d5fc23197c0da554d" +REVISION="1" +LICENSE="GNU GPL v2" +COPYRIGHT="1999-2001 The Robin Hood Development Team +2015 Puck Meerburg" + +ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" +SECONDARY_ARCHITECTURES="?x86" + +PROVIDES=" + robinhood = $portVersion + app:RHConsole = $portVersion + app:RobinHoudini = $portVersion + cmd:rhdaemon = $portVersion + cmd:rhlog = $portVersion + " + +REQUIRES=" + haiku$secondaryArchSuffix + libhttp$secondaryArchSuffix + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + libhttp${secondaryArchSuffix}_devel + " +BUILD_PREREQUIRES=" + makefile_engine + cmd:make + cmd:gcc$secondaryArchSuffix + " + +BUILD() +{ + cd source + make $jobArgs + cd ../RobinHoudini + make $jobArgs OBJ_DIR=objects +} + +INSTALL() +{ + cd source + make install + cd server + mkdir -p $binDir $appsDir $addOnsDir + cp rhdaemon $binDir + cp RHLog $binDir/rhlog + cp RHConsole $appsDir + cp -r robin_hood_modules $addOnsDir + addAppDeskbarSymlink $appsDir/RHConsole Robin\ Hood + cd ../../RobinHoudini + cp objects/RHoudini $appsDir/RobinHoudini + mkdir -p $dataDir/deskbar/menu/Desktop\ applets + symlinkRelative -s $appsDir/RobinHoudini \ + $dataDir/deskbar/menu/Desktop\ applets/Robin\ Houdini +} From d3fb83731d657ebf4daa0e354912eea9e655da55 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Sat, 10 Jan 2015 15:43:07 +0000 Subject: [PATCH 3/9] Add a new Haiku App, DeskNotes Needs some fixes, merge requested upstream: https://gitorious.org/desknotes/desknotes/merge_requests/1 --- haiku-apps/desknotes/desknotes-1.1.recipe | 47 +++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 haiku-apps/desknotes/desknotes-1.1.recipe diff --git a/haiku-apps/desknotes/desknotes-1.1.recipe b/haiku-apps/desknotes/desknotes-1.1.recipe new file mode 100644 index 000000000..4825b0176 --- /dev/null +++ b/haiku-apps/desknotes/desknotes-1.1.recipe @@ -0,0 +1,47 @@ +SUMMARY="A simple note replicant-capable program" +DESCRIPTION=" +With DeskNotes, you can now leave little notes all over your desktop \ +reminding you of things to do. The main difference between DeskNotes and \ +other Note utilities for Haiku, is that DeskNotes is designed to be used \ +as a replicant. This means that when you tear a note from the DeskNotes \ +application onto your desktop, it stays there! You don't have to save it \ +before rebooting, or fiddle with your bootscript. +" + +HOMEPAGE="https://github.com/HaikuArchives/DeskNotes" +SRC_URI="git+https://github.com/HaikuArchives/DeskNotes#93f0654745e3dc317152bdfc49ae8b6d23bf443b" +REVISION="1" +LICENSE="BSD (3-clause)" +COPYRIGHT="2000 Colin Stewart" + +ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" + +PROVIDES=" + desknotes = $portVersion + app:desknotes = $portVersion + " +REQUIRES=" + haiku + lib:libstdc++ + " +BUILD_REQUIRES=" + haiku_devel + " +BUILD_PREREQUIRES=" + makefile_engine + cmd:make + cmd:gcc + cmd:mkdepend + " + +BUILD() +{ + make $jobArgs OBJ_DIR=objects +} + +INSTALL() +{ + mkdir -p $appsDir + cp -a objects/DeskNotes $appsDir + addAppDeskbarSymlink $appsDir/DeskNotes +} From bf19e07f6f94573535fa24cc9b7b54c8e442ef12 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Sat, 10 Jan 2015 18:16:42 +0000 Subject: [PATCH 4/9] Add a Haiku app, PonpokoDiff --- .../ponpokodiff/ponpokodiff-0.2.0.recipe | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 haiku-apps/ponpokodiff/ponpokodiff-0.2.0.recipe diff --git a/haiku-apps/ponpokodiff/ponpokodiff-0.2.0.recipe b/haiku-apps/ponpokodiff/ponpokodiff-0.2.0.recipe new file mode 100644 index 000000000..ab87b14b5 --- /dev/null +++ b/haiku-apps/ponpokodiff/ponpokodiff-0.2.0.recipe @@ -0,0 +1,44 @@ +SUMMARY="A GUI-based diff application" +DESCRIPTION=" +PonpokoDiff is a graphical file comparison utility. \ +It can compare two files and show its differences graphically. \ +Currently, the comparison of folders is not supported. \ +You can also use it as an extenal diff command of Subversion (--diff-cmd). +" + +HOMEPAGE="https://code.google.com/p/ponpokodiff/" +SRC_URI="git+https://github.com/HaikuArchives/PonpokoDiff#f68f59d8f359ddbaeec89e2c8a72da93142c139d" +REVISION="1" +LICENSE="MIT" +COPYRIGHT="2008 PonpokoDiff Project Contributors" + +ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" + +PROVIDES=" + ponpokodiff = $portVersion + app:ponpokodiff = $portVersion + " +REQUIRES=" + haiku + " +BUILD_REQUIRES=" + haiku_devel + " +BUILD_PREREQUIRES=" + makefile_engine + cmd:make + cmd:gcc + cmd:mkdepend + " + +BUILD() +{ + make $jobArgs OBJ_DIR=objects +} + +INSTALL() +{ + mkdir -p $appsDir + cp -a objects/PonpokoDiff $appsDir + addAppDeskbarSymlink $appsDir/PonpokoDiff +} From 2105a5cbe25085df77ca922cb7f444a38d6e3dcf Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Sat, 10 Jan 2015 13:53:14 -0500 Subject: [PATCH 5/9] hyperstudio: create recipe. --- .../hyperstudio/hyperstudio-1.1_git.recipe | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 haiku-apps/hyperstudio/hyperstudio-1.1_git.recipe diff --git a/haiku-apps/hyperstudio/hyperstudio-1.1_git.recipe b/haiku-apps/hyperstudio/hyperstudio-1.1_git.recipe new file mode 100644 index 000000000..b89c7b327 --- /dev/null +++ b/haiku-apps/hyperstudio/hyperstudio-1.1_git.recipe @@ -0,0 +1,49 @@ +SUMMARY="Multitrack audio recording and editing suite." +DESCRIPTION="HyperStudio is a multitrack audio recording and editing \ +suite with an easy to master graphical user interface. It's based off of \ +BeAE, and improves on BeAE in numerous ways." +HOMEPAGE="https://github.com/HaikuArchives/HyperStudio" +LICENSE="MIT" +COPYRIGHT="2007 Pier Luigi Fiorini" +srcrev="59b31f0bdc3f0e49feb7d9892faa67222ffb3f95" +SRC_URI="https://github.com/HaikuArchives/HyperStudio/archive/$srcrev.tar.gz" +CHECKSUM_SHA256="03c2a7fc68d2a95bce9c873bf6d8a32494370861a23dc8e2689285e7e201a4c9" +SOURCE_DIR="HyperStudio-$srcrev" + +REVISION="1" +ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" + +PROVIDES=" + hyperstudio = $portVersion + app:HyperStudio = $portVersion + " +REQUIRES=" + haiku + " + +BUILD_REQUIRES=" + haiku_devel + " +BUILD_PREREQUIRES=" + cmd:gcc + cmd:awk + cmd:jam + cmd:ld + " + +BUILD() +{ + ./configure + jam -q + # multi-job builds don't work reliably +} + +INSTALL() +{ + mkdir -p $appsDir + cp -a generated/distro-haiku-$(getarch | sed s/_/-/)-release/HyperStudio $appsDir + cp -a generated/distro-haiku-$(getarch | sed s/_/-/)-release/HyperStudioRecorder $appsDir + + addAppDeskbarSymlink $appsDir/HyperStudio + addAppDeskbarSymlink $appsDir/HyperStudioRecorder +} From ba124d91541d03af2d3e8ae44923ac5980cfbd1f Mon Sep 17 00:00:00 2001 From: Richie_Nyhus Date: Mon, 12 Jan 2015 01:06:24 +0000 Subject: [PATCH 6/9] Fix warnings for Snapshot recipe --- haiku-apps/snapshot/snapshot-1.0.recipe | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/haiku-apps/snapshot/snapshot-1.0.recipe b/haiku-apps/snapshot/snapshot-1.0.recipe index d04396364..bb8e597ec 100644 --- a/haiku-apps/snapshot/snapshot-1.0.recipe +++ b/haiku-apps/snapshot/snapshot-1.0.recipe @@ -6,11 +6,11 @@ HOMEPAGE="https://github.com/HaikuArchives/SnapShot" SRC_URI="git+https://github.com/HaikuArchives/Snapshot#9ba592336a0d54707b7e5983dce93f8958b61d37 LICENSE="BSD (3-clause)" COPYRIGHT="2000 Jonas Sundström" +REVISION="1" +ARCHITECTURES="x86_gcc2" USER_SETTINGS_FILES="settings/Kirilla/Snapshot/settings" -ARCHITECTURES="x86_gcc2" - PROVIDES=" snapshot = $portVersion addon:snapshot = $portVersion From b33f96fa887a68ec73fb1c9c39a3e478b4a00853 Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Sun, 11 Jan 2015 18:20:24 -0800 Subject: [PATCH 7/9] Fix python crash on resource.getrusage --- dev-lang/python/patches/python-2.7.9.patchset | 98 +++++++++++++------ dev-lang/python/python-2.7.9.recipe | 2 +- 2 files changed, 68 insertions(+), 32 deletions(-) diff --git a/dev-lang/python/patches/python-2.7.9.patchset b/dev-lang/python/patches/python-2.7.9.patchset index fafb60a2f..b09445b20 100644 --- a/dev-lang/python/patches/python-2.7.9.patchset +++ b/dev-lang/python/patches/python-2.7.9.patchset @@ -1,4 +1,4 @@ -From f7d6b2b6f44a8f9337c9103d298222747d547ebf Mon Sep 17 00:00:00 2001 +From ca78f3e4c26f1d94def56bd1a5fec519d2b0579c Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Wed, 12 Mar 2014 21:17:06 +0000 Subject: initial Haiku patch @@ -79,7 +79,7 @@ index b9f1c6c..7be61d3 100644 # finalize_unix () diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py -index 4aa9334..d06e5e8 100644 +index de7da1d..8180c8e 100644 --- a/Lib/distutils/sysconfig.py +++ b/Lib/distutils/sysconfig.py @@ -90,7 +90,8 @@ def get_python_inc(plat_specific=0, prefix=None): @@ -497,10 +497,10 @@ index 53a6c3e..6c5f52f 100644 if (PyErr_Occurred()) { Py_DECREF(result); diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c -index 880f311..54b66f7 100644 +index e9e4479..84b6305 100644 --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c -@@ -4868,7 +4868,9 @@ init_socket(void) +@@ -4869,7 +4869,9 @@ init_socket(void) #ifndef __BEOS__ /* We have incomplete socket support. */ PyModule_AddIntConstant(m, "SOCK_RAW", SOCK_RAW); @@ -511,7 +511,7 @@ index 880f311..54b66f7 100644 PyModule_AddIntConstant(m, "SOCK_RDM", SOCK_RDM); #endif diff --git a/Modules/socketmodule.h b/Modules/socketmodule.h -index 8515499..4e33e4f 100644 +index d98e00e..2bfb3dc 100644 --- a/Modules/socketmodule.h +++ b/Modules/socketmodule.h @@ -47,6 +47,10 @@ typedef int socklen_t; @@ -584,10 +584,10 @@ index c64501e..7df3ad7 100755 elif sys.platform.startswith("atheos"): searchdirs=os.environ['C_INCLUDE_PATH'].split(':') diff --git a/configure.ac b/configure.ac -index 54f8c0f..1ea438a 100644 +index 94a215e..41fbd47 100644 --- a/configure.ac +++ b/configure.ac -@@ -883,7 +883,7 @@ if test $enable_shared = "yes"; then +@@ -886,7 +886,7 @@ if test $enable_shared = "yes"; then RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} INSTSONAME="$LDLIBRARY".$SOVERSION ;; @@ -596,7 +596,7 @@ index 54f8c0f..1ea438a 100644 LDLIBRARY='libpython$(VERSION).so' BLDLIBRARY='-L. -lpython$(VERSION)' RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} -@@ -891,6 +891,9 @@ if test $enable_shared = "yes"; then +@@ -894,6 +894,9 @@ if test $enable_shared = "yes"; then FreeBSD*) SOVERSION=`echo $SOVERSION|cut -d "." -f 1` ;; @@ -606,7 +606,7 @@ index 54f8c0f..1ea438a 100644 esac INSTSONAME="$LDLIBRARY".$SOVERSION ;; -@@ -1006,7 +1009,7 @@ AC_PROG_MKDIR_P +@@ -1009,7 +1012,7 @@ AC_PROG_MKDIR_P AC_SUBST(LN) if test -z "$LN" ; then case $ac_sys_system in @@ -615,7 +615,7 @@ index 54f8c0f..1ea438a 100644 CYGWIN*) LN="ln -s";; atheos*) LN="ln -s";; *) LN=ln;; -@@ -2030,7 +2033,7 @@ then +@@ -2033,7 +2036,7 @@ then BLDSHARED="$LDSHARED" fi ;; @@ -624,7 +624,7 @@ index 54f8c0f..1ea438a 100644 LDSHARED='$(CC) -shared' LDCXXSHARED='$(CXX) -shared';; BSD/OS*/4*) -@@ -2102,7 +2105,7 @@ then +@@ -2105,7 +2108,7 @@ then then CCSHARED="-fPIC"; else CCSHARED="+z"; fi;; @@ -633,7 +633,7 @@ index 54f8c0f..1ea438a 100644 BSD/OS*/4*) CCSHARED="-fpic";; FreeBSD*|NetBSD*|OpenBSD*|DragonFly*) CCSHARED="-fPIC";; OpenUNIX*|UnixWare*) -@@ -2134,7 +2137,7 @@ then +@@ -2137,7 +2140,7 @@ then LINKFORSHARED="-Wl,-E -Wl,+s";; # LINKFORSHARED="-Wl,-E -Wl,+s -Wl,+b\$(BINLIBDEST)/lib-dynload";; BSD/OS/4*) LINKFORSHARED="-Xlinker -export-dynamic";; @@ -642,7 +642,7 @@ index 54f8c0f..1ea438a 100644 # -u libsys_s pulls in all symbols in libsys Darwin/*) # -u _PyMac_Error is needed to pull in the mac toolbox glue, -@@ -2249,14 +2252,16 @@ case "$ac_sys_system" in +@@ -2252,14 +2255,16 @@ case "$ac_sys_system" in esac # Most SVR4 platforms (e.g. Solaris) need -lsocket and -lnsl. @@ -663,7 +663,7 @@ index 54f8c0f..1ea438a 100644 esac AC_MSG_CHECKING(for --with-libs) -@@ -3592,7 +3597,7 @@ fi], +@@ -3595,7 +3600,7 @@ fi], AC_SUBST(LIBM) case $ac_sys_system in Darwin) ;; @@ -673,10 +673,10 @@ index 54f8c0f..1ea438a 100644 esac AC_MSG_CHECKING(for --with-libm=STRING) diff --git a/setup.py b/setup.py -index a46bf35..9fe247f 100644 +index 7868b7b..bc4a1a4 100644 --- a/setup.py +++ b/setup.py -@@ -523,6 +523,12 @@ class PyBuildExt(build_ext): +@@ -525,6 +525,12 @@ class PyBuildExt(build_ext): lib_dirs += os.getenv('LIBRARY_PATH', '').split(os.pathsep) inc_dirs += ['/system/include', '/atheos/autolnk/include'] inc_dirs += os.getenv('C_INCLUDE_PATH', '').split(os.pathsep) @@ -689,7 +689,7 @@ index a46bf35..9fe247f 100644 # OSF/1 and Unixware have some stuff in /usr/ccs/lib (like -ldb) if host_platform in ['osf1', 'unixware7', 'openunix8']: -@@ -551,7 +557,7 @@ class PyBuildExt(build_ext): +@@ -553,7 +559,7 @@ class PyBuildExt(build_ext): # Check for MacOS X, which doesn't need libm.a at all math_libs = ['m'] @@ -698,7 +698,7 @@ index a46bf35..9fe247f 100644 math_libs = [] # XXX Omitted modules: gl, pure, dl, SGI-specific modules -@@ -790,15 +796,22 @@ class PyBuildExt(build_ext): +@@ -792,15 +798,22 @@ class PyBuildExt(build_ext): '/usr/local/ssl/include', '/usr/contrib/ssl/include/' ] @@ -724,7 +724,7 @@ index a46bf35..9fe247f 100644 ['/usr/local/ssl/lib', '/usr/contrib/ssl/lib/' ] ) -@@ -806,8 +819,8 @@ class PyBuildExt(build_ext): +@@ -808,8 +821,8 @@ class PyBuildExt(build_ext): if (ssl_incs is not None and ssl_libs is not None): exts.append( Extension('_ssl', ['_ssl.c'], @@ -735,7 +735,7 @@ index a46bf35..9fe247f 100644 libraries = ['ssl', 'crypto'], depends = ['socketmodule.h']), ) else: -@@ -845,8 +858,8 @@ class PyBuildExt(build_ext): +@@ -847,8 +860,8 @@ class PyBuildExt(build_ext): # The _hashlib module wraps optimized implementations # of hash functions from the OpenSSL library. exts.append( Extension('_hashlib', ['_hashopenssl.c'], @@ -746,7 +746,7 @@ index a46bf35..9fe247f 100644 libraries = ['ssl', 'crypto']) ) else: print ("warning: openssl 0x%08x is too old for _hashlib" % -@@ -1325,7 +1338,7 @@ class PyBuildExt(build_ext): +@@ -1327,7 +1340,7 @@ class PyBuildExt(build_ext): missing.append('resource') # Sun yellow pages. Some systems have the functions in libc. @@ -759,14 +759,14 @@ index a46bf35..9fe247f 100644 1.8.3.4 -From 571ed69e1ab40fd11c4a1fdcb6198ff787c5129b Mon Sep 17 00:00:00 2001 +From af64f0fbd90f24886cac80f79f3db0da46ede0e5 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sat, 5 Apr 2014 21:16:40 +0000 Subject: fix pyconfig.h path diff --git a/Makefile.pre.in b/Makefile.pre.in -index bcd83bf..f93c10a 100644 +index 7f4ec2f..25a93e5 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -105,7 +105,7 @@ BINDIR= @bindir@ @@ -782,7 +782,7 @@ index bcd83bf..f93c10a 100644 1.8.3.4 -From d49a8ee2494391b3a1c50bc652f0838ac036e046 Mon Sep 17 00:00:00 2001 +From fa99392d5c5df974b86ff319148514644731d192 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Wed, 18 Jun 2014 12:19:13 +0000 Subject: Import missed change from the 2.6.9 patches @@ -814,17 +814,17 @@ index d2e18f1..34d5aee 100644 1.8.3.4 -From a0b72ccfc2f385c3ec9148523d981c7d971e2636 Mon Sep 17 00:00:00 2001 +From c2e1dc174241f7beedf43ee5bef3c76e0600e069 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sun, 21 Sep 2014 18:59:44 +0200 Subject: gcc2 fix. diff --git a/Modules/_ctypes/libffi/include/ffi_common.h b/Modules/_ctypes/libffi/include/ffi_common.h -index 650ca69..02a1913 100644 +index 37f5a9e..37b0b25 100644 --- a/Modules/_ctypes/libffi/include/ffi_common.h +++ b/Modules/_ctypes/libffi/include/ffi_common.h -@@ -115,7 +115,7 @@ typedef signed int SINT64 __attribute__((__mode__(__DI__))); +@@ -119,7 +119,7 @@ typedef signed int SINT64 __attribute__((__mode__(__DI__))); typedef float FLOAT32; @@ -837,17 +837,17 @@ index 650ca69..02a1913 100644 1.8.3.4 -From d50a28e47cbd54263d065f47b2650333d917c2b9 Mon Sep 17 00:00:00 2001 +From a0bdbb8e92894e1de5a453ca08659d68e75b67d1 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Fri, 28 Nov 2014 16:26:28 +0000 Subject: tarfile: let link fail and catch exception. diff --git a/Lib/tarfile.py b/Lib/tarfile.py -index 57ea877..bc3f82c 100644 +index b0d1292..b5952ae 100644 --- a/Lib/tarfile.py +++ b/Lib/tarfile.py -@@ -2242,7 +2242,7 @@ class TarFile(object): +@@ -2261,7 +2261,7 @@ class TarFile(object): (platform limitation), we try to make a copy of the referenced file instead of a link. """ @@ -856,7 +856,7 @@ index 57ea877..bc3f82c 100644 # For systems that support symbolic and hard links. if tarinfo.issym(): if os.path.lexists(targetpath): -@@ -2256,7 +2256,7 @@ class TarFile(object): +@@ -2275,7 +2275,7 @@ class TarFile(object): os.link(tarinfo._link_target, targetpath) else: self._extract_member(self._find_link_target(tarinfo), targetpath) @@ -868,3 +868,39 @@ index 57ea877..bc3f82c 100644 -- 1.8.3.4 + +From 77217bde28ee863a42421f87692d986a8f784896 Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Sun, 11 Jan 2015 18:18:22 -0800 +Subject: Fix resource module after the initial haiku patch + + +diff --git a/Modules/resource.c b/Modules/resource.c +index 6c5f52f..73758bb 100644 +--- a/Modules/resource.c ++++ b/Modules/resource.c +@@ -101,6 +101,21 @@ resource_getrusage(PyObject *self, PyObject *args) + PyStructSequence_SET_ITEM(result, 13, PyInt_FromLong(ru.ru_nsignals)); + PyStructSequence_SET_ITEM(result, 14, PyInt_FromLong(ru.ru_nvcsw)); + PyStructSequence_SET_ITEM(result, 15, PyInt_FromLong(ru.ru_nivcsw)); ++#else ++ PyStructSequence_SET_ITEM(result, 2, PyInt_FromLong(0)); ++ PyStructSequence_SET_ITEM(result, 3, PyInt_FromLong(0)); ++ PyStructSequence_SET_ITEM(result, 4, PyInt_FromLong(0)); ++ PyStructSequence_SET_ITEM(result, 5, PyInt_FromLong(0)); ++ PyStructSequence_SET_ITEM(result, 6, PyInt_FromLong(0)); ++ PyStructSequence_SET_ITEM(result, 7, PyInt_FromLong(0)); ++ PyStructSequence_SET_ITEM(result, 8, PyInt_FromLong(0)); ++ PyStructSequence_SET_ITEM(result, 9, PyInt_FromLong(0)); ++ PyStructSequence_SET_ITEM(result, 10, PyInt_FromLong(0)); ++ PyStructSequence_SET_ITEM(result, 11, PyInt_FromLong(0)); ++ PyStructSequence_SET_ITEM(result, 12, PyInt_FromLong(0)); ++ PyStructSequence_SET_ITEM(result, 13, PyInt_FromLong(0)); ++ PyStructSequence_SET_ITEM(result, 14, PyInt_FromLong(0)); ++ PyStructSequence_SET_ITEM(result, 15, PyInt_FromLong(0)); + #endif + + if (PyErr_Occurred()) { +-- +1.8.3.4 + diff --git a/dev-lang/python/python-2.7.9.recipe b/dev-lang/python/python-2.7.9.recipe index dc6e40078..a5d00a643 100644 --- a/dev-lang/python/python-2.7.9.recipe +++ b/dev-lang/python/python-2.7.9.recipe @@ -13,7 +13,7 @@ LICENSE="Python" COPYRIGHT="1990-2012, Python Software Foundation" SRC_URI="https://www.python.org/ftp/python/$portVersion/Python-$portVersion.tar.xz" CHECKSUM_SHA256="90d27e14ea7e03570026850e2e50ba71ad20b7eb31035aada1cf3def8f8d4916" -REVISION="1" +REVISION="2" ARCHITECTURES="x86_gcc2 x86 x86_64" PATCHES="python-$portVersion.patchset" From 060f83d1a9f80f31d97337b074f844fe1becbaef Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Sun, 11 Jan 2015 18:43:34 -0800 Subject: [PATCH 8/9] python: Stricter [gs]et_rlimit mode detection There doesn't seem to be a better way, else than configure runtime checks, which is harmful for cross-compilation. --- dev-lang/python/patches/python-2.7.9.patchset | 91 +++++++++++++++++-- dev-lang/python/python-2.7.9.recipe | 2 +- 2 files changed, 86 insertions(+), 7 deletions(-) diff --git a/dev-lang/python/patches/python-2.7.9.patchset b/dev-lang/python/patches/python-2.7.9.patchset index b09445b20..6d16b8d6a 100644 --- a/dev-lang/python/patches/python-2.7.9.patchset +++ b/dev-lang/python/patches/python-2.7.9.patchset @@ -1,4 +1,4 @@ -From ca78f3e4c26f1d94def56bd1a5fec519d2b0579c Mon Sep 17 00:00:00 2001 +From 87c88af3eef31c978cecf0d96665af0c4109d7e5 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Wed, 12 Mar 2014 21:17:06 +0000 Subject: initial Haiku patch @@ -759,7 +759,7 @@ index 7868b7b..bc4a1a4 100644 1.8.3.4 -From af64f0fbd90f24886cac80f79f3db0da46ede0e5 Mon Sep 17 00:00:00 2001 +From 6347fda5298f9aa5eca939541924464fcf8a19d1 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sat, 5 Apr 2014 21:16:40 +0000 Subject: fix pyconfig.h path @@ -782,7 +782,7 @@ index 7f4ec2f..25a93e5 100644 1.8.3.4 -From fa99392d5c5df974b86ff319148514644731d192 Mon Sep 17 00:00:00 2001 +From 5e90b750c4bfef1376bb083d48524c41fc5fefa6 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Wed, 18 Jun 2014 12:19:13 +0000 Subject: Import missed change from the 2.6.9 patches @@ -814,7 +814,7 @@ index d2e18f1..34d5aee 100644 1.8.3.4 -From c2e1dc174241f7beedf43ee5bef3c76e0600e069 Mon Sep 17 00:00:00 2001 +From 307d21aa5ea6336db7ec3dd9429436441b61ab8d Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sun, 21 Sep 2014 18:59:44 +0200 Subject: gcc2 fix. @@ -837,7 +837,7 @@ index 37f5a9e..37b0b25 100644 1.8.3.4 -From a0bdbb8e92894e1de5a453ca08659d68e75b67d1 Mon Sep 17 00:00:00 2001 +From b1aabdb8e27c669873ec393344389aa343a6aeab Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Fri, 28 Nov 2014 16:26:28 +0000 Subject: tarfile: let link fail and catch exception. @@ -869,7 +869,7 @@ index b0d1292..b5952ae 100644 1.8.3.4 -From 77217bde28ee863a42421f87692d986a8f784896 Mon Sep 17 00:00:00 2001 +From 5398326cd9e24ca71a025f48ea0079b8d40456ec Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Sun, 11 Jan 2015 18:18:22 -0800 Subject: Fix resource module after the initial haiku patch @@ -904,3 +904,82 @@ index 6c5f52f..73758bb 100644 -- 1.8.3.4 + +From 6d7958a9371618a6b7a53f8de6b71633be2af7c3 Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Sun, 11 Jan 2015 18:40:43 -0800 +Subject: resource: Fix [gs]et_rlimit() modes detection + +Haiku defines many of them, but they are actually empty stubs that will always +return EINVAL. No better way of doing this. + +diff --git a/Modules/resource.c b/Modules/resource.c +index 73758bb..0c396f6 100644 +--- a/Modules/resource.c ++++ b/Modules/resource.c +@@ -284,19 +284,19 @@ initresource(void) + (PyObject*) &StructRUsageType); + + /* insert constants */ +-#ifdef RLIMIT_CPU ++#if !defined(__HAIKU__) && defined(RLIMIT_CPU) + PyModule_AddIntConstant(m, "RLIMIT_CPU", RLIMIT_CPU); + #endif + +-#ifdef RLIMIT_FSIZE ++#if !defined(__HAIKU__) && defined(RLIMIT_FSIZE) + PyModule_AddIntConstant(m, "RLIMIT_FSIZE", RLIMIT_FSIZE); + #endif + +-#ifdef RLIMIT_DATA ++#if !defined(__HAIKU__) && defined(RLIMIT_DATA) + PyModule_AddIntConstant(m, "RLIMIT_DATA", RLIMIT_DATA); + #endif + +-#ifdef RLIMIT_STACK ++#if !defined(__HAIKU__) && defined(RLIMIT_STACK) + PyModule_AddIntConstant(m, "RLIMIT_STACK", RLIMIT_STACK); + #endif + +@@ -308,31 +308,31 @@ initresource(void) + PyModule_AddIntConstant(m, "RLIMIT_NOFILE", RLIMIT_NOFILE); + #endif + +-#ifdef RLIMIT_OFILE ++#if !defined(__HAIKU__) && defined(RLIMIT_OFILE) + PyModule_AddIntConstant(m, "RLIMIT_OFILE", RLIMIT_OFILE); + #endif + +-#ifdef RLIMIT_VMEM ++#if !defined(__HAIKU__) && defined(RLIMIT_VMEM) + PyModule_AddIntConstant(m, "RLIMIT_VMEM", RLIMIT_VMEM); + #endif + +-#ifdef RLIMIT_AS ++#if !defined(__HAIKU__) && defined(RLIMIT_AS) + PyModule_AddIntConstant(m, "RLIMIT_AS", RLIMIT_AS); + #endif + +-#ifdef RLIMIT_RSS ++#if !defined(__HAIKU__) && defined(RLIMIT_RSS) + PyModule_AddIntConstant(m, "RLIMIT_RSS", RLIMIT_RSS); + #endif + +-#ifdef RLIMIT_NPROC ++#if !defined(__HAIKU__) && defined(RLIMIT_NPROC) + PyModule_AddIntConstant(m, "RLIMIT_NPROC", RLIMIT_NPROC); + #endif + +-#ifdef RLIMIT_MEMLOCK ++#if !defined(__HAIKU__) && defined(RLIMIT_MEMLOCK) + PyModule_AddIntConstant(m, "RLIMIT_MEMLOCK", RLIMIT_MEMLOCK); + #endif + +-#ifdef RLIMIT_SBSIZE ++#if !defined(__HAIKU__) && defined(RLIMIT_SBSIZE) + PyModule_AddIntConstant(m, "RLIMIT_SBSIZE", RLIMIT_SBSIZE); + #endif + +-- +1.8.3.4 + diff --git a/dev-lang/python/python-2.7.9.recipe b/dev-lang/python/python-2.7.9.recipe index a5d00a643..34a5db8ca 100644 --- a/dev-lang/python/python-2.7.9.recipe +++ b/dev-lang/python/python-2.7.9.recipe @@ -13,7 +13,7 @@ LICENSE="Python" COPYRIGHT="1990-2012, Python Software Foundation" SRC_URI="https://www.python.org/ftp/python/$portVersion/Python-$portVersion.tar.xz" CHECKSUM_SHA256="90d27e14ea7e03570026850e2e50ba71ad20b7eb31035aada1cf3def8f8d4916" -REVISION="2" +REVISION="3" ARCHITECTURES="x86_gcc2 x86 x86_64" PATCHES="python-$portVersion.patchset" From 1971004f25c951c01bbdcb8f722fafc30424aefe Mon Sep 17 00:00:00 2001 From: Markus Himmel Date: Sun, 11 Jan 2015 21:03:55 +0000 Subject: [PATCH 9/9] Add bpg recipe --- media-libs/bpg/bpg-0.9.4.recipe | 78 +++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100644 media-libs/bpg/bpg-0.9.4.recipe diff --git a/media-libs/bpg/bpg-0.9.4.recipe b/media-libs/bpg/bpg-0.9.4.recipe new file mode 100644 index 000000000..4b6be21e9 --- /dev/null +++ b/media-libs/bpg/bpg-0.9.4.recipe @@ -0,0 +1,78 @@ +SUMMARY="Tools and library for the Better Prortable Graphics format" +DESCRIPTION="BPG is an image format based on the HEVC standard that aims to \ +provide a replacement for the JPEG format with better quality and smaller file\ + size." + +HOMEPAGE="http://bellard.org/bpg/" +LICENSE=" + MIT + GNU LGPL v2.1 + " +COPYRIGHT="2014 Fabrice Bellard" + + +SRC_URI="http://bellard.org/bpg/libbpg-0.9.4.tar.gz" +CHECKSUM_SHA256="9986d66408f36fb678014bfcbb693c0f8358767719bc05797e4af54fa4237c2a" +SOURCE_DIR="libbpg-$portVersion" + +REVISION="1" +ARCHITECTURES="x86 ?x86_64" +# libbpg requires gcc4, so we can only do x86_gcc2 if it's a hybrid +if [ $effectiveTargetArchitecture != x86_gcc2 ]; then + ARCHITECTURES="$ARCHITECTURES x86_gcc2" +else + ARCHITECTURES="$ARCHITECTURES !x86_gcc2" +fi + +SECONDARY_ARCHITECTURES="x86" + +PROVIDES=" + bpg = $portVersion + cmd:bpgenc$secondaryArchSuffix + cmd:bpgdec$secondaryArchSuffix + " + +REQUIRES=" + haiku$secondaryArchSuffix + lib:libstdc++$secondaryArchSuffix + lib:libpng$secondaryArchSuffix + lib:libjpeg$secondaryArchSuffix + " + +PROVIDES_devel=" + libbpg${secondaryArchSuffix}_devel = $portVersion + devel:libbpg$secondaryArchSuffix = $portVersion + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + devel:libpng$secondaryArchSuffix + devel:libjpeg$secondaryArchSuffix + " + +BUILD_PREREQUIRES=" + cmd:make + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + " + +BUILD() +{ + sed -i 's/-lpthread//g' Makefile + sed -i 's/-lm//g' Makefile + sed -i 's/-lrt//g' Makefile + make +} + +INSTALL() +{ + mkdir -p $binDir + + sed -i "s,\$(prefix)/bin,$binDir,g" Makefile + make install + + mkdir -p $libDir + cp libbpg.a $libDir + prepareInstalledDevelLib libbpg + packageEntries devel $developLibDir +}