remove icecat3

pkgs/applications/networking/browsers/icecat-3/default.nix

@@ -1,118 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, gtk, pango, perl, python, ply, zip, libIDL
-, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs, alsaLib
-, libnotify, gnome_vfs, libgnomeui
-, freetype, fontconfig, wirelesstools ? null, pixman
-, application ? "browser" }:
-
-# Build the WiFi stuff on Linux-based systems.
-# FIXME: Disable for now until it can actually be built:
-# http://thread.gmane.org/gmane.comp.gnu.gnuzilla/1376 .
-#assert stdenv.isLinux -> (wirelesstools != null);
-
-let version = "3.6.15"; in
-stdenv.mkDerivation {
-  name = "icecat-${version}";
-
-  src = fetchurl {
-    url = "mirror://gnu/gnuzilla/${version}/icecat-${version}.tar.xz";
-    sha256 = "1px018bd81c81a4hbz0qgf89pkshkbhg4abwq1d26dwy8128cxwg";
-  };
-
-  buildInputs =
-    [ libgnomeui libnotify gnome_vfs alsaLib
-      pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2 pixman
-      python ply dbus dbus_glib pango freetype fontconfig
-      xlibs.libXi xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt
-    ]
-    ++ (stdenv.lib.optional false /* stdenv.isLinux */ wirelesstools);
-
-  patches = [
-    ./skip-gre-registration.patch ./rpath-link.patch
-  ];
-
-  configureFlags =
-    [ "--enable-application=${application}"
-      "--enable-libxul"
-      "--disable-javaxpcom"
-
-      "--enable-optimize"
-      "--disable-debug"
-      "--enable-strip"
-      "--with-system-jpeg"
-      "--with-system-zlib"
-      "--with-system-bz2"
-      # "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support"
-      "--enable-system-cairo"
-      #"--enable-system-sqlite" # <-- this seems to be discouraged
-      "--disable-crashreporter"
-    ]
-    ++ (stdenv.lib.optional true /* (!stdenv.isLinux) */ "--disable-necko-wifi");
-
-  postInstall = ''
-    export dontPatchELF=1;
-
-    # Strip some more stuff
-    strip -S "$out/lib/"*"/"* || true
-
-    # This fixes starting IceCat when there already is a running
-    # instance.  The `icecat' wrapper script actually expects to be
-    # in the same directory as `run-mozilla.sh', apparently.
-    libDir=$(cd $out/lib && ls -d icecat-[0-9]*)
-    test -n "$libDir"
-
-    if [ -f "$out/bin/icecat" ]
-    then
-        # Fix references to /bin paths in the IceCat shell script.
-        substituteInPlace $out/bin/icecat		\
-            --replace /bin/pwd "$(type -tP pwd)"	\
-            --replace /bin/ls "$(type -tP ls)"
-
-        cd $out/bin
-        mv icecat ../lib/$libDir/
-        ln -s ../lib/$libDir/icecat .
-
-        # Register extensions etc.
-        echo "running \`icecat -register'..."
-        (cd $out/lib/$libDir && LD_LIBRARY_PATH=. ./icecat-bin -register) || false
-    fi
-
-    if [ -f "$out/lib/$libDir/xpidl" ]
-    then
-        # XulRunner's IDL compiler.
-        echo "linking \`xpidl'..."
-        ln -s "$out/lib/$libDir/xpidl" "$out/bin"
-    fi
-
-    # Put the GNU IceCat icon in the right place.
-    mkdir -p "$out/lib/$libDir/chrome/icons/default"
-    ln -s ../../../icons/default.xpm  "$out/lib/$libDir/chrome/icons/default/"
-  '';
-
-  enableParallelBuilding = true;
-
-  meta = {
-    description = "GNU IceCat, a free web browser based on Mozilla Firefox";
-
-    longDescription = ''
-      Gnuzilla is the GNU version of the Mozilla suite, and GNU IceCat
-      is the GNU version of the Firefox browser.  Its main advantage
-      is an ethical one: it is entirely free software.  While the
-      source code from the Mozilla project is free software, the
-      binaries that they release include additional non-free software.
-      Also, they distribute and recommend non-free software as
-      plug-ins.  In addition, GNU IceCat includes some privacy
-      protection features.
-    '';
-
-    homepage = http://www.gnu.org/software/gnuzilla/;
-    license = [ "GPLv2+" "LGPLv2+" "MPLv1+" ];
-    broken = true;
-    maintainers = [ ];
-    platforms = stdenv.lib.platforms.gnu;
-  };
-
-  passthru = {
-    inherit gtk version;
-    isFirefox3Like = true;
-  };
-}

