From 42e2762505f3d7b0f81461be0e1d4e96e920dc4e Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Mon, 29 Mar 2004 23:31:30 +0000
Subject: Add patch that works around PR 19024 for the 1.6 branch; also closes
 PR 21890 by Kai Puolamaki. Bump PKGREVISION to 3.

---
 multimedia/ogle_gui/Makefile         |  4 ++--
 multimedia/ogle_gui/distinfo         |  3 ++-
 multimedia/ogle_gui/patches/patch-ab | 15 +++++++++++++++
 3 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 multimedia/ogle_gui/patches/patch-ab

(limited to 'multimedia')

diff --git a/multimedia/ogle_gui/Makefile b/multimedia/ogle_gui/Makefile
index dbe732f8071..e78e2542df2 100644
--- a/multimedia/ogle_gui/Makefile
+++ b/multimedia/ogle_gui/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2004/03/29 02:52:48 snj Exp $
+# $NetBSD: Makefile,v 1.5 2004/03/29 23:31:30 wiz Exp $
 
 DISTNAME=	ogle_gui-0.9.2
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.dtek.chalmers.se/groups/dvd/dist/
 
diff --git a/multimedia/ogle_gui/distinfo b/multimedia/ogle_gui/distinfo
index 9e5988d0474..2e9b2e5f42d 100644
--- a/multimedia/ogle_gui/distinfo
+++ b/multimedia/ogle_gui/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.1 2004/02/03 04:34:06 grant Exp $
+$NetBSD: distinfo,v 1.2 2004/03/29 23:31:30 wiz Exp $
 
 SHA1 (ogle_gui-0.9.2.tar.gz) = 0d73ec30852b9cd2a9714b5088f6ab6deecf097d
 Size (ogle_gui-0.9.2.tar.gz) = 396673 bytes
 SHA1 (patch-aa) = 818777c5474f6a99fbaa732f77c632dad4e12a22
+SHA1 (patch-ab) = 05916e5699a6e43f70a27a0b048b95989c4a4c69
 SHA1 (patch-ac) = 2aa173ace19f55d56d9d996b74db2dd59e4e0ef2
diff --git a/multimedia/ogle_gui/patches/patch-ab b/multimedia/ogle_gui/patches/patch-ab
new file mode 100644
index 00000000000..2b10b900c28
--- /dev/null
+++ b/multimedia/ogle_gui/patches/patch-ab
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.1 2004/03/29 23:31:30 wiz Exp $
+
+--- src/my_glade.c.orig	Wed Nov  5 20:06:51 2003
++++ src/my_glade.c
+@@ -38,6 +38,10 @@ static void *my_dlsym(void *handle, char
+   new_symbol = g_strdup(symbol);
+ #endif
+ 
++#ifdef __NetBSD__
++  /* clear error -- workaround for PR 19024 on 1.6.x and earlier */
++  error = dlerror();
++#endif
+   fun = dlsym(handle, new_symbol);
+   error = dlerror();
+   if(error != NULL) {
-- 
cgit v1.2.3