- Update to 0.5

  Dang this was silly, I was working with old local copy, 0.2 in fact...
  No idea if I merged conflicts correctly.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@2642 df743ca5-7f9a-e211-a948-0013205c9059

5 files changed, 39 insertions, 8 deletions

diff --git a/audio/marlin/Makefile b/audio/marlin/Makefile
index e99eaed4b..ec3ba4562 100644
--- a/audio/marlin/Makefile
+++ b/audio/marlin/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	marlin
-PORTVERSION=	0.4
+PORTVERSION=	0.5
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -18,7 +18,7 @@ LIB_DEPENDS=	musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack gnometarget gstreamerplugins
+USE_GNOME=	gnomeprefix gnomehack gnometarget gstreamerplugins intlhack libgnomeui
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL_VER=15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/audio/marlin/distinfo b/audio/marlin/distinfo
index 52705c247..da3cb6ac7 100644
--- a/audio/marlin/distinfo
+++ b/audio/marlin/distinfo
@@ -1,2 +1,2 @@
-MD5 (marlin-0.4.tar.gz) = 9788cc788831512d033e59a461c1f892
-SIZE (marlin-0.4.tar.gz) = 934070
+MD5 (marlin-0.5.tar.gz) = ed5ba4d112d67711d7769c82f85afc6e
+SIZE (marlin-0.5.tar.gz) = 959341
diff --git a/audio/marlin/files/patch-marlin-marlin-sample-view.c b/audio/marlin/files/patch-marlin-marlin-sample-view.c
new file mode 100644
index 000000000..4dabdf046
--- /dev/null
+++ b/audio/marlin/files/patch-marlin-marlin-sample-view.c
@@ -0,0 +1,12 @@
+--- marlin/marlin-sample-view.c.orig	Sun Aug  8 00:41:40 2004
++++ marlin/marlin-sample-view.c	Wed Aug 11 20:01:45 2004
+@@ -157,6 +157,9 @@
+ 			 guint64 new_position,
+ 			 gboolean extend_selection);
+ 
++void marlin_sample_view_vzoom_in (MarlinSampleView *view);
++void marlin_sample_view_vzoom_out (MarlinSampleView *view);
++
+ /* Stuff to register the coverage enum */
+ #define MARLIN_TYPE_COVERAGE (coverage_get_type ())
+ static GType
diff --git a/audio/marlin/files/patch-src-libegg-egg-toolbar-editor.c b/audio/marlin/files/patch-src-libegg-egg-toolbar-editor.c
new file mode 100644
index 000000000..3d8ff6e7f
--- /dev/null
+++ b/audio/marlin/files/patch-src-libegg-egg-toolbar-editor.c
@@ -0,0 +1,18 @@
+--- src/libegg/egg-toolbar-editor.c.orig	Sat Jul  3 16:37:44 2004
++++ src/libegg/egg-toolbar-editor.c	Sat Jul  3 16:38:00 2004
+@@ -102,12 +102,12 @@
+ static gint
+ compare_actions (gconstpointer a, gconstpointer b)
+ {
+-  g_return_val_if_fail (GTK_IS_ACTION (a), 0);
+-  g_return_val_if_fail (GTK_IS_ACTION (b), 0);
+-
+   GValue value_a = { 0, }, value_b = { 0, };
+   const char *short_label_a, *short_label_b;
+   int ret;
++
++  g_return_val_if_fail (GTK_IS_ACTION (a), 0);
++  g_return_val_if_fail (GTK_IS_ACTION (b), 0);
+ 
+   g_value_init (&value_a, G_TYPE_STRING);
+   g_object_get_property (G_OBJECT (a), "short_label", &value_a);
diff --git a/audio/marlin/files/patch-src_marlin-window-menu.c b/audio/marlin/files/patch-src_marlin-window-menu.c
index adb7bd3e7..47139a1d8 100644
--- a/audio/marlin/files/patch-src_marlin-window-menu.c
+++ b/audio/marlin/files/patch-src_marlin-window-menu.c
@@ -1,11 +1,12 @@
---- src/marlin-window-menu.c.orig	Wed Aug  4 23:47:26 2004
-+++ src/marlin-window-menu.c	Wed Aug  4 23:47:43 2004
-@@ -634,7 +634,7 @@
+--- src/marlin-window-menu.c.orig	Thu Aug  5 12:47:19 2004
++++ src/marlin-window-menu.c	Wed Aug 11 22:06:41 2004
+@@ -634,8 +634,8 @@
  	GtkWidget *editor, *dialog;
  	EphyToolbarsModel *model;
  	Toolbar *toolbar;
 -	GtkUIManager *ui_manager = marlin_window_get_menu_merge (MARLIN_WINDOW (data));;
-+	GtkUIManager *ui_manager = marlin_window_get_menu_merge (MARLIN_WINDOW (data));
  	char *xml;
++	GtkUIManager *ui_manager = marlin_window_get_menu_merge (MARLIN_WINDOW (data));;
  
  	toolbar = marlin_window_get_toolbar (MARLIN_WINDOW (data));
+ 	model = marlin_get_toolbars_model ();