Merge pull request #200103 from azahi/xvidcap

xvidcap: remove,gnome2.scrollkeeper: remove

pkgs/applications/video/xvidcap/default.nix

@@ -1,52 +0,0 @@
-{ lib
-, stdenv
-, fetchurl
-, perlPackages
-, pkg-config
-, gtk2
-, scrollkeeper
-, libglade
-, libXmu
-, libX11
-, libXext
-, gettext
-, lame
-, libXfixes
-, libXdamage
-}:
-
-stdenv.mkDerivation rec {
-  pname = "xvidcap";
-  version = "1.1.7";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/xvidcap/xvidcap-${version}.tar.gz";
-    sha256 = "0p8rhpyhxgy37crf1xk1046z4p663jg7ww776jw92pld3s024ihm";
-  };
-
-  patches = [ ./xlib.patch ];
-
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [
-    gtk2
-    scrollkeeper
-    libglade
-    libXmu
-    gettext
-    lame
-    libXdamage
-    libXfixes
-    libXext
-    libX11
-  ] ++ (with perlPackages; [ perl XMLParser ]);
-
-  # !!! don't know why this is necessary
-  NIX_LDFLAGS = "-lXext -lX11 -lz -lgcc_s";
-
-  meta = with lib; {
-    description = "Screencast video catpuring tool";
-    homepage = "http://xvidcap.sourceforge.net/";
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}

pkgs/applications/video/xvidcap/xlib.patch

@@ -1,15 +0,0 @@
-diff --git a/src/app_data.c b/src/app_data.c
-index 5a44363..482b115 100644
---- a/src/app_data.c
-+++ b/src/app_data.c
-@@ -52,9 +52,9 @@
- #include <pthread.h>
- #include <signal.h>
- 
-+#include <X11/Xlib.h>
- #ifdef HAVE_LIBXFIXES
- #include <X11/X.h>
--#include <X11/Xlib.h>
- #include <X11/Xlibint.h>
- #include <X11/Xproto.h>
- #include <X11/Xutil.h>

pkgs/desktops/gnome-2/default.nix

@@ -55,9 +55,6 @@ lib.makeScope pkgs.newScope (self: with self; {
 
 #### DESKTOP
 
-  # Removed from recent GNOME releases, but still required
-  scrollkeeper = callPackage ./desktop/scrollkeeper { };
-
   gtksourceview = callPackage ./desktop/gtksourceview {
     autoreconfHook = pkgs.autoreconfHook269;
   };

pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix

@@ -1,22 +0,0 @@
-{ lib, stdenv, fetchurl, pkg-config, perlPackages, libxml2, libxslt, docbook_xml_dtd_42, automake, gettext }:
-
-stdenv.mkDerivation rec {
-  pname = "scrollkeeper";
-  version = "0.3.14";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/scrollkeeper/${lib.versions.majorMinor version}/scrollkeeper-${version}.tar.bz2";
-    sha256 = "08n1xgj1f53zahwm0wpn3jid3rfbhi3iwby0ilaaldnid5qriqgc";
-  };
-
-  # The fuloong2f is not supported by scrollkeeper-0.3.14 config.guess
-  preConfigure = "
-    substituteInPlace extract/dtds/Makefile.am --replace /usr/bin/xmlcatalog xmlcatalog
-    cp ${automake}/share/automake*/config.{sub,guess} .
-  ";
-
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ libxml2 libxslt gettext ]
-    ++ (with perlPackages; [ perl XMLParser ]);
-  configureFlags = [ "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/catalog.xml" ];
-}

pkgs/top-level/aliases.nix

@@ -1332,6 +1332,7 @@ mapAliases ({
   scim = throw "'scim' has been renamed to/replaced by 'sc-im'"; # Converted to throw 2022-02-22
   scollector = throw "'scollector' has been renamed to/replaced by 'bosun'"; # Converted to throw 2022-02-22
   scribusUnstable = throw "'scribusUnstable' has been renamed to 'scribus'"; # Added 2022-05-13
+  scrollkeeper = throw "'scrollkeeper' has been removed due to deprecated LibXML2 headers"; # Added 2022-11-08
   scyther = throw "scyther has been removed since it currently only supports Python 2, see https://github.com/cascremers/scyther/issues/20"; # Added 2021-10-07
   sdlmame = mame; # Added 2019-10-30
   seeks = throw "seeks has been removed from nixpkgs, as it was unmaintained"; # Added 2020-06-21
@@ -1599,6 +1600,7 @@ mapAliases ({
   ); # Added 2022-08-02
   xpraGtk3 = throw "'xpraGtk3' has been renamed to/replaced by 'xpra'"; # Converted to throw 2022-02-22
   xv = xxv; # Added 2020-02-22
+  xvidcap = throw "'xvidcap' has been removed because of a broken dependency"; # Added 2022-11-08
   xvfb_run = xvfb-run; # Added 2021-05-07
 
   ### Y ###

pkgs/top-level/all-packages.nix

@@ -33232,10 +33232,6 @@ with pkgs;
 
   xnotify = callPackage ../tools/X11/xnotify { };
 
-  xvidcap = callPackage ../applications/video/xvidcap {
-    inherit (gnome2) scrollkeeper libglade;
-  };
-
   xygrib = libsForQt514.callPackage ../applications/misc/xygrib {};
 
   xzgv = callPackage ../applications/graphics/xzgv { };