From d79afaff6a63623477e0747cb5a839e2bda807b7 Mon Sep 17 00:00:00 2001 From: Klemens Nanni Date: Tue, 14 Jun 2022 16:23:47 +0200 Subject: [PATCH] qtscriptgenerator: remove (Qt4) Currently fetched from google archives, upstream is dead since 2017 and nothing depends on it. It has not received any package updates since its introduction in 2012 (as dependency for Amarok), execept for build/infrastructure changes. amarok-kde4 and thus the dependency was dropped in 2017. qcad uses qtscriptgenerator internally, but it bundles its own copy. See #174634. --- .../libraries/qtscriptgenerator/default.nix | 51 ------------------- .../libraries/qtscriptgenerator/qt-4.8.patch | 23 --------- .../qtscriptgenerator.gcc-4.4.patch | 11 ---- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 5 files changed, 1 insertion(+), 87 deletions(-) delete mode 100644 pkgs/development/libraries/qtscriptgenerator/default.nix delete mode 100644 pkgs/development/libraries/qtscriptgenerator/qt-4.8.patch delete mode 100644 pkgs/development/libraries/qtscriptgenerator/qtscriptgenerator.gcc-4.4.patch diff --git a/pkgs/development/libraries/qtscriptgenerator/default.nix b/pkgs/development/libraries/qtscriptgenerator/default.nix deleted file mode 100644 index dc7cab8d4d52..000000000000 --- a/pkgs/development/libraries/qtscriptgenerator/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ lib, stdenv, fetchurl, qt4 }: - -stdenv.mkDerivation rec { - pname = "qtscriptgenerator"; - version = "0.1.0"; - - src = fetchurl { - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/qtscriptgenerator/qtscriptgenerator-src-${version}.tar.gz"; - sha256 = "0h8zjh38n2wfz7jld0jz6a09y66dbsd2jhm4f2024qfgcmxcabj6"; - }; - buildInputs = [ qt4 ]; - - patches = [ ./qtscriptgenerator.gcc-4.4.patch ./qt-4.8.patch ]; - - postPatch = '' - # remove phonon stuff which causes errors (thanks to Gentoo bug reports) - sed -i "/typesystem_phonon.xml/d" generator/generator.qrc - sed -i "/qtscript_phonon/d" qtbindings/qtbindings.pro - ''; - - configurePhase = '' - ( cd generator; qmake ) - ( cd qtbindings; qmake ) - ''; - - buildPhase = '' - makeFlags="SHELL=$SHELL ''${enableParallelBuilding:+-j$NIX_BUILD_CORES -l$NIX_BUILD_CORES}" - make $makeFlags -C generator - - # Set QTDIR, see https://code.google.com/archive/p/qtscriptgenerator/issues/38 - ( cd generator; QTDIR=${qt4} ./generator ) - make $makeFlags -C qtbindings - ''; - - installPhase = '' - mkdir -p $out/lib/qt4/plugins/script - cp -av plugins/script/* $out/lib/qt4/plugins/script - ''; - - enableParallelBuilding = true; - - hardeningDisable = [ "format" ]; - - meta = { - broken = (stdenv.isLinux && stdenv.isAarch64); - description = "QtScript bindings generator"; - homepage = "https://code.qt.io/cgit/qt-labs/qtscriptgenerator.git/"; - inherit (qt4.meta) platforms; - license = lib.licenses.lgpl21; - }; -} diff --git a/pkgs/development/libraries/qtscriptgenerator/qt-4.8.patch b/pkgs/development/libraries/qtscriptgenerator/qt-4.8.patch deleted file mode 100644 index 8fe643e2c98f..000000000000 --- a/pkgs/development/libraries/qtscriptgenerator/qt-4.8.patch +++ /dev/null @@ -1,23 +0,0 @@ -Origin: http://src.fedoraproject.org/gitweb/?p=qtscriptgenerator.git;a=blob_plain;f=qtscriptgenerator-src-0.1.0-no_QFileOpenEvent.patch;h=f397b5ab13bcfc268e6d7b7ba4c6bc66ae38b5c0;hb=HEAD -diff -up qtscriptgenerator-src-0.1.0/generator/typesystem_gui-common.xml.no_QFileOpenEvent qtscriptgenerator-src-0.1.0/generator/typesystem_gui-common.xml ---- qtscriptgenerator-src-0.1.0/generator/typesystem_gui-common.xml.no_QFileOpenEvent 2011-12-22 11:34:52.615149619 -0600 -+++ qtscriptgenerator-src-0.1.0/generator/typesystem_gui-common.xml 2011-12-22 11:35:31.808659632 -0600 -@@ -2233,7 +2233,6 @@ - - - -- - - - -diff -up qtscriptgenerator-src-0.1.0/generator/typesystem_gui.xml.no_QFileOpenEvent qtscriptgenerator-src-0.1.0/generator/typesystem_gui.xml ---- qtscriptgenerator-src-0.1.0/generator/typesystem_gui.xml.no_QFileOpenEvent 2009-02-20 05:42:24.000000000 -0600 -+++ qtscriptgenerator-src-0.1.0/generator/typesystem_gui.xml 2011-12-22 11:33:43.058019203 -0600 -@@ -2555,7 +2555,6 @@ - - - -- - - - diff --git a/pkgs/development/libraries/qtscriptgenerator/qtscriptgenerator.gcc-4.4.patch b/pkgs/development/libraries/qtscriptgenerator/qtscriptgenerator.gcc-4.4.patch deleted file mode 100644 index c0a710efb157..000000000000 --- a/pkgs/development/libraries/qtscriptgenerator/qtscriptgenerator.gcc-4.4.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -uNr generator.orig/parser/rpp/pp.h generator/parser/rpp/pp.h ---- qtscriptgenerator-src-0.1.0/generator.orig/parser/rpp/pp.h 2008-12-05 11:01:44.000000000 +0100 -+++ qtscriptgenerator-src-0.1.0/generator/parser/rpp/pp.h 2008-12-13 10:42:22.000000000 +0100 -@@ -30,6 +30,7 @@ - #include - - #include -+#include - - #ifdef HAVE_MMAP - # include diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 7b9c55ee702e..28f77428415c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1172,6 +1172,7 @@ mapAliases ({ qt5ct = libsForQt5.qt5ct; # Added 2021-12-27 qtcurve = libsForQt5.qtcurve; # Added 2020-11-07 qtkeychain = throw "the qtkeychain attribute (qt4 version) has been removes, use the qt5 version: libsForQt5.qtkeychain"; # Added 2021-08-04 + qtscriptgenerator = throw "'qtscriptgenerator' (Qt4) is unmaintained upstream and not used in nixpkgs"; # Added 2022-06-14 quagga = throw "quagga is no longer maintained upstream"; # Added 2021-04-22 quake3game = throw "'quake3game' has been renamed to/replaced by 'ioquake3'"; # Converted to throw 2022-02-22 quaternion-git = throw "quaternion-git has been removed in favor of the stable version 'quaternion'"; # Added 2020-04-09 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ae72b3c5d7b6..fb49a015f79d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20359,8 +20359,6 @@ with pkgs; inherit lib pkgs qt6; }); - qtscriptgenerator = callPackage ../development/libraries/qtscriptgenerator { }; - quark-engine = callPackage ../tools/security/quark-engine { }; quesoglc = callPackage ../development/libraries/quesoglc { };