pkgs/applications/networking/browsers/icecat-3/rpath-link.patch

@@ -1,14 +0,0 @@
-Without this patch, IceCat ends up linking with
-`-Wl,-rpath-link=/bin -Wl-,-rpath-link=/lib'.
-
---- icecat-3.5/js/src/configure	2009-07-04 18:03:01.000000000 +0200
-+++ icecat-3.5/js/src/configure	2009-07-13 18:34:30.000000000 +0200
-@@ -4775,7 +4775,6 @@ HOST_AR='$(AR)'
- HOST_AR_FLAGS='$(AR_FLAGS)'
- 
- MOZ_JS_LIBS='-L$(libdir) -lmozjs'
--MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(PREFIX)/lib'
- 
- MOZ_COMPONENT_NSPR_LIBS='-L$(LIBXUL_DIST)/bin $(NSPR_LIBS)'
- MOZ_XPCOM_OBSOLETE_LIBS='-L$(LIBXUL_DIST)/lib -lxpcom_compat'
-

pkgs/applications/networking/browsers/icecat-3/skip-gre-registration.patch

@@ -1,12 +0,0 @@
-Skip "GRE" registration since that assumes write access to `/etc'.
-
---- icecat-3.0.1-g1/xulrunner/installer/Makefile.in	2008-07-27 12:52:16.000000000 +0200
-+++ icecat-3.0.1-g1/xulrunner/installer/Makefile.in	2008-09-08 17:19:17.000000000 +0200
-@@ -71,6 +71,7 @@ $(MOZILLA_VERSION).system.conf: $(topsrc
- 	printf "[%s]\nGRE_PATH=%s\nxulrunner=true\nabi=%s" \
- 	  $(MOZILLA_VERSION) $(installdir) $(TARGET_XPCOM_ABI)> $@
- 
-+SKIP_GRE_REGISTRATION = yes
- ifndef SKIP_GRE_REGISTRATION
- # to register xulrunner per-user, override this with $HOME/.gre.d
- regdir = /etc/gre.d

pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix

@@ -8,9 +8,6 @@ stdenv.mkDerivation rec {
     sha256 = "0zkvqrzibrbljiccvz3rhbmgifxadlrfjylqpz48jnjx9kggynms";
   };
 
-  patches =
-    stdenv.lib.optional (browser ? isFirefox3Like) ./icecat3-idldir.patch;
-
   postConfigure =
     (if browser ? isFirefox3Like then ''
        # Cause a rebuild of these file from the IDL file, needed for GNU IceCat 3

pkgs/top-level/all-packages.nix

@@ -8995,26 +8995,6 @@ let
 
   i810switch = callPackage ../os-specific/linux/i810switch { };
 
-  icecat3 = lowPrio (callPackage ../applications/networking/browsers/icecat-3 {
-    inherit (gnome) libIDL libgnomeui gnome_vfs;
-    inherit (xlibs) pixman;
-    inherit (pythonPackages) ply;
-  });
-
-  icecatXulrunner3 = lowPrio (callPackage ../applications/networking/browsers/icecat-3 {
-    application = "xulrunner";
-    inherit (gnome) libIDL libgnomeui gnome_vfs;
-    inherit (xlibs) pixman;
-    inherit (pythonPackages) ply;
-  });
-
-  icecat3Xul =
-    (symlinkJoin "icecat-with-xulrunner-${icecat3.version}"
-       [ icecat3 icecatXulrunner3 ])
-    // { inherit (icecat3) gtk isFirefox3Like meta; };
-
-  icecat3Wrapper = wrapFirefox { browser = icecat3Xul; browserName = "icecat"; desktopName = "IceCat"; };
-
   icewm = callPackage ../applications/window-managers/icewm { };
 
   id3v2 = callPackage ../applications/audio/id3v2 { };

pkgs/top-level/release-small.nix

@@ -74,7 +74,6 @@ with import ./release-lib.nix { inherit supportedSystems; };
   hello = all;
   host = linux;
   iana_etc = linux;
-  icecat3Xul = linux;
   icewm = linux;
   idutils = all;
   ifplugd = linux;

pkgs/top-level/release.nix

@@ -160,7 +160,6 @@ let
       htmlTidy = all;
       hugin = linux;
       iana_etc = linux;
-      icecat3Xul = linux;
       icewm = linux;
       idutils = all;
       ifplugd = linux;