haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 19:50:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Reorganized recipe, IPV6 patch.

Browse Source
This commit is contained in:
miqlas
2015-10-18 08:48:47 +00:00
parent 56269ce02b
commit dc5a84a3cc
2 changed files with 32 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app-shells/fish/fish-2.2.0.recipe
View File

@@ -1,15 +1,14 @@
SUMMARY="The friendly interactive shell"
DESCRIPTION="
Fish is a shell geared towards interactive use. Its features are \
DESCRIPTION="Fish is a shell geared towards interactive use. Its features are \
focused on user friendliness and discoverability. The language syntax \
is simple but incompatible with other shell languages.
"
is simple but incompatible with other shell languages."
HOMEPAGE="http://ridiculousfish.com/shell/"
COPYRIGHT="2005-2015 Axel Liljencrantz"
LICENSE="GNU GPL v2"
REVISION="1"
SOURCE_URI="https://github.com/fish-shell/fish-shell/releases/download/2.2.0/fish-2.2.0.tar.gz"
CHECKSUM_SHA256="a76339fd14ce2ec229283c53e805faac48c3e99d9e3ede9d82c0554acfc7b77a"
REVISION="1"
LICENSE="GNU GPL v2"
COPYRIGHT="2005-2015 Axel Liljencrantz"
PATCHES="fish-2.2.0.patch"
ARCHITECTURES="!x86_gcc2 x86 ?x86_64"
SECONDARY_ARCHITECTURES="x86"
@@ -26,7 +25,9 @@ REQUIRES="
lib:libncurses$secondaryArchSuffix
lib:libgettextlib_0.18.1$secondaryArchSuffix >= 0.18.1.1
lib:libintl$secondaryArchSuffix
cmd:python
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libiconv$secondaryArchSuffix
@@ -45,8 +46,6 @@ BUILD_PREREQUIRES="
#cmd:doxygen >= 1.6.3
"
PATCHES="fish-2.2.0.patch"
GLOBAL_WRITABLE_FILES="
settings/fish/config.fish keep-old
"

30
app-shells/fish/patches/fish-2.2.0.patch
View File

@@ -1,11 +1,11 @@
diff --git a/configure.ac b/configure.ac
index 49ff391..7d22bf9 100644
index 49ff391..20d17fb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -100,6 +100,18 @@ echo "CXXFLAGS: $CXXFLAGS"
#
@@ -101,6 +101,20 @@ echo "CXXFLAGS: $CXXFLAGS"
AC_CONFIG_HEADERS(config.h)
+dnl ----------------------------------------------
+dnl CHECK FOR MACHINE/VENDOR/OPERATING SYSTEM TYPE
+dnl ----------------------------------------------
@@ -18,10 +18,12 @@ index 49ff391..7d22bf9 100644
+[Define to be a string corresponding the vendor of the machine.])
+AC_DEFINE_UNQUOTED(OSTYPE, "$host_os",
+[Define to be the name of the operating system.])
+
+
#
# This adds markup to the code that results in a few extra compile
@@ -210,9 +222,16 @@ CXXFLAGS="$CXXFLAGS -Wall -Wno-sign-compare"
# time checks on recent GCC versions. It helps stop a few common bugs.
@@ -210,9 +224,16 @@ CXXFLAGS="$CXXFLAGS -Wall -Wno-sign-compare"
# This is needed in order to get the really cool backtraces on Linux
#
@@ -41,7 +43,7 @@ index 49ff391..7d22bf9 100644
#
# On Cygwin, we need to add some flags for ncurses.
@@ -349,7 +368,7 @@ AC_DEFINE([NOMACROS], [1], [Define to 1 to disable curses macros that conflict w
@@ -349,7 +370,7 @@ AC_DEFINE([NOMACROS], [1], [Define to 1 to disable curses macros that conflict w
#
# Check for os dependant libraries for all binaries.
@@ -65,3 +67,19 @@ index b493de2..8e8046b 100644
private:
long long last_change_time;
uint32_t last_seed;
diff --git a/share/tools/web_config/webconfig.py b/share/tools/web_config/webconfig.py
index 359946a..3c65ac2 100755
--- a/share/tools/web_config/webconfig.py
+++ b/share/tools/web_config/webconfig.py
@@ -20,7 +20,10 @@ else:
from urllib.parse import parse_qs
# Check to see if IPv6 is enabled in the kernel
-HAS_IPV6 = True
+# HAIKU BUGFIX. FIXME! Something wrong with the IPV6 support
+#HAS_IPV6 = True
+HAS_IPV6 = False
+# HAIKU BUGFIX.
try:
s = socket.socket(socket.AF_INET6, socket.SOCK_DGRAM)
s.close()