Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kikadftesting.git;a=commitdiff;h=ba82085024308086f1e47c6813d791bc833296f4
commit ba82085024308086f1e47c6813d791bc833296f4 Author: kikadf <[email protected]> Date: Sat Feb 28 09:38:52 2015 +0100 mistelix-0.33-2-x86_64 * Fix build diff --git a/source/gnome-extra/mistelix/FrugalBuild b/source/gnome-extra/mistelix/FrugalBuild index 147c63e..9759d4d 100644 --- a/source/gnome-extra/mistelix/FrugalBuild +++ b/source/gnome-extra/mistelix/FrugalBuild @@ -9,7 +9,7 @@ url="http://www.mistelix.org"; urldl=http://gent.softcatala.org/jmas/$pkgname/ up2date="Flasttar $urldl" source=($urldl/$pkgname-$pkgver.tar.gz) -depends=('gnome-sharp' 'mono-addins' 'gstreamer' 'gst-ffmpeg' 'gst-plugins-ugly' \ +depends=('gtk2-sharp' 'mono-addins' 'gstreamer' 'gst-ffmpeg' 'gst-plugins-ugly' \ 'gst-plugins-base-theora') makedepends=('intltool') groups=('gnome-extra') @@ -18,14 +18,19 @@ _F_gnome_desktop=y _F_gnome_iconcache=y _F_mono_aot=0 Finclude mono gnome-scriptlet -sha1sums=('647d8906cd909c835ad46fae4e433e831876e437') +source=($source drop-gnome-sharp.patch) +sha1sums=('647d8906cd909c835ad46fae4e433e831876e437' \ + 'e3d04a9878d9d0291e85c5fdb2d653b2bd25b400') build() { unset MAKEFLAGS export MONO_ENV_OPTIONS="--gc=sgen" Fcd Fmonoexport - Fbuild + Fpatchall + autoreconf -fi || Fdie + Fmake + Fmakeinstall Fmonocleanup Fbuild_gnome_scriptlet } diff --git a/source/gnome-extra/mistelix/drop-gnome-sharp.patch b/source/gnome-extra/mistelix/drop-gnome-sharp.patch new file mode 100644 index 0000000..5c2fc77 --- /dev/null +++ b/source/gnome-extra/mistelix/drop-gnome-sharp.patch @@ -0,0 +1,66 @@ +diff -Naur mistelix-0.33.orig/configure.ac mistelix-0.33/configure.ac +--- mistelix-0.33.orig/configure.ac 2011-01-16 15:45:31.000000000 +0100 ++++ mistelix-0.33/configure.ac 2012-03-07 22:38:53.562387550 +0100 +@@ -72,7 +72,6 @@ + + PKG_CHECK_MODULES(MISTELIX, + gtk-sharp-2.0 >= $GTKSHARP_REQUIRED +- gnome-sharp-2.0 >= $GTKSHARP_REQUIRED + mono-addins >= 0.3 + mono-addins-setup >= 0.3 + mono-addins-gui >= 0.3) +diff -Naur mistelix-0.33.orig/src/mistelix.cs mistelix-0.33/src/mistelix.cs +--- mistelix-0.33.orig/src/mistelix.cs 2011-01-17 20:22:49.000000000 +0100 ++++ mistelix-0.33/src/mistelix.cs 2012-03-07 22:34:09.359199021 +0100 +@@ -24,7 +24,6 @@ + using System; + using Gtk; + using Gdk; +-using Gnome; + using System.Runtime.InteropServices; + using System.Collections.Generic; + using System.Diagnostics; +@@ -44,7 +43,7 @@ + // + // Mistelix main program class + // +- class Mistelix : Program ++ class Mistelix + { + [GtkBeans.Builder.Object ("mistelix")] Gtk.Window app_window; + [GtkBeans.Builder.Object ("vertical_paned")] Gtk.HPaned vpaned; +@@ -99,8 +98,7 @@ + } + } + +- public Mistelix (string [] args, params object [] props) +- : base ("mistelix", Defines.VERSION, Modules.UI, args, props) ++ public Mistelix (string [] args) + { + Gtk.Application.Init (); + Logger.Info ("Mistelix " + Defines.VERSION + " starting"); +@@ -210,7 +208,7 @@ + Logger.Error ("Mistelix.Main. Cannot set process name"); + } + +- gui.Run (); ++ Gtk.Application.Run (); + } + + void OnAddVideos (object sender, EventArgs args) +@@ -263,13 +261,13 @@ + void OnQuit (object sender, EventArgs args) + { + SaveWindowPosition (); +- Quit (); ++ Gtk.Main.Quit (); + } + + void OnDeleteWindow (object sender, DeleteEventArgs args) + { + SaveWindowPosition (); +- Quit (); ++ Gtk.Main.Quit (); + } + + void LoadWindowPosition () _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
