From 337d25c774fd992a0be3aaa17eefc25d683688cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20=C4=8Cert=C3=ADk?= Date: Fri, 15 May 2015 16:16:35 -0600 Subject: [PATCH 1/2] Update ncurses to 5.9-20141206 Upstream only distributes the 5.9 version plus the 20141206 patch in a form that is not easy to apply, so I pushed it into a git repository. The clang-fix.patch, even though it applies, actually makes clang fail to build it and removing the patch fixes it. The package now builds on OS X 10.10 both with the native clang as well as with Hashstack's gcc. --- pkgs/ncurses/clang-fix.patch | 42 ------------------------------------ pkgs/ncurses/ncurses.yaml | 11 ++-------- 2 files changed, 2 insertions(+), 51 deletions(-) delete mode 100644 pkgs/ncurses/clang-fix.patch diff --git a/pkgs/ncurses/clang-fix.patch b/pkgs/ncurses/clang-fix.patch deleted file mode 100644 index ce33049bf..000000000 --- a/pkgs/ncurses/clang-fix.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -ruNp ncurses-5.8.orig/c++/cursesf.h ncurses-5.8/c++/cursesf.h ---- ncurses-5.8.orig/c++/cursesf.h 2005-08-13 21:08:24.000000000 +0300 -+++ ncurses-5.8/c++/cursesf.h 2011-04-03 18:29:29.000000000 +0300 -@@ -681,7 +681,7 @@ public: - const T* p_UserData = STATIC_CAST(T*)(0), - bool with_frame=FALSE, - bool autoDelete_Fields=FALSE) -- : NCursesForm (Fields, with_frame, autoDelete_Fields) { -+ : NCursesForm (&Fields, with_frame, autoDelete_Fields) { - if (form) - set_user (const_cast(p_UserData)); - }; -@@ -694,7 +694,7 @@ public: - const T* p_UserData = STATIC_CAST(T*)(0), - bool with_frame=FALSE, - bool autoDelete_Fields=FALSE) -- : NCursesForm (Fields, nlines, ncols, begin_y, begin_x, -+ : NCursesForm (&Fields, nlines, ncols, begin_y, begin_x, - with_frame, autoDelete_Fields) { - if (form) - set_user (const_cast(p_UserData)); -diff -ruNp ncurses-5.8.orig/c++/cursesm.h ncurses-5.8/c++/cursesm.h ---- ncurses-5.8.orig/c++/cursesm.h 2005-08-13 21:10:36.000000000 +0300 -+++ ncurses-5.8/c++/cursesm.h 2011-04-03 18:31:42.000000000 +0300 -@@ -639,7 +639,7 @@ public: - const T* p_UserData = STATIC_CAST(T*)(0), - bool with_frame=FALSE, - bool autoDelete_Items=FALSE) -- : NCursesMenu (Items, with_frame, autoDelete_Items) { -+ : NCursesMenu (&Items, with_frame, autoDelete_Items) { - if (menu) - set_user (const_cast(p_UserData)); - }; -@@ -651,7 +651,7 @@ public: - int begin_x = 0, - const T* p_UserData = STATIC_CAST(T*)(0), - bool with_frame=FALSE) -- : NCursesMenu (Items, nlines, ncols, begin_y, begin_x, with_frame) { -+ : NCursesMenu (&Items, nlines, ncols, begin_y, begin_x, with_frame) { - if (menu) - set_user (const_cast(p_UserData)); - }; diff --git a/pkgs/ncurses/ncurses.yaml b/pkgs/ncurses/ncurses.yaml index f1ad68afd..55419d3f0 100644 --- a/pkgs/ncurses/ncurses.yaml +++ b/pkgs/ncurses/ncurses.yaml @@ -1,20 +1,13 @@ extends: [autotools_package] sources: - - url: http://ftp.gnu.org/pub/gnu/ncurses/ncurses-5.9.tar.gz - key: tar.gz:sbdctd5uiazezhkbgxwou6dz77wykrw5 + - key: git:2031c7bde2dfb2189b9c724946f19c089596eac4 + url: https://github.com/certik/ncurses defaults: relocatable: false build_stages: - - name: patch - before: configure - files: [clang-fix.patch] - handler: bash - bash: | - patch -up1 < _hashdist/clang-fix.patch - - name: configure mode: override extra: ['--with-shared', '--without-profile', '--without-debug', From f8b50d103b598b17eb2df5aad360337dfc8244fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20=C4=8Cert=C3=ADk?= Date: Sat, 16 May 2015 09:17:53 -0600 Subject: [PATCH 2/2] Move the repository to hashdist/pkg-ncurses --- pkgs/ncurses/ncurses.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/ncurses/ncurses.yaml b/pkgs/ncurses/ncurses.yaml index 55419d3f0..8ab8292a1 100644 --- a/pkgs/ncurses/ncurses.yaml +++ b/pkgs/ncurses/ncurses.yaml @@ -2,7 +2,7 @@ extends: [autotools_package] sources: - key: git:2031c7bde2dfb2189b9c724946f19c089596eac4 - url: https://github.com/certik/ncurses + url: https://github.com/hashdist/pkg-ncurses defaults: relocatable: false