[pkgsrc/trunk]: pkgsrc/sysutils/nautilus-cd-burner Fixed invalid patches

[adam <adam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/bd4046e3b21f
branches:  trunk
changeset: 491355:bd4046e3b21f
user:      adam <adam%pkgsrc.org@localhost>
date:      Wed Mar 23 14:02:52 2005 +0000

description:
Fixed invalid patches

diffstat:

 sysutils/nautilus-cd-burner/distinfo         |   7 +++----
 sysutils/nautilus-cd-burner/patches/patch-aa |   6 +++---
 sysutils/nautilus-cd-burner/patches/patch-ac |   8 ++++----
 sysutils/nautilus-cd-burner/patches/patch-ad |  20 --------------------
 4 files changed, 10 insertions(+), 31 deletions(-)

diffs (81 lines):

diff -r 2d595fc6304d -r bd4046e3b21f sysutils/nautilus-cd-burner/distinfo
--- a/sysutils/nautilus-cd-burner/distinfo      Wed Mar 23 13:32:28 2005 +0000
+++ b/sysutils/nautilus-cd-burner/distinfo      Wed Mar 23 14:02:52 2005 +0000
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.9 2005/03/22 16:33:55 jmmv Exp $
+$NetBSD: distinfo,v 1.10 2005/03/23 14:02:52 adam Exp $
 
 SHA1 (nautilus-cd-burner-2.10.0.tar.bz2) = 477fec627fd2797b6bc74c758a6be1313ddd0e6f
 RMD160 (nautilus-cd-burner-2.10.0.tar.bz2) = 1b1d274f6b8e6f67b8111832ea23d69e2123a62a
 Size (nautilus-cd-burner-2.10.0.tar.bz2) = 623320 bytes
-SHA1 (patch-aa) = e3a00bb52a0327f0f7587c4ea7030128adc70fb8
+SHA1 (patch-aa) = fa4dc6a862707609ead141b4a306979d89a3ea4f
 SHA1 (patch-ab) = 3482a773976bb011f5a6b26a42672aa65be068a1
-SHA1 (patch-ac) = b4eb3f033e23e0f2764bcd01c2bf0185593e587a
-SHA1 (patch-ad) = 1afd01abaac1abc9973166d7b25e950a1ada4e15
+SHA1 (patch-ac) = e7fe0e31dddd5612717d423e88cecea0eb449bc6
 SHA1 (patch-ae) = fcb78f12175441dba3fcdb729309a16e2d05d866
 SHA1 (patch-af) = 60b32582bcb95ee063d6c9e0f48f595af0a3b599
diff -r 2d595fc6304d -r bd4046e3b21f sysutils/nautilus-cd-burner/patches/patch-aa
--- a/sysutils/nautilus-cd-burner/patches/patch-aa      Wed Mar 23 13:32:28 2005 +0000
+++ b/sysutils/nautilus-cd-burner/patches/patch-aa      Wed Mar 23 14:02:52 2005 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2004/12/28 21:58:33 jmmv Exp $
+$NetBSD: patch-aa,v 1.4 2005/03/23 14:02:52 adam Exp $
 
---- Makefile.in.orig   2004-12-06 22:14:37.000000000 +0100
+--- Makefile.in.orig   2005-03-07 18:55:51.000000000 +0000
 +++ Makefile.in
-@@ -243,12 +243,12 @@ CLEANFILES = $(desktop_in_files:.desktop
+@@ -251,12 +251,12 @@ CLEANFILES = $(desktop_in_files:.desktop
  
  DISTCLEANFILES = intltool-extract intltool-merge intltool-update
  
diff -r 2d595fc6304d -r bd4046e3b21f sysutils/nautilus-cd-burner/patches/patch-ac
--- a/sysutils/nautilus-cd-burner/patches/patch-ac      Wed Mar 23 13:32:28 2005 +0000
+++ b/sysutils/nautilus-cd-burner/patches/patch-ac      Wed Mar 23 14:02:52 2005 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1 2004/09/21 17:15:35 jmmv Exp $
+$NetBSD: patch-ac,v 1.2 2005/03/23 14:02:52 adam Exp $
 
---- transport.hxx.orig 2004-02-10 11:36:36.000000000 +0100
+--- transport.hxx.orig 2005-02-22 19:43:11.000000000 +0000
 +++ transport.hxx
-@@ -312,7 +312,11 @@ public:
+@@ -441,7 +441,11 @@ public:
      // mounted, so that it could as well just return 0;
      int umount(int f=-1)
      { struct stat    fsb,msb;
@@ -14,7 +14,7 @@
        int            ret=0,mntsize,i;
  
        if (f==-1) f=fd;
-@@ -490,7 +494,11 @@ public:
+@@ -637,7 +641,11 @@ public:
      }
      int umount(int f=-1)
      { struct stat    fsb,msb;
diff -r 2d595fc6304d -r bd4046e3b21f sysutils/nautilus-cd-burner/patches/patch-ad
--- a/sysutils/nautilus-cd-burner/patches/patch-ad      Wed Mar 23 13:32:28 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2005/03/16 13:18:34 rillig Exp $
-
-gcc-2.95.3 does not like code intermixed with declarations.
-
---- bacon-cd-selection.c.orig  Wed Nov 10 14:10:39 2004
-+++ bacon-cd-selection.c       Wed Mar 16 09:27:27 2005
-@@ -179,11 +179,11 @@ cdrom_combo_box (BaconCdSelection *bcs, 
- static void
- bacon_cd_selection_init (BaconCdSelection *bcs)
- {
--      bcs->priv = g_new0 (BaconCdSelectionPrivate, 1);
--  
-       GtkCellRenderer *cell;
-       GtkListStore *store;
- 
-+      bcs->priv = g_new0 (BaconCdSelectionPrivate, 1);
-+  
-   store = gtk_list_store_new (1, G_TYPE_STRING);
-       gtk_combo_box_set_model (GTK_COMBO_BOX (bcs),
-                       GTK_TREE_MODEL (store));