From 8317cd1f1481092103d2d9b18dae24fa6ed8d677 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 29 Jan 2013 12:23:34 +0100 Subject: [PATCH] kde-3: Remove KDE 3 hasn't built in a long time. Also remove six, the only package with a dependency on KDE 3. --- .../applications/misc/taskjuggler/default.nix | 5 +- pkgs/desktops/kde-3/kdelibs/default.nix | 51 ----- pkgs/desktops/kde-3/kdelibs/inotify.patch | 30 --- .../kdelibs-3.5.10-openssl_1.0.0.patch | 180 ------------------ pkgs/development/libraries/arts/default.nix | 31 --- pkgs/games/six/default.nix | 35 ---- pkgs/games/six/gcc43-includes.patch | 38 ---- pkgs/top-level/all-packages.nix | 22 +-- 8 files changed, 2 insertions(+), 390 deletions(-) delete mode 100644 pkgs/desktops/kde-3/kdelibs/default.nix delete mode 100644 pkgs/desktops/kde-3/kdelibs/inotify.patch delete mode 100644 pkgs/desktops/kde-3/kdelibs/kdelibs-3.5.10-openssl_1.0.0.patch delete mode 100644 pkgs/development/libraries/arts/default.nix delete mode 100644 pkgs/games/six/default.nix delete mode 100644 pkgs/games/six/gcc43-includes.patch diff --git a/pkgs/applications/misc/taskjuggler/default.nix b/pkgs/applications/misc/taskjuggler/default.nix index 652450e510b4..b8edd93455dd 100644 --- a/pkgs/applications/misc/taskjuggler/default.nix +++ b/pkgs/applications/misc/taskjuggler/default.nix @@ -1,7 +1,6 @@ {stdenv, fetchurl, zlib, libpng, libjpeg, perl, expat, qt3, libX11, libXext, libSM, libICE, -withKde, kdelibs, kdebase }: stdenv.mkDerivation rec { @@ -13,7 +12,6 @@ stdenv.mkDerivation rec { buildInputs = [zlib libpng libX11 libXext libSM libICE perl expat libjpeg] - ++ (if withKde then [kdelibs] else []) ; patches = [ ./timezone-glibc.patch ]; @@ -51,7 +49,6 @@ stdenv.mkDerivation rec { --x-includes=${libX11}/include --x-libraries=${libX11}/lib --with-qt-dir=${qt3} - --with-kde-support=${if withKde then "yes" else "no"} --with-ical-support=${if withKde then "yes" else "no"} "; preInstall = '' @@ -61,7 +58,7 @@ stdenv.mkDerivation rec { installFlags = # kde_locale is not defined when installing without kde. - if withKde then "" else "kde_locale=\${out}/share/locale"; + "kde_locale=\${out}/share/locale"; meta = { homepage = "http://www.taskjuggler.org"; diff --git a/pkgs/desktops/kde-3/kdelibs/default.nix b/pkgs/desktops/kde-3/kdelibs/default.nix deleted file mode 100644 index 2c9e8e3563a8..000000000000 --- a/pkgs/desktops/kde-3/kdelibs/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ stdenv, fetchurl, xlibs, zlib, perl, qt3, openssl, pcre -, pkgconfig, libtiff, libxml2, libxslt, libtool, expat -, freetype, bzip2, cups, attr, acl -}: - -let version = "3.5.10"; in - -stdenv.mkDerivation { - name = "kdelibs-${version}"; - - src = fetchurl { - url = "mirror://kde/stable/${version}/src/kdelibs-${version}.tar.bz2"; - sha256 = "0wjw51r96h6rngbsrzndw890xggzvrakydsbaldlrvbh3jq9qzk1"; - }; - - patches = [ - # We're not supposed to use linux/inotify.h, use sys/inotify.h instead. - # Adapted from Gentoo. - ./inotify.patch - - # Fixes compilation issues with openssl-1.0.0 - ./kdelibs-3.5.10-openssl_1.0.0.patch - ]; - - buildInputs = [ - zlib perl qt3 openssl pcre pkgconfig libtiff libxml2 - libxslt expat libtool freetype bzip2 cups - xlibs.libX11 xlibs.libXt xlibs.libXext xlibs.libXrender xlibs.libXft - ]; - - propagatedBuildInputs = [attr acl]; - - # Prevent configure from looking for pkg-config and freetype-config - # in the wrong location (it looks in /usr/bin etc. *before* looking - # in $PATH). - preConfigure = '' - substituteInPlace configure \ - --replace /usr/bin /no-such-path \ - --replace /usr/local/bin /no-such-path \ - --replace /opt/local/bin /no-such-path - ''; - - configureFlags = '' - --without-arts - --with-ssl-dir=${openssl} - --x-includes=${xlibs.libX11}/include - --x-libraries=${xlibs.libX11}/lib - ''; - - meta.platforms = stdenv.lib.platforms.linux; -} diff --git a/pkgs/desktops/kde-3/kdelibs/inotify.patch b/pkgs/desktops/kde-3/kdelibs/inotify.patch deleted file mode 100644 index 3d0b470811af..000000000000 --- a/pkgs/desktops/kde-3/kdelibs/inotify.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -rc kdelibs-3.5.10-orig/kio/kio/kdirwatch.cpp kdelibs-3.5.10/kio/kio/kdirwatch.cpp -*** kdelibs-3.5.10-orig/kio/kio/kdirwatch.cpp 2006-07-22 10:16:37.000000000 +0200 ---- kdelibs-3.5.10/kio/kio/kdirwatch.cpp 2009-04-01 13:26:48.000000000 +0200 -*************** -*** 64,74 **** - // debug - #include - -! #ifdef HAVE_INOTIFY - #include - #include - #include -- #include - // Linux kernel headers are documented to not compile - #define _S390_BITOPS_H - #include ---- 64,76 ---- - // debug - #include - -! #if 1 -! #include -! #include -! #elif HAVE_INOTIFY - #include - #include - #include - // Linux kernel headers are documented to not compile - #define _S390_BITOPS_H - #include diff --git a/pkgs/desktops/kde-3/kdelibs/kdelibs-3.5.10-openssl_1.0.0.patch b/pkgs/desktops/kde-3/kdelibs/kdelibs-3.5.10-openssl_1.0.0.patch deleted file mode 100644 index 7a3a96e972f8..000000000000 --- a/pkgs/desktops/kde-3/kdelibs/kdelibs-3.5.10-openssl_1.0.0.patch +++ /dev/null @@ -1,180 +0,0 @@ -diff -Naur kdelibs-3.5.10-old/kio/kssl/kopenssl.cc kdelibs-3.5.10-new/kio/kssl/kopenssl.cc ---- kdelibs-3.5.10-old/kio/kssl/kopenssl.cc 2006-07-22 01:16:39.000000000 -0700 -+++ kdelibs-3.5.10-new/kio/kssl/kopenssl.cc 2010-03-31 09:34:38.000000000 -0700 -@@ -96,9 +96,14 @@ - static int (*K_PEM_ASN1_write_bio) (int (*)(),const char *,BIO *,char *, - const EVP_CIPHER *,unsigned char *,int , - pem_password_cb *, void *) = 0L; -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+static int (*K_ASN1_item_i2d_fp)(ASN1_ITEM *,FILE *,unsigned char *) = 0L; -+static ASN1_ITEM *K_NETSCAPE_X509_it = 0L; -+#else - static ASN1_METHOD* (*K_X509_asn1_meth) (void) = 0L; - static int (*K_ASN1_i2d_fp)(int (*)(),FILE *,unsigned char *) = 0L; - static int (*K_i2d_ASN1_HEADER)(ASN1_HEADER *, unsigned char **) = 0L; -+#endif - static int (*K_X509_print_fp) (FILE *, X509*) = 0L; - static int (*K_i2d_PKCS12) (PKCS12*, unsigned char**) = 0L; - static int (*K_i2d_PKCS12_fp) (FILE *, PKCS12*) = 0L; -@@ -404,9 +409,14 @@ - K_BIO_ctrl = (long (*) (BIO *,int,long,void *)) _cryptoLib->symbol("BIO_ctrl"); - K_BIO_write = (int (*) (BIO *b, const void *data, int len)) _cryptoLib->symbol("BIO_write"); - K_PEM_ASN1_write_bio = (int (*)(int (*)(), const char *,BIO*, char*, const EVP_CIPHER *, unsigned char *, int, pem_password_cb *, void *)) _cryptoLib->symbol("PEM_ASN1_write_bio"); -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+ K_ASN1_item_i2d_fp = (int (*)(ASN1_ITEM *, FILE*, unsigned char *)) _cryptoLib->symbol("ASN1_item_i2d_fp"); -+ K_NETSCAPE_X509_it = (ASN1_ITEM *) _cryptoLib->symbol("NETSCAPE_X509_it"); -+#else - K_X509_asn1_meth = (ASN1_METHOD* (*)(void)) _cryptoLib->symbol("X509_asn1_meth"); - K_ASN1_i2d_fp = (int (*)(int (*)(), FILE*, unsigned char *)) _cryptoLib->symbol("ASN1_i2d_fp"); - K_i2d_ASN1_HEADER = (int (*)(ASN1_HEADER *, unsigned char **)) _cryptoLib->symbol("i2d_ASN1_HEADER"); -+#endif - K_X509_print_fp = (int (*)(FILE*, X509*)) _cryptoLib->symbol("X509_print_fp"); - K_i2d_PKCS12 = (int (*)(PKCS12*, unsigned char**)) _cryptoLib->symbol("i2d_PKCS12"); - K_i2d_PKCS12_fp = (int (*)(FILE *, PKCS12*)) _cryptoLib->symbol("i2d_PKCS12_fp"); -@@ -568,7 +578,7 @@ - K_SSL_set_session = (int (*)(SSL*,SSL_SESSION*)) _sslLib->symbol("SSL_set_session"); - K_d2i_SSL_SESSION = (SSL_SESSION* (*)(SSL_SESSION**,unsigned char**, long)) _sslLib->symbol("d2i_SSL_SESSION"); - K_i2d_SSL_SESSION = (int (*)(SSL_SESSION*,unsigned char**)) _sslLib->symbol("i2d_SSL_SESSION"); -- K_SSL_get_ciphers = (STACK *(*)(const SSL*)) _sslLib->symbol("SSL_get_ciphers"); -+ K_SSL_get_ciphers = (STACK_OF(SSL_CIPHER) *(*)(const SSL*)) _sslLib->symbol("SSL_get_ciphers"); - #endif - - -@@ -956,7 +966,13 @@ - else return -1; - } - -- -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+int KOpenSSLProxy::ASN1_i2d_fp(FILE *out,unsigned char *x) { -+ if (K_ASN1_item_i2d_fp && K_NETSCAPE_X509_it) -+ return (K_ASN1_item_i2d_fp)(K_NETSCAPE_X509_it, out, x); -+ else return -1; -+} -+#else - ASN1_METHOD *KOpenSSLProxy::X509_asn1_meth(void) { - if (K_X509_asn1_meth) return (K_X509_asn1_meth)(); - else return 0L; -@@ -968,7 +984,7 @@ - return (K_ASN1_i2d_fp)((int (*)())K_i2d_ASN1_HEADER, out, x); - else return -1; - } -- -+#endif - - int KOpenSSLProxy::X509_print(FILE *fp, X509 *x) { - if (K_X509_print_fp) return (K_X509_print_fp)(fp, x); -diff -Naur kdelibs-3.5.10-old/kio/kssl/kopenssl.h kdelibs-3.5.10-new/kio/kssl/kopenssl.h ---- kdelibs-3.5.10-old/kio/kssl/kopenssl.h 2006-07-22 01:16:39.000000000 -0700 -+++ kdelibs-3.5.10-new/kio/kssl/kopenssl.h 2010-03-31 09:35:20.000000000 -0700 -@@ -48,6 +48,9 @@ - #include - #include - #undef crypt -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+#define STACK _STACK -+#endif - #endif - - #include -@@ -446,12 +449,12 @@ - */ - int PEM_write_bio_X509(BIO *bp, X509 *x); - -- -+#if OPENSSL_VERSION_NUMBER < 0x10000000L - /* - * X509_asn1_meth - used for netscape output - */ - ASN1_METHOD *X509_asn1_meth(); -- -+#endif - - /* - * ASN1_i2d_fp - used for netscape output -@@ -531,6 +534,9 @@ - */ - void sk_free(STACK *s); - -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+ void sk_free(void *s) { return sk_free(reinterpret_cast(s)); } -+#endif - - /* - * Number of elements in the stack -@@ -543,6 +549,9 @@ - */ - char *sk_value(STACK *s, int n); - -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+ char *sk_value(void *s, int n) { return sk_value(reinterpret_cast(s), n); } -+#endif - - /* - * Create a new stack -@@ -555,6 +564,9 @@ - */ - int sk_push(STACK *s, char *d); - -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+ int sk_push(void *s, void *d) { return sk_push(reinterpret_cast(s), reinterpret_cast(d)); } -+#endif - - /* - * Duplicate the stack -diff -Naur kdelibs-3.5.10-old/kio/kssl/ksmimecrypto.cc kdelibs-3.5.10-new/kio/kssl/ksmimecrypto.cc ---- kdelibs-3.5.10-old/kio/kssl/ksmimecrypto.cc 2005-10-10 08:05:44.000000000 -0700 -+++ kdelibs-3.5.10-new/kio/kssl/ksmimecrypto.cc 2010-03-31 09:34:38.000000000 -0700 -@@ -87,7 +87,7 @@ - - - STACK_OF(X509) *KSMIMECryptoPrivate::certsToX509(QPtrList &certs) { -- STACK_OF(X509) *x509 = sk_new(NULL); -+ STACK_OF(X509) *x509 = reinterpret_cast(sk_new(NULL)); - KSSLCertificate *cert = certs.first(); - while(cert) { - sk_X509_push(x509, cert->getCert()); -diff -Naur kdelibs-3.5.10-old/kio/kssl/ksslcertificate.cc kdelibs-3.5.10-new/kio/kssl/ksslcertificate.cc ---- kdelibs-3.5.10-old/kio/kssl/ksslcertificate.cc 2006-01-19 09:06:12.000000000 -0800 -+++ kdelibs-3.5.10-new/kio/kssl/ksslcertificate.cc 2010-03-31 09:34:38.000000000 -0700 -@@ -1003,17 +1003,31 @@ - QByteArray KSSLCertificate::toNetscape() { - QByteArray qba; - #ifdef KSSL_HAVE_SSL --ASN1_HEADER ah; --ASN1_OCTET_STRING os; --KTempFile ktf; -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+ NETSCAPE_X509 nx; -+ ASN1_OCTET_STRING hdr; -+#else -+ ASN1_HEADER ah; -+ ASN1_OCTET_STRING os; -+#endif -+ KTempFile ktf; - -- os.data = (unsigned char *)NETSCAPE_CERT_HDR; -- os.length = strlen(NETSCAPE_CERT_HDR); -- ah.header = &os; -- ah.data = (char *)getCert(); -- ah.meth = d->kossl->X509_asn1_meth(); -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+ hdr.data = (unsigned char *)NETSCAPE_CERT_HDR; -+ hdr.length = strlen(NETSCAPE_CERT_HDR); -+ nx.header = &hdr; -+ nx.cert = getCert(); -+ -+ d->kossl->ASN1_i2d_fp(ktf.fstream(),(unsigned char *)&nx); -+#else -+ os.data = (unsigned char *)NETSCAPE_CERT_HDR; -+ os.length = strlen(NETSCAPE_CERT_HDR); -+ ah.header = &os; -+ ah.data = (char *)getCert(); -+ ah.meth = d->kossl->X509_asn1_meth(); - -- d->kossl->ASN1_i2d_fp(ktf.fstream(),(unsigned char *)&ah); -+ d->kossl->ASN1_i2d_fp(ktf.fstream(),(unsigned char *)&ah); -+#endif - - ktf.close(); - diff --git a/pkgs/development/libraries/arts/default.nix b/pkgs/development/libraries/arts/default.nix deleted file mode 100644 index 50c270f534e7..000000000000 --- a/pkgs/development/libraries/arts/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{stdenv, fetchurl, pkgconfig, glib, kdelibs, libX11, libXext, zlib, libjpeg -, libpng, perl, qt3}: - -stdenv.mkDerivation { - name = "arts-1.5.10"; - - src = fetchurl { - url = mirror://kde/stable/3.5.10/src/arts-1.5.10.tar.bz2; - sha256 = "0ffcm24lkgg3sm89q4zsj8za5h5d9j1195pmbjhx4hj0xcwkiqlj"; - }; - - KDEDIR = kdelibs; - - configureFlags = '' - --with-extra-includes=${libjpeg}/include - --with-extra-libs=${libjpeg}/lib - --x-includes=${libX11}/include - --x-libraries=${libX11}/lib - --disable-dependency-tracking - --enable-final - ''; - - buildNativeInputs = [ pkgconfig perl ]; - - buildInputs = - [glib kdelibs libX11 libXext zlib libjpeg libpng qt3]; - - meta = { - homepage = http://www.arts-project.org/; - }; -} diff --git a/pkgs/games/six/default.nix b/pkgs/games/six/default.nix deleted file mode 100644 index a95ed6c50c65..000000000000 --- a/pkgs/games/six/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv, fetchurl, arts, kdelibs, libX11, libXext, libXt, perl, qt3, zlib }: - -let - - versionNumber = "0.5.3"; - -in - -stdenv.mkDerivation { - - name = "six-${versionNumber}"; - - src = fetchurl { - url = "http://six.retes.hu/download/six-${versionNumber}.tar.gz"; - sha256 = "0hialm0kxr11rp5z452whjmxp2vaqqj668d0dfs32fd10ggi8wj4"; - }; - - meta = { - description = "Six - A Hex playing program for KDE"; - homepage = http://six.retes.hu/; - license = "GPLv2"; - platforms = stdenv.lib.platforms.linux; - }; - - buildInputs = [ arts kdelibs libX11 libXext libXt perl qt3 zlib ]; - - # Supress some warnings which are less useful to us when making packages. - NIX_CFLAGS_COMPILE = "-Wno-conversion -Wno-parentheses"; - - # Without "--x-libraries=", we get the error - # "impure path `/usr/lib' used in link". - configureFlags = "--x-libraries="; - - patches = [ ./gcc43-includes.patch ]; -} diff --git a/pkgs/games/six/gcc43-includes.patch b/pkgs/games/six/gcc43-includes.patch deleted file mode 100644 index 83096bb0da2b..000000000000 --- a/pkgs/games/six/gcc43-includes.patch +++ /dev/null @@ -1,38 +0,0 @@ -This patch makes six compile with gcc 4.3 by including more header files. It -is based on the advice at . - ---- a/six/carrier.h -+++ b/six/carrier.h -@@ -2,6 +2,7 @@ - #ifndef CARRIER_H - #define CARRIER_H - -+#include - #include - #include - -diff --git a/six/hexgame.cpp b/six/hexgame.cpp -index 720e977..5d0dafe 100644 ---- a/six/hexgame.cpp -+++ b/six/hexgame.cpp -@@ -3,6 +3,7 @@ - #include - #include - #include -+#include - - #include - -diff --git a/six/main.cpp b/six/main.cpp -index 7fb5c21..b925a0c 100644 ---- a/six/main.cpp -+++ b/six/main.cpp -@@ -4,6 +4,8 @@ - #include "carrier.h" - #include "misc.h" - -+#include -+ - #include - #include - #include diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7b17379aedcb..7391ca21d104 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7887,11 +7887,7 @@ let teamspeak_client = callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { }; - taskjuggler = callPackage ../applications/misc/taskjuggler { - # KDE support is not working yet. - inherit (kde3) kdelibs kdebase; - withKde = config.taskJuggler.kde or false; - }; + taskjuggler = callPackage ../applications/misc/taskjuggler { }; taskwarrior = callPackage ../applications/misc/taskwarrior { }; @@ -8367,10 +8363,6 @@ let simutrans = callPackage ../games/simutrans { }; - six = callPackage ../games/six { - inherit (kde3) arts kdelibs; - }; - soi = callPackage ../games/soi {}; # You still can override by passing more arguments. @@ -8495,18 +8487,6 @@ let gnome = recurseIntoAttrs gnome2; - kde3 = recurseIntoAttrs { - - kdelibs = callPackage ../desktops/kde-3/kdelibs { - stdenv = overrideGCC stdenv gcc43; - }; - - arts = callPackage ../development/libraries/arts { - inherit (pkgs.kde3) kdelibs; - }; - - }; - kde4 = recurseIntoAttrs pkgs.kde47; kde47 = kdePackagesFor (pkgs.kde47 // {