Freebsd fixes; bug #178471

(Portage version: 2.1.2.7)

5 files changed, 46 insertions, 3 deletions

diff --git a/app-text/evince/ChangeLog b/app-text/evince/ChangeLog
index e2d213ff7c87..0ef0fec20e90 100644
--- a/app-text/evince/ChangeLog
+++ b/app-text/evince/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/evince
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.103 2007/04/21 10:22:51 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.104 2007/05/15 17:48:48 dang Exp $
+
+  15 May 2007; Daniel Gryniewicz <dang@gentoo.org>
+  +files/evince-0.6.1-freebsd.patch, +files/evince-0.8.1-freebsd.patch,
+  evince-0.6.1-r3.ebuild, evince-0.8.1.ebuild:
+  Freebsd fixes; bug #178471
 
 *evince-0.8.1 (21 Apr 2007)
 
diff --git a/app-text/evince/evince-0.6.1-r3.ebuild b/app-text/evince/evince-0.6.1-r3.ebuild
index 82db1ec2f225..0dd5ff238701 100644
--- a/app-text/evince/evince-0.6.1-r3.ebuild
+++ b/app-text/evince/evince-0.6.1-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-0.6.1-r3.ebuild,v 1.8 2007/04/16 15:00:38 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-0.6.1-r3.ebuild,v 1.9 2007/05/15 17:48:48 dang Exp $
 
 inherit eutils gnome2 autotools
 
@@ -81,5 +81,8 @@ src_unpack(){
 	# Limits on gv buffer lengths.  Bug #156573
 	epatch "${FILESDIR}"/${P}-gv-limit.patch
 
+	# Fix build on fbsd.  Bug #178471
+	epatch "${FILESDIR}"/${P}-freebsd.patch
+
 	eautoreconf
 }
diff --git a/app-text/evince/evince-0.8.1.ebuild b/app-text/evince/evince-0.8.1.ebuild
index 28773e25f93c..eaa1206c227d 100644
--- a/app-text/evince/evince-0.8.1.ebuild
+++ b/app-text/evince/evince-0.8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-0.8.1.ebuild,v 1.1 2007/04/21 10:22:51 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-0.8.1.ebuild,v 1.2 2007/05/15 17:48:48 dang Exp $
 
 WANT_AUTOMAKE="1.9"
 inherit eutils gnome2 autotools
@@ -76,6 +76,9 @@ src_unpack(){
 	# Make dbus actually switchable
 	epatch ${FILESDIR}/${PN}-0.6.1-dbus-switch.patch
 
+	# Fix build on fbsd.  Bug #178471
+	epatch "${FILESDIR}"/${P}-freebsd.patch
+
 	cp aclocal.m4 old_macros.m4
 	AT_M4DIR="." eautoreconf
 }
diff --git a/app-text/evince/files/evince-0.6.1-freebsd.patch b/app-text/evince/files/evince-0.6.1-freebsd.patch
new file mode 100644
index 000000000000..b2192b50f429
--- /dev/null
+++ b/app-text/evince/files/evince-0.6.1-freebsd.patch
@@ -0,0 +1,11 @@
+--- evince-0.6.1/impress/zip.c.orig	2006-07-10 15:03:38 -0600
++++ evince-0.6.1/impress/zip.c	2007-05-14 00:01:37 -0600
+@@ -9,6 +9,8 @@
+ #include <zlib.h>
+ #define _(x) x
+ 
++typedef unsigned long ulong;
++
+ enum {
+ 	ZIP_OK = 0,
+ 	ZIP_NOMEM,
diff --git a/app-text/evince/files/evince-0.8.1-freebsd.patch b/app-text/evince/files/evince-0.8.1-freebsd.patch
new file mode 100644
index 000000000000..b67cfba00ef6
--- /dev/null
+++ b/app-text/evince/files/evince-0.8.1-freebsd.patch
@@ -0,0 +1,21 @@
+--- backend/ps/ps-interpreter.c	2007-05-14 10:19:02 +0100
++++ backend/ps/ps-interpreter.c	2007-05-14 10:18:56 +0100
+@@ -26,6 +26,7 @@
+ #include <gtk/gtkwindow.h>
+ #include <gdk/gdk.h>
+ #include <gdk/gdkx.h>
++#include <signal.h>
+ #include <string.h>
+ #include <stdlib.h>
+ #include <sys/wait.h>
+--- backend/impress/zip.c	2006-07-10 15:03:38 -0600
++++ backend/impress/zip.c	2007-05-14 00:01:37 -0600
+@@ -9,6 +9,8 @@
+ #include <zlib.h>
+ #define _(x) x
+ 
++typedef unsigned long ulong;
++
+ enum {
+ 	ZIP_OK = 0,
+ 	ZIP_NOMEM,