diff options
Diffstat (limited to 'pkgs/development/libraries/aalib')
-rw-r--r-- | pkgs/development/libraries/aalib/clang.patch | 74 | ||||
-rw-r--r-- | pkgs/development/libraries/aalib/darwin.patch | 106 | ||||
-rw-r--r-- | pkgs/development/libraries/aalib/default.nix | 43 |
3 files changed, 0 insertions, 223 deletions
diff --git a/pkgs/development/libraries/aalib/clang.patch b/pkgs/development/libraries/aalib/clang.patch deleted file mode 100644 index 5f8fa80f387d..000000000000 --- a/pkgs/development/libraries/aalib/clang.patch +++ /dev/null @@ -1,74 +0,0 @@ -diff -ur a/configure b/configure ---- a/configure 2001-04-26 10:44:54.000000000 -0400 -+++ b/configure 2023-10-21 23:19:52.941161475 -0400 -@@ -1005,7 +1005,7 @@ - #line 1006 "configure" - #include "confdefs.h" - --main(){return(0);} -+int main(){return(0);} - EOF - if { (eval echo configure:1011: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - ac_cv_prog_cc_works=yes -diff -ur a/src/aafire.c b/src/aafire.c ---- a/src/aafire.c 2001-04-26 11:30:03.000000000 -0400 -+++ b/src/aafire.c 2023-10-21 23:46:54.478750904 -0400 -@@ -1,3 +1,4 @@ -+#include <stdlib.h> - #include <stdio.h> - #include "aalib.h" - -diff -ur a/src/aainfo.c b/src/aainfo.c ---- a/src/aainfo.c 2001-04-26 10:37:31.000000000 -0400 -+++ b/src/aainfo.c 2023-10-21 23:31:54.141133353 -0400 -@@ -1,4 +1,4 @@ -- -+#include <stdlib.h> - #include "aalib.h" - #include "aaint.h" - int main(int argc, char **argv) -diff -ur a/src/aakbdreg.c b/src/aakbdreg.c ---- a/src/aakbdreg.c 2023-10-21 23:19:00.787207960 -0400 -+++ b/src/aakbdreg.c 2023-10-21 23:23:49.667253541 -0400 -@@ -1,4 +1,5 @@ - #include <malloc.h> -+#include <string.h> - #include "config.h" - #include "aalib.h" - #include "aaint.h" -diff -ur a/src/aamoureg.c b/src/aamoureg.c ---- a/src/aamoureg.c 2023-10-21 23:19:00.787725591 -0400 -+++ b/src/aamoureg.c 2023-10-21 23:26:51.821477807 -0400 -@@ -1,4 +1,5 @@ - #include <malloc.h> -+#include <string.h> - #include "config.h" - #include "aalib.h" - #include "aaint.h" -diff -ur a/src/aaregist.c b/src/aaregist.c ---- a/src/aaregist.c 2023-10-21 23:19:00.788130179 -0400 -+++ b/src/aaregist.c 2023-10-21 23:19:38.929729034 -0400 -@@ -1,4 +1,5 @@ - #include <malloc.h> -+#include <string.h> - #include "config.h" - #include "aalib.h" - #include "aaint.h" -diff -ur a/src/aasavefont.c b/src/aasavefont.c ---- a/src/aasavefont.c 2001-04-26 10:37:31.000000000 -0400 -+++ b/src/aasavefont.c 2023-10-21 23:51:09.216521714 -0400 -@@ -1,3 +1,5 @@ -+#include <stdlib.h> -+#include <stdio.h> - #include "aalib.h" - int main(int argc, char **argv) - { -diff -ur a/src/aatest.c b/src/aatest.c ---- a/src/aatest.c 2001-04-26 10:37:31.000000000 -0400 -+++ b/src/aatest.c 2023-10-21 23:43:16.758422704 -0400 -@@ -1,3 +1,5 @@ -+#include <stdlib.h> -+#include <string.h> - #include "aalib.h" - int main(int argc, char **argv) - { diff --git a/pkgs/development/libraries/aalib/darwin.patch b/pkgs/development/libraries/aalib/darwin.patch deleted file mode 100644 index 94b548b35c16..000000000000 --- a/pkgs/development/libraries/aalib/darwin.patch +++ /dev/null @@ -1,106 +0,0 @@ -diff --git a/src/aaedit.c b/src/aaedit.c -index 09534d2..2ea52f9 100644 ---- a/src/aaedit.c -+++ b/src/aaedit.c -@@ -1,6 +1,6 @@ - #include <string.h> - #include <ctype.h> --#include <malloc.h> -+#include <stdlib.h> - #include "aalib.h" - #include "aaint.h" - static void aa_editdisplay(struct aa_edit *e) - -diff --git a/src/aakbdreg.c b/src/aakbdreg.c -index def65fe..f4f8efb 100644 ---- a/src/aakbdreg.c -+++ b/src/aakbdreg.c -@@ -1,4 +1,4 @@ --#include <malloc.h> -+#include <stdlib.h> - #include <string.h> - #include "config.h" - #include "aalib.h" -diff --git a/src/aalib.c b/src/aalib.c -index 11fecc8..e3063b4 100644 ---- a/src/aalib.c -+++ b/src/aalib.c -@@ -1,6 +1,6 @@ - #include <stdio.h> - #include <string.h> --#include <malloc.h> -+#include <stdlib.h> - #include "aalib.h" - #include "aaint.h" - -diff --git a/src/aamoureg.c b/src/aamoureg.c -index 0380828..bb55fe3 100644 ---- a/src/aamoureg.c -+++ b/src/aamoureg.c -@@ -1,4 +1,4 @@ --#include <malloc.h> -+#include <stdlib.h> - #include <string.h> - #include "config.h" - #include "aalib.h" -diff --git a/src/aarec.c b/src/aarec.c -index 70f4ebc..ee43e8a 100644 ---- a/src/aarec.c -+++ b/src/aarec.c -@@ -1,5 +1,5 @@ - #include <string.h> --#include <malloc.h> -+#include <stdlib.h> - #include "aalib.h" - #include "aaint.h" - aa_linkedlist *aa_kbdrecommended = NULL, *aa_mouserecommended = NULL, -diff --git a/src/aaregist.c b/src/aaregist.c -index 54abec0..765155e 100644 ---- a/src/aaregist.c -+++ b/src/aaregist.c -@@ -1,4 +1,4 @@ --#include <malloc.h> -+#include <stdlib.h> - #include <string.h> - #include "config.h" - #include "aalib.h" -diff --git a/src/aax.c b/src/aax.c -index adcbd82..36e3294 100644 ---- a/src/aax.c -+++ b/src/aax.c -@@ -1,4 +1,3 @@ --#include <malloc.h> - #include <stdlib.h> - #include <string.h> - #include <stdio.h> -diff --git a/src/aaxkbd.c b/src/aaxkbd.c -index 30d5903..da2248d 100644 ---- a/src/aaxkbd.c -+++ b/src/aaxkbd.c -@@ -1,4 +1,3 @@ --#include <malloc.h> - #include <stdlib.h> - #include <string.h> - #include <stdio.h> -diff --git a/src/aaxmouse.c b/src/aaxmouse.c -index 9935b03..7e725ad 100644 ---- a/src/aaxmouse.c -+++ b/src/aaxmouse.c -@@ -1,4 +1,3 @@ --#include <malloc.h> - #include <stdlib.h> - #include <string.h> - #include <stdio.h> -diff --git a/aalib.m4 b/aalib.m4 -index c40b8db..991fbda 100644 ---- a/aalib.m4 -+++ b/aalib.m4 -@@ -9,7 +9,7 @@ - dnl AM_PATH_AALIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) - dnl Test for AALIB, and define AALIB_CFLAGS and AALIB_LIBS - dnl --AC_DEFUN(AM_PATH_AALIB, -+AC_DEFUN([AM_PATH_AALIB], - [dnl - dnl Get the cflags and libraries from the aalib-config script - dnl diff --git a/pkgs/development/libraries/aalib/default.nix b/pkgs/development/libraries/aalib/default.nix deleted file mode 100644 index 903364ea27f6..000000000000 --- a/pkgs/development/libraries/aalib/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{lib, stdenv, fetchurl, ncurses, automake}: - -stdenv.mkDerivation rec { - pname = "aalib"; - version = "1.4rc5"; - - src = fetchurl { - url = "mirror://sourceforge/aa-project/aalib-${version}.tar.gz"; - sha256 = "1vkh19gb76agvh4h87ysbrgy82hrw88lnsvhynjf4vng629dmpgv"; - }; - - outputs = [ "bin" "dev" "out" "man" "info" ]; - setOutputFlags = false; # Doesn't support all the flags - - patches = [ ./clang.patch ] # Fix implicit `int` on `main` error with newer versions of clang - ++ lib.optionals stdenv.isDarwin [ ./darwin.patch ]; - - # The fuloong2f is not supported by aalib still - preConfigure = '' - cp ${automake}/share/automake*/config.{sub,guess} . - configureFlagsArray+=( - "--bindir=$bin/bin" - "--includedir=$dev/include" - "--libdir=$out/lib" - ) - ''; - - buildInputs = [ ncurses ]; - - configureFlags = [ "--without-x" "--with-ncurses=${ncurses.dev}" ]; - - postInstall = '' - mkdir -p $dev/bin - mv $bin/bin/aalib-config $dev/bin/aalib-config - substituteInPlace $out/lib/libaa.la --replace "${ncurses.dev}/lib" "${ncurses.out}/lib" - ''; - - meta = { - description = "ASCII art graphics library"; - platforms = lib.platforms.unix; - license = lib.licenses.lgpl2; - }; -} |