From f63ce99feebf5f516ed0ae568b68941babf9238b Mon Sep 17 00:00:00 2001 From: miqlas Date: Fri, 3 Feb 2017 14:38:09 +0100 Subject: [PATCH] Fish: bump version, patches upstreamed (#1138) --- .../{fish-2.4.0.recipe => fish-2.5.0.recipe} | 17 +-- app-shells/fish/patches/fish-2.4.0.patchset | 136 ------------------ app-shells/fish/patches/fish-2.5.0.patchset | 26 ++++ 3 files changed, 35 insertions(+), 144 deletions(-) rename app-shells/fish/{fish-2.4.0.recipe => fish-2.5.0.recipe} (90%) delete mode 100644 app-shells/fish/patches/fish-2.4.0.patchset create mode 100644 app-shells/fish/patches/fish-2.5.0.patchset diff --git a/app-shells/fish/fish-2.4.0.recipe b/app-shells/fish/fish-2.5.0.recipe similarity index 90% rename from app-shells/fish/fish-2.4.0.recipe rename to app-shells/fish/fish-2.5.0.recipe index efe4dbfea..3ba78b99d 100644 --- a/app-shells/fish/fish-2.4.0.recipe +++ b/app-shells/fish/fish-2.5.0.recipe @@ -3,11 +3,11 @@ 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." HOMEPAGE="http://ridiculousfish.com/shell/" -COPYRIGHT="2005-2016 Axel Liljencrantz" +COPYRIGHT="2005-2017 Axel Liljencrantz" LICENSE="GNU GPL v2" -REVISION="3" +REVISION="1" SOURCE_URI="https://github.com/fish-shell/fish-shell/archive/$portVersion.tar.gz" -CHECKSUM_SHA256="5b7680232cadcadeba42e38aac33bfd4d12333e70342d3d3485ad5d329b1f465" +CHECKSUM_SHA256="03733fc4ec6dbdd10b3711ca5646436610d13ce0c3a14399787ab29471b2c24e" SOURCE_DIR="fish-shell-$portVersion" PATCHES="fish-$portVersion.patchset" @@ -35,21 +35,22 @@ REQUIRES=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libexecinfo$secondaryArchSuffix + devel:libgettextlib$secondaryArchSuffix devel:libiconv$secondaryArchSuffix devel:libncursesw$secondaryArchSuffix - devel:libgettextlib$secondaryArchSuffix devel:libpcre2_32$secondaryArchSuffix " BUILD_PREREQUIRES=" cmd:aclocal cmd:autoconf cmd:automake + cmd:doxygen + cmd:gcc$secondaryArchSuffix cmd:libtoolize$secondaryArchSuffix cmd:make - cmd:gcc$secondaryArchSuffix - cmd:which + cmd:python cmd:sed - #cmd:doxygen >= 1.6.3 + cmd:which " GLOBAL_WRITABLE_FILES=" @@ -58,7 +59,7 @@ GLOBAL_WRITABLE_FILES=" BUILD() { - autoreconf -vfi + autoreconf -fi export CFLAGS="-D_BSD_SOURCE" export CXXFLAGS=$CFLAGS diff --git a/app-shells/fish/patches/fish-2.4.0.patchset b/app-shells/fish/patches/fish-2.4.0.patchset deleted file mode 100644 index 09a1767eb..000000000 --- a/app-shells/fish/patches/fish-2.4.0.patchset +++ /dev/null @@ -1,136 +0,0 @@ -From a603738d32b75605f40d4822c7610394dad19481 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= -Date: Wed, 9 Nov 2016 22:54:29 +0100 -Subject: [PATCH] Search for connect in libnetwork on Haiku - ---- - configure.ac | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index f655811..4e94386 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -250,8 +250,7 @@ AC_DEFINE([NOMACROS], [1], [Define to 1 to disable curses macros that conflict w - # - - # Check for os dependant libraries for all binaries. --AC_SEARCH_LIBS( connect, socket, , [AC_MSG_ERROR([Cannot find the socket library, needed to build this package.] )] ) --AC_SEARCH_LIBS( nanosleep, rt, , [AC_MSG_ERROR([Cannot find the rt library, needed to build this package.] )] ) -+AC_SEARCH_LIBS( connect, [socket network], , [AC_MSG_ERROR([Cannot find the socket library, needed to build this package.] )] )AC_SEARCH_LIBS( nanosleep, rt, , [AC_MSG_ERROR([Cannot find the rt library, needed to build this package.] )] ) - AC_SEARCH_LIBS( shm_open, rt, , [AC_MSG_ERROR([Cannot find the rt library, needed to build this package.] )] ) - AC_SEARCH_LIBS( pthread_create, pthread, , [AC_MSG_ERROR([Cannot find the pthread library, needed to build this package.] )] ) - AC_SEARCH_LIBS( setupterm, [ncurses tinfo curses], , [AC_MSG_ERROR([Could not find a curses implementation, needed to build fish. If this is Linux, try running 'sudo apt-get install libncurses5-dev' or 'sudo yum install ncurses-devel'])] ) --- -2.10.0 - -From eb350821c721616c92372bc2c0ab1f93ab32c0dd Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= -Date: Wed, 9 Nov 2016 22:51:23 +0100 -Subject: [PATCH] Haiku network support - ---- - src/env_universal_common.cpp | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/env_universal_common.cpp b/src/env_universal_common.cpp -index a77eb6a..f3b0048 100644 ---- a/src/env_universal_common.cpp -+++ b/src/env_universal_common.cpp -@@ -44,6 +44,11 @@ - #include - #endif - -+#ifdef __HAIKU__ -+#define _BSD_SOURCE -+#include -+#endif //Haiku -+ - // NAME_MAX is not defined on Solaris and suggests the use of pathconf() - // There is no obvious sensible pathconf() for shared memory and _XPG_NAME_MAX - // seems a reasonable choice. --- -2.10.0 - -From 9e23b7873520ffedb0a56cb08cc024eb788982dd Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= -Date: Wed, 9 Nov 2016 22:49:48 +0100 -Subject: [PATCH] Haiku /bin/open support - ---- - share/functions/open.fish | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/share/functions/open.fish b/share/functions/open.fish -index 533b3df..852f4a1 100644 ---- a/share/functions/open.fish -+++ b/share/functions/open.fish -@@ -21,6 +21,10 @@ if not test (uname) = Darwin - for i in $argv - xdg-open $i - end -+ else if type -q -f /bin/open -+ for i in $argv -+ /bin/open $i -+ end - else - echo (_ 'No open utility found. Try installing "xdg-open" or "xdg-utils".') - end --- -2.10.0 - -From 4ff6bb8916a15e99c2f1f14b1dc1583313032ca5 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= -Date: Wed, 9 Nov 2016 22:56:44 +0100 -Subject: [PATCH] Something wrong with IPV6, so disable for now. - ---- - share/tools/web_config/webconfig.py | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/share/tools/web_config/webconfig.py b/share/tools/web_config/webconfig.py -index eb5dc5c..097f384 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 -+# Not working in Haiku. FIXME! -+#HAS_IPV6 = True -+HAS_IPV6 = False -+# FIXME! - try: - s = socket.socket(socket.AF_INET6, socket.SOCK_DGRAM) - s.close() --- -2.10.0 - -From 298f3f2a13cac920da136525a9c936788876033c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= -Date: Thu, 22 Dec 2016 16:01:19 +0100 -Subject: [PATCH] Fish: hide socket warning at start. HACK! - ---- - src/fish.cpp | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/fish.cpp b/src/fish.cpp -index 644e62a..d81e173 100644 ---- a/src/fish.cpp -+++ b/src/fish.cpp -@@ -210,7 +210,9 @@ static int try_connect_socket(std::string &name) { - /// fails with EPROTOTYPE, the connection is probably a STREAM; if it succeeds or fails any - /// other way, there is no cause for alarm. With thanks to Andrew Lutomirski - if ((s = socket(AF_UNIX, SOCK_DGRAM, 0)) == -1) { -- wperror(L"socket"); -+ #ifndef __HAIKU__ -+ wperror(L"socket"); -+ #endif - return -1; - } - --- -2.10.2 - diff --git a/app-shells/fish/patches/fish-2.5.0.patchset b/app-shells/fish/patches/fish-2.5.0.patchset new file mode 100644 index 000000000..8a5689742 --- /dev/null +++ b/app-shells/fish/patches/fish-2.5.0.patchset @@ -0,0 +1,26 @@ +From 9e23b7873520ffedb0a56cb08cc024eb788982dd Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= +Date: Wed, 9 Nov 2016 22:49:48 +0100 +Subject: [PATCH] Haiku /bin/open support + +--- + share/functions/open.fish | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/share/functions/open.fish b/share/functions/open.fish +index 533b3df..852f4a1 100644 +--- a/share/functions/open.fish ++++ b/share/functions/open.fish +@@ -21,6 +21,10 @@ if not test (uname) = Darwin + for i in $argv + xdg-open $i + end ++ else if type -q -f /bin/open ++ for i in $argv ++ /bin/open $i ++ end + else + echo (_ 'No open utility found. Try installing "xdg-open" or "xdg-utils".') + end +-- +2.10.0 \ No newline at end of file