summaryrefslogtreecommitdiffstats
path: root/audio/marlin/files
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2004-08-05 11:50:47 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2004-08-05 11:50:47 +0800
commitc9099afb3b665fbe9039aa340ae4e35ea5082bf0 (patch)
treea288474ef5bc2689b1adc4187e56c44d1e6bd039 /audio/marlin/files
parentdbe28857f7841fcf454095a0ddb01de72dce4004 (diff)
downloadmarcuscom-ports-c9099afb3b665fbe9039aa340ae4e35ea5082bf0.tar
marcuscom-ports-c9099afb3b665fbe9039aa340ae4e35ea5082bf0.tar.gz
marcuscom-ports-c9099afb3b665fbe9039aa340ae4e35ea5082bf0.tar.bz2
marcuscom-ports-c9099afb3b665fbe9039aa340ae4e35ea5082bf0.tar.lz
marcuscom-ports-c9099afb3b665fbe9039aa340ae4e35ea5082bf0.tar.xz
marcuscom-ports-c9099afb3b665fbe9039aa340ae4e35ea5082bf0.tar.zst
marcuscom-ports-c9099afb3b665fbe9039aa340ae4e35ea5082bf0.zip
Update to 0.4.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@2619 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'audio/marlin/files')
-rw-r--r--audio/marlin/files/patch-configure10
-rw-r--r--audio/marlin/files/patch-marlin_marlin-sample-view.c12
-rw-r--r--audio/marlin/files/patch-src_marlin-window-menu.c11
3 files changed, 11 insertions, 22 deletions
diff --git a/audio/marlin/files/patch-configure b/audio/marlin/files/patch-configure
deleted file mode 100644
index 75fd9721a..000000000
--- a/audio/marlin/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig Mon Nov 17 01:21:29 2003
-+++ configure Mon Nov 17 01:22:07 2003
-@@ -8129,6 +8129,7 @@
-
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
-
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/audio/marlin/files/patch-marlin_marlin-sample-view.c b/audio/marlin/files/patch-marlin_marlin-sample-view.c
deleted file mode 100644
index 71a617693..000000000
--- a/audio/marlin/files/patch-marlin_marlin-sample-view.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- marlin/marlin-sample-view.c.orig Mon Nov 17 12:40:57 2003
-+++ marlin/marlin-sample-view.c Mon Nov 17 12:41:18 2003
-@@ -1615,8 +1615,8 @@
- #endif
- if (red_dotted == NULL) {
- GdkColor red = {0, 65535, 0, 0};
-- red_dotted = gdk_gc_new (widget->window);
- GdkColormap *cmap = gdk_colormap_get_system ();
-+ red_dotted = gdk_gc_new (widget->window);
-
- gdk_gc_copy (red_dotted, widget->style->black_gc);
-
diff --git a/audio/marlin/files/patch-src_marlin-window-menu.c b/audio/marlin/files/patch-src_marlin-window-menu.c
new file mode 100644
index 000000000..adb7bd3e7
--- /dev/null
+++ b/audio/marlin/files/patch-src_marlin-window-menu.c
@@ -0,0 +1,11 @@
+--- 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 @@
+ 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;
+
+ toolbar = marlin_window_get_toolbar (MARLIN_WINDOW (data));