From 9ca516b081562f11dcca1115a5d3bd2565f4413e Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 5 Nov 2014 21:40:28 +0000 Subject: [PATCH] Removes legacy gtk-sharp-1 --- .../libraries/gtk-sharp-1/builder.sh | 11 ---- .../libraries/gtk-sharp-1/default.nix | 37 ----------- .../libraries/gtk-sharp-1/dllmap-glue.patch | 65 ------------------- .../libraries/gtk-sharp-1/glib-include.patch | 24 ------- pkgs/top-level/all-packages.nix | 14 ++-- 5 files changed, 4 insertions(+), 147 deletions(-) delete mode 100644 pkgs/development/libraries/gtk-sharp-1/builder.sh delete mode 100644 pkgs/development/libraries/gtk-sharp-1/default.nix delete mode 100644 pkgs/development/libraries/gtk-sharp-1/dllmap-glue.patch delete mode 100644 pkgs/development/libraries/gtk-sharp-1/glib-include.patch diff --git a/pkgs/development/libraries/gtk-sharp-1/builder.sh b/pkgs/development/libraries/gtk-sharp-1/builder.sh deleted file mode 100644 index 4b8f757540b..00000000000 --- a/pkgs/development/libraries/gtk-sharp-1/builder.sh +++ /dev/null @@ -1,11 +0,0 @@ -source $stdenv/setup - -genericBuild - -# !!! hack -export ALL_INPUTS="$out $pkgs" - -find $out -name "*.dll.config" | while read configFile; do - echo "modifying config file $configFile" - $monoDLLFixer "$configFile" -done diff --git a/pkgs/development/libraries/gtk-sharp-1/default.nix b/pkgs/development/libraries/gtk-sharp-1/default.nix deleted file mode 100644 index 863ee6c038d..00000000000 --- a/pkgs/development/libraries/gtk-sharp-1/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, mono -, glib -, pango -, gtk -, GConf ? null -, libglade ? null -, libgtkhtml ? null -, gtkhtml ? null -, libgnomecanvas ? null -, libgnomeui ? null -, libgnomeprint ? null -, libgnomeprintui ? null -, libxml2 -, monoDLLFixer -}: - -stdenv.mkDerivation { - name = "gtk-sharp-1.0.6"; - - builder = ./builder.sh; - src = fetchurl { - url = http://tarballs.nixos.org/gtk-sharp-1.0.6.tar.gz; - md5 = "2651d14fe77174ab20b8af53d150ee11"; - }; - - patches = [ - ./dllmap-glue.patch - ./glib-include.patch - ]; - - buildInputs = [ - pkgconfig mono glib pango gtk GConf libglade libgnomecanvas - libgtkhtml libgnomeui libgnomeprint libgnomeprintui gtkhtml libxml2 - ]; - - inherit monoDLLFixer; -} diff --git a/pkgs/development/libraries/gtk-sharp-1/dllmap-glue.patch b/pkgs/development/libraries/gtk-sharp-1/dllmap-glue.patch deleted file mode 100644 index 51f4524811d..00000000000 --- a/pkgs/development/libraries/gtk-sharp-1/dllmap-glue.patch +++ /dev/null @@ -1,65 +0,0 @@ -diff -rc gtk-sharp-1.0.6-orig/gdk/gdk-sharp.dll.config.in gtk-sharp-1.0.6/gdk/gdk-sharp.dll.config.in -*** gtk-sharp-1.0.6-orig/gdk/gdk-sharp.dll.config.in 2004-12-16 18:15:44.000000000 +0100 ---- gtk-sharp-1.0.6/gdk/gdk-sharp.dll.config.in 2005-03-08 12:40:58.000000000 +0100 -*************** -*** 3,6 **** ---- 3,7 ---- - - - -+ - -diff -rc gtk-sharp-1.0.6-orig/glade/glade-sharp.dll.config.in gtk-sharp-1.0.6/glade/glade-sharp.dll.config.in -*** gtk-sharp-1.0.6-orig/glade/glade-sharp.dll.config.in 2004-12-16 18:15:46.000000000 +0100 ---- gtk-sharp-1.0.6/glade/glade-sharp.dll.config.in 2005-03-08 12:41:19.000000000 +0100 -*************** -*** 1,3 **** ---- 1,4 ---- - - -+ - -diff -rc gtk-sharp-1.0.6-orig/glib/glib-sharp.dll.config.in gtk-sharp-1.0.6/glib/glib-sharp.dll.config.in -*** gtk-sharp-1.0.6-orig/glib/glib-sharp.dll.config.in 2004-12-16 18:15:38.000000000 +0100 ---- gtk-sharp-1.0.6/glib/glib-sharp.dll.config.in 2005-03-08 12:37:57.000000000 +0100 -*************** -*** 2,5 **** ---- 2,6 ---- - - - -+ - -diff -rc gtk-sharp-1.0.6-orig/gnome/gnome-sharp.dll.config.in gtk-sharp-1.0.6/gnome/gnome-sharp.dll.config.in -*** gtk-sharp-1.0.6-orig/gnome/gnome-sharp.dll.config.in 2004-12-16 18:15:43.000000000 +0100 ---- gtk-sharp-1.0.6/gnome/gnome-sharp.dll.config.in 2005-03-08 12:41:50.000000000 +0100 -*************** -*** 8,11 **** ---- 8,12 ---- - - - -+ - -diff -rc gtk-sharp-1.0.6-orig/gtk/gtk-sharp.dll.config.in gtk-sharp-1.0.6/gtk/gtk-sharp.dll.config.in -*** gtk-sharp-1.0.6-orig/gtk/gtk-sharp.dll.config.in 2004-12-16 18:14:51.000000000 +0100 ---- gtk-sharp-1.0.6/gtk/gtk-sharp.dll.config.in 2005-03-08 12:38:19.000000000 +0100 -*************** -*** 3,6 **** ---- 3,7 ---- - - - -+ - -diff -rc gtk-sharp-1.0.6-orig/pango/pango-sharp.dll.config.in gtk-sharp-1.0.6/pango/pango-sharp.dll.config.in -*** gtk-sharp-1.0.6-orig/pango/pango-sharp.dll.config.in 2004-12-16 18:14:55.000000000 +0100 ---- gtk-sharp-1.0.6/pango/pango-sharp.dll.config.in 2005-03-08 12:42:11.000000000 +0100 -*************** -*** 1,4 **** ---- 1,5 ---- - - - -+ - diff --git a/pkgs/development/libraries/gtk-sharp-1/glib-include.patch b/pkgs/development/libraries/gtk-sharp-1/glib-include.patch deleted file mode 100644 index e8f4b0ef5af..00000000000 --- a/pkgs/development/libraries/gtk-sharp-1/glib-include.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -ru gtk-sharp-1.0.6.orig/glib/glue/list.c gtk-sharp-1.0.6/glib/glue/list.c ---- gtk-sharp-1.0.6.orig/glib/glue/list.c 2014-01-09 10:58:06.727352451 +0000 -+++ gtk-sharp-1.0.6/glib/glue/list.c 2014-01-09 11:00:34.256583614 +0000 -@@ -20,7 +20,7 @@ - */ - - --#include -+#include - - /* Forward declarations */ - gpointer gtksharp_list_get_data (GList *l); -diff -ru gtk-sharp-1.0.6.orig/glib/glue/slist.c gtk-sharp-1.0.6/glib/glue/slist.c ---- gtk-sharp-1.0.6.orig/glib/glue/slist.c 2014-01-09 10:58:06.727352451 +0000 -+++ gtk-sharp-1.0.6/glib/glue/slist.c 2014-01-09 11:00:47.572695223 +0000 -@@ -20,7 +20,7 @@ - */ - - --#include -+#include - - /* Forward declarations */ - gpointer gtksharp_slist_get_data (GSList *l); diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 00382abbac0..adbea769ba5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5596,16 +5596,10 @@ let gtkmm3 = callPackage ../development/libraries/gtkmm/3.x.nix { }; gtkmozembedsharp = callPackage ../development/libraries/gtkmozembed-sharp { - gtksharp = gtksharp2; + gtksharp = gtk-sharp; }; - gtksharp1 = callPackage ../development/libraries/gtk-sharp-1 { - inherit (gnome) libglade libgtkhtml gtkhtml - libgnomecanvas libgnomeui libgnomeprint - libgnomeprintui GConf; - }; - - gtksharp2 = callPackage ../development/libraries/gtk-sharp-2 { + gtk-sharp = callPackage ../development/libraries/gtk-sharp-2 { inherit (gnome) libglade libgtkhtml gtkhtml libgnomecanvas libgnomeui libgnomeprint libgnomeprintui GConf gnomepanel; @@ -5613,7 +5607,7 @@ let gtksourceviewsharp = callPackage ../development/libraries/gtksourceview-sharp { inherit (gnome) gtksourceview; - gtksharp = gtksharp2; + gtksharp = gtk-sharp; }; gtkspell = callPackage ../development/libraries/gtkspell { }; @@ -10804,7 +10798,7 @@ let pinpoint = callPackage ../applications/office/pinpoint {}; pinta = callPackage ../applications/graphics/pinta { - gtksharp = gtksharp2; + gtksharp = gtk-sharp; }; pommed = callPackage ../os-specific/linux/pommed {