Unverified Commit 0bdc78c0 authored by Bobby Rong's avatar Bobby Rong Committed by GitHub
Browse files

Merge pull request #210822 from bobby285271/rm/gnome-2 

gnome2: remove some packages
parents 6428ee29 9a03fd87

pkgs/applications/graphics/xournal/default.nix

+1 −3
Original line number Diff line number Diff line 
{ lib, stdenv, fetchurl, makeDesktopItem

, ghostscript, atk, gtk2, glib, fontconfig, freetype

, libgnomecanvas, libgnomeprint, libgnomeprintui

, libgnomecanvas

, pango, libX11, xorgproto, zlib, poppler

, autoconf, automake, libtool, pkg-config}:
@@ -20,8 +20,6 @@ stdenv.mkDerivation rec { 
    ghostscript atk gtk2 glib fontconfig freetype

    libgnomecanvas

    pango libX11 xorgproto zlib poppler

  ] ++ lib.optionals (!stdenv.isDarwin) [

    libgnomeprint libgnomeprintui

  ];



  nativeBuildInputs = [ autoconf automake libtool pkg-config ];

pkgs/desktops/gnome-2/default.nix

+7 −14
Original line number Diff line number Diff line
@@ -14,20 +14,10 @@ lib.makeScope pkgs.newScope (self: with self; { 


  libglade = callPackage ./platform/libglade { };



  libgnomeprint = callPackage ./platform/libgnomeprint { };



  libgnomeprintui = callPackage ./platform/libgnomeprintui { };



  libgnomecups = callPackage ./platform/libgnomecups { };



  libgtkhtml = callPackage ./platform/libgtkhtml { };



  GConf = callPackage ./platform/GConf { };



  libgnomecanvas = callPackage ./platform/libgnomecanvas { };



  libgnomecanvasmm = callPackage ./platform/libgnomecanvasmm { };



  # for git-head builds

  gnome-common = callPackage platform/gnome-common { };
@@ -43,10 +33,6 @@ lib.makeScope pkgs.newScope (self: with self; { 


  libbonoboui = callPackage ./platform/libbonoboui { };



  gtkhtml = callPackage ./platform/gtkhtml { enchant = pkgs.enchant1; };



  gtkhtml4 = callPackage ./platform/gtkhtml/4.x.nix { enchant = pkgs.enchant2; };



  gtkglext = callPackage ./platform/gtkglext { };



#### DESKTOP
@@ -79,6 +65,13 @@ lib.makeScope pkgs.newScope (self: with self; { 
  gnome_common = gnome-common;

  gnome_python = throw "gnome2.gnome_python has been removed"; # 2023-01-14

  gnome_python_desktop = throw "gnome2.gnome_python_desktop has been removed"; # 2023-01-14

  gtkhtml = throw "gnome2.gtkhtml has been removed"; # 2023-01-15

  gtkhtml4 = throw "gnome2.gtkhtml4 has been removed"; # 2023-01-15

  libglademm = throw "gnome2.libglademm has been removed"; # 2022-01-15

  libgnomecanvasmm = "gnome2.libgnomecanvasmm has been removed"; # 2022-01-15

  libgnomecups = throw "gnome2.libgnomecups has been removed"; # 2023-01-15

  libgnomeprint = throw "gnome2.libgnomeprint has been removed"; # 2023-01-15

  libgnomeprintui = throw "gnome2.libgnomeprintui has been removed"; # 2023-01-15

  libgtkhtml = throw "gnome2.libgtkhtml has been removed"; # 2023-01-15

  python_rsvg = throw "gnome2.python_rsvg has been removed"; # 2023-01-14

})

pkgs/desktops/gnome-2/platform/gtkhtml/01_remove-disable-deprecated.patch

deleted100644 → 0
+0 −17
Original line number Diff line number Diff line 
diff -Naur gtkhtml-3.32.2-orig/configure gtkhtml-3.32.2/configure

--- gtkhtml-3.32.2-orig/configure	2011-02-05 23:12:31.000000000 -0500

+++ gtkhtml-3.32.2/configure	2011-04-22 13:03:18.228874636 -0400

@@ -5761,12 +5761,7 @@

 

 if test "x${enable_deprecated_flags}" = "xyes"; then

 

-  list="-DG_DISABLE_DEPRECATED

-		-DPANGO_DISABLE_DEPRECATED

-		-DGDK_DISABLE_DEPRECATED

-		-DGDK_PIXBUF_DISABLE_DEPRECATED

-		-DGTK_DISABLE_DEPRECATED

-		-DGNOME_DISABLE_DEPRECATED"

+  list=""

   flags_supported=""

   flags_unsupported=""

   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for supported compiler flags" >&5

pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix

deleted100644 → 0
+0 −30
Original line number Diff line number Diff line 
{ stdenv, fetchFromGitLab, pkg-config, gtk3, intltool, autoreconfHook, fetchpatch

, GConf, enchant, isocodes, gnome-icon-theme, gsettings-desktop-schemas }:



stdenv.mkDerivation rec {

  version = "4.10.0";

  pname = "gtkhtml";



  src = fetchFromGitLab {

    domain = "gitlab.gnome.org";

    owner = "Archive";

    repo = "gtkhtml";

    rev = "master";

    sha256 = "sha256-jL8YADvhW0o6I/2Uo5FNARMAnSbvtmFp+zWH1yCVvQk=";

  };



  patches = [

    # Enables enchant2 support.

    # Upstream is dead, no further releases are coming.

    (fetchpatch {

      name ="enchant-2.patch";

      url = "https://aur.archlinux.org/cgit/aur.git/plain/enchant-2.patch?h=gtkhtml4&id=0218303a63d64c04d6483a6fe9bb55063fcfaa43";

      sha256 = "f0OToWGHZwxvqf+0qosfA9FfwJ/IXfjIPP5/WrcvArI=";

      extraPrefix = "";

    })

  ];



  propagatedBuildInputs = [ gsettings-desktop-schemas gtk3 gnome-icon-theme GConf ];

  nativeBuildInputs = [ pkg-config autoreconfHook intltool ];

  buildInputs = [ enchant isocodes ];

}

pkgs/desktops/gnome-2/platform/gtkhtml/default.nix

deleted100644 → 0
+0 −21
Original line number Diff line number Diff line 
{ lib, stdenv, fetchurl, pkg-config, gtk2, intltool,

GConf, enchant, isocodes, gnome-icon-theme }:



stdenv.mkDerivation rec {

  pname = "gtkhtml";

  version = "3.32.2";



  src = fetchurl {

    url = "mirror://gnome/sources/gtkhtml/${lib.versions.majorMinor version}/gtkhtml-${version}.tar.bz2";

    sha256 = "17z3jwvpn8waz7bhwrk7a6vs9pad6sqmlxxcqwvxxq89ywy0ail7";

  };



  #From Debian, fixes build issue described here:

  #http://www.mail-archive.com/debian-bugs-rc@lists.debian.org/msg250091.html

  patches = [ ./01_remove-disable-deprecated.patch ];



  nativeBuildInputs = [ pkg-config intltool ];

  buildInputs = [ gtk2 GConf enchant isocodes gnome-icon-theme ];



  NIX_LDFLAGS = "-lgthread-2.0";

}