From d54a5435c01100c065998bd015fdca9ef9e3c60b Mon Sep 17 00:00:00 2001
From: dholland <dholland>
Date: Mon, 7 May 2012 01:22:50 +0000
Subject: Build fixes for new glib2.

---
 sysutils/dvdisaster/distinfo                   |  5 +++--
 sysutils/dvdisaster/patches/patch-ah           | 16 +++++++++++++---
 sysutils/dvdisaster/patches/patch-dvdisaster_h | 19 +++++++++++++++++++
 3 files changed, 35 insertions(+), 5 deletions(-)
 create mode 100644 sysutils/dvdisaster/patches/patch-dvdisaster_h

(limited to 'sysutils/dvdisaster')

diff --git a/sysutils/dvdisaster/distinfo b/sysutils/dvdisaster/distinfo
index 6e69dddde11..e4f83d9d0fb 100644
--- a/sysutils/dvdisaster/distinfo
+++ b/sysutils/dvdisaster/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.5 2012/02/04 21:57:54 shattered Exp $
+$NetBSD: distinfo,v 1.6 2012/05/07 01:22:50 dholland Exp $
 
 SHA1 (dvdisaster-0.72.3.tar.bz2) = 6ed08f8e52f4b90b39134b0caf9b5f0df221b0da
 RMD160 (dvdisaster-0.72.3.tar.bz2) = 63a2dcd4387bd2bfd4632270a53e4a0dfd5a692e
 Size (dvdisaster-0.72.3.tar.bz2) = 4168126 bytes
 SHA1 (patch-aa) = 97fe33bdc514925041718992b28d75b672b4be0c
 SHA1 (patch-ab) = 5d47ca08389005d11618d6d9953f686312c716bf
-SHA1 (patch-ah) = 9cb1e03dc8c13e560a2f862811a4e828563db112
+SHA1 (patch-ah) = 0553d0e4eb4fd3ce3e3c28a77e666bbfc3677179
+SHA1 (patch-dvdisaster_h) = 2163361a9eb24da9bb852ebbd4565d41282aea83
 SHA1 (patch-scsi-netbsd.c) = 076a625291bf8d29d6339fb2209d61712ceb6b62
diff --git a/sysutils/dvdisaster/patches/patch-ah b/sysutils/dvdisaster/patches/patch-ah
index 031f6f58272..eb17cf51044 100644
--- a/sysutils/dvdisaster/patches/patch-ah
+++ b/sysutils/dvdisaster/patches/patch-ah
@@ -1,8 +1,11 @@
-$NetBSD: patch-ah,v 1.1 2007/08/05 19:15:47 joerg Exp $
+$NetBSD: patch-ah,v 1.2 2012/05/07 01:22:50 dholland Exp $
 
---- memtrack.c.orig	2007-08-01 20:40:51.000000000 +0000
+- use standard includes
+- fix build with latest glib2
+
+--- memtrack.c.orig	2011-10-02 18:32:04.000000000 +0000
 +++ memtrack.c
-@@ -21,9 +21,6 @@
+@@ -21,16 +21,12 @@
  
  #define _GNU_SOURCE
  
@@ -12,3 +15,10 @@ $NetBSD: patch-ah,v 1.1 2007/08/05 19:15:47 joerg Exp $
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
+ 
+ #include <glib.h>
+ #include <glib/gprintf.h>
+-#include <glib/gstrfuncs.h>
+ 
+ /*
+  * We're not pulling in dvdisaster.h on purpose...
diff --git a/sysutils/dvdisaster/patches/patch-dvdisaster_h b/sysutils/dvdisaster/patches/patch-dvdisaster_h
new file mode 100644
index 00000000000..06f90e61c0f
--- /dev/null
+++ b/sysutils/dvdisaster/patches/patch-dvdisaster_h
@@ -0,0 +1,19 @@
+$NetBSD: patch-dvdisaster_h,v 1.1 2012/05/07 01:22:50 dholland Exp $
+
+Fix build with new glib2.
+
+--- dvdisaster.h~	2011-10-02 18:31:44.000000000 +0000
++++ dvdisaster.h
+@@ -37,11 +37,10 @@
+ 
+ #define _GNU_SOURCE
+ 
+-//#include <glib.h>
++#include <glib.h>
+ 
+ #include <gtk/gtk.h>
+ #include <glib/gprintf.h>
+-#include <glib/gstrfuncs.h>
+ 
+ #include <ctype.h>
+ #include <errno.h>
-- 
cgit v1.2.3