From 317a2b5762cf812a2896d24d1c145f55c1fd7b71 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 9 Mar 2005 17:47:01 +0000 Subject: [PATCH] * Added gtk# 1.9.2, required by MonoDevelop. However, since MonoDoc requires the old gtk#, we keep that one around as well. svn path=/nixpkgs/trunk/; revision=2354 --- .../{gtk-sharp => gtk-sharp-1}/builder.sh | 0 .../{gtk-sharp => gtk-sharp-1}/default.nix | 0 .../dllmap-glue.patch | 0 .../libraries/gtk-sharp-2/builder.sh | 11 ++++ .../libraries/gtk-sharp-2/default.nix | 36 ++++++++++ .../libraries/gtk-sharp-2/dllmap-glue.patch | 65 +++++++++++++++++++ 6 files changed, 112 insertions(+) rename pkgs/development/libraries/{gtk-sharp => gtk-sharp-1}/builder.sh (100%) rename pkgs/development/libraries/{gtk-sharp => gtk-sharp-1}/default.nix (100%) rename pkgs/development/libraries/{gtk-sharp => gtk-sharp-1}/dllmap-glue.patch (100%) create mode 100644 pkgs/development/libraries/gtk-sharp-2/builder.sh create mode 100644 pkgs/development/libraries/gtk-sharp-2/default.nix create mode 100644 pkgs/development/libraries/gtk-sharp-2/dllmap-glue.patch diff --git a/pkgs/development/libraries/gtk-sharp/builder.sh b/pkgs/development/libraries/gtk-sharp-1/builder.sh similarity index 100% rename from pkgs/development/libraries/gtk-sharp/builder.sh rename to pkgs/development/libraries/gtk-sharp-1/builder.sh diff --git a/pkgs/development/libraries/gtk-sharp/default.nix b/pkgs/development/libraries/gtk-sharp-1/default.nix similarity index 100% rename from pkgs/development/libraries/gtk-sharp/default.nix rename to pkgs/development/libraries/gtk-sharp-1/default.nix diff --git a/pkgs/development/libraries/gtk-sharp/dllmap-glue.patch b/pkgs/development/libraries/gtk-sharp-1/dllmap-glue.patch similarity index 100% rename from pkgs/development/libraries/gtk-sharp/dllmap-glue.patch rename to pkgs/development/libraries/gtk-sharp-1/dllmap-glue.patch diff --git a/pkgs/development/libraries/gtk-sharp-2/builder.sh b/pkgs/development/libraries/gtk-sharp-2/builder.sh new file mode 100644 index 000000000000..f6911c63ac92 --- /dev/null +++ b/pkgs/development/libraries/gtk-sharp-2/builder.sh @@ -0,0 +1,11 @@ +. $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-2/default.nix b/pkgs/development/libraries/gtk-sharp-2/default.nix new file mode 100644 index 000000000000..e5cbfab5c89f --- /dev/null +++ b/pkgs/development/libraries/gtk-sharp-2/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, pkgconfig, mono +, glib +, pango +, gtk +, gconf ? null +, libglade ? null +, libgtkhtml ? null +, gtkhtml ? null +, libgnomecanvas ? null +, libgnomeui ? null +, libgnomeprint ? null +, libgnomeprintui ? null +, gnomepanel ? null +, libxml2 +, monoDLLFixer +}: + +stdenv.mkDerivation { + name = "gtk-sharp-1.9.2"; + + builder = ./builder.sh; + src = fetchurl { + url = http://heanet.dl.sourceforge.net/sourceforge/gtk-sharp/gtk-sharp-1.9.2.tar.gz; + md5 = "b7c5afab5f736ffa4011974302831363"; + }; + + patches = [ ./dllmap-glue.patch ]; + + buildInputs = [ + pkgconfig mono glib pango gtk gconf libglade libgnomecanvas + libgtkhtml libgnomeui libgnomeprint libgnomeprintui gtkhtml libxml2 + gnomepanel + ]; + + inherit monoDLLFixer; +} diff --git a/pkgs/development/libraries/gtk-sharp-2/dllmap-glue.patch b/pkgs/development/libraries/gtk-sharp-2/dllmap-glue.patch new file mode 100644 index 000000000000..51f4524811dd --- /dev/null +++ b/pkgs/development/libraries/gtk-sharp-2/dllmap-glue.patch @@ -0,0 +1,65 @@ +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 ---- + + + ++ +