summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard Cafarelli <voyageur@gentoo.org>2010-08-20 14:30:20 +0000
committerBernard Cafarelli <voyageur@gentoo.org>2010-08-20 14:30:20 +0000
commit7103fefeae33f622c8ba6da0492dbba724f101ac (patch)
tree8b22a764c84363d807a94aa3dd9a6fac8d3f6f6b /gnustep-apps
parentPatch to fix page table unmap for stack guard page (diff)
downloadgentoo-2-7103fefeae33f622c8ba6da0492dbba724f101ac.tar.gz
gentoo-2-7103fefeae33f622c8ba6da0492dbba724f101ac.tar.bz2
gentoo-2-7103fefeae33f622c8ba6da0492dbba724f101ac.zip
Fix compilation, bug #331435
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'gnustep-apps')
-rw-r--r--gnustep-apps/preview/ChangeLog8
-rw-r--r--gnustep-apps/preview/files/preview-0.8.5-compilation-errors.patch30
-rw-r--r--gnustep-apps/preview/preview-0.8.5-r1.ebuild7
3 files changed, 41 insertions, 4 deletions
diff --git a/gnustep-apps/preview/ChangeLog b/gnustep-apps/preview/ChangeLog
index 84e8f98635b9..209810bb1695 100644
--- a/gnustep-apps/preview/ChangeLog
+++ b/gnustep-apps/preview/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for gnustep-apps/preview
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/preview/ChangeLog,v 1.16 2008/03/08 13:38:25 coldwind Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/preview/ChangeLog,v 1.17 2010/08/20 14:30:20 voyageur Exp $
+
+ 20 Aug 2010; Bernard Cafarelli <voyageur@gentoo.org>
+ preview-0.8.5-r1.ebuild, +files/preview-0.8.5-compilation-errors.patch:
+ Fix compilation, bug #331435
08 Mar 2008; Santiago M. Mola <coldwind@gentoo.org>
preview-0.8.5-r1.ebuild:
diff --git a/gnustep-apps/preview/files/preview-0.8.5-compilation-errors.patch b/gnustep-apps/preview/files/preview-0.8.5-compilation-errors.patch
new file mode 100644
index 000000000000..247a7c8b171d
--- /dev/null
+++ b/gnustep-apps/preview/files/preview-0.8.5-compilation-errors.patch
@@ -0,0 +1,30 @@
+2010-05-18 Federico Gimenez Nieto <fgimenez@coit.es>
+
+ * Document.m: Import <AppKit/AppKit.h>.
+
+Index: preview.app-0.8.5/Document.m
+===================================================================
+--- preview.app-0.8.5.orig/Document.m 2010-05-18 19:18:11.000000000 +0200
++++ preview.app-0.8.5/Document.m 2010-05-18 19:18:23.000000000 +0200
+@@ -35,20 +35,7 @@
+
+ #include <Foundation/NSNotification.h>
+
+-#include <AppKit/NSApplication.h>
+-#include <AppKit/NSAffineTransform.h>
+-#include <AppKit/NSClipView.h>
+-#include <AppKit/NSCursor.h>
+-#include <AppKit/NSImage.h>
+-#include <AppKit/NSImageView.h>
+-#include <AppKit/NSMatrix.h>
+-#include <AppKit/NSPasteboard.h>
+-#include <AppKit/NSPopUpButton.h>
+-#include <AppKit/NSScreen.h>
+-#include <AppKit/NSScrollView.h>
+-#include <AppKit/NSWindow.h>
+-#include <AppKit/NSWindowController.h>
+-#include <AppKit/NSScroller.h>
++#include <AppKit/AppKit.h>
+
+ /*********************************************************************/
+ /**************** NSDocument Private methods *************************/
diff --git a/gnustep-apps/preview/preview-0.8.5-r1.ebuild b/gnustep-apps/preview/preview-0.8.5-r1.ebuild
index 7e33c51a0d7f..6b209ea9abf1 100644
--- a/gnustep-apps/preview/preview-0.8.5-r1.ebuild
+++ b/gnustep-apps/preview/preview-0.8.5-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/preview/preview-0.8.5-r1.ebuild,v 1.5 2008/03/08 13:38:25 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/preview/preview-0.8.5-r1.ebuild,v 1.6 2010/08/20 14:30:20 voyageur Exp $
inherit gnustep-2
@@ -20,4 +20,7 @@ src_unpack() {
# Fix broken french lproj
rmdir French.lproj/Preview.gorm
ln -s ../English.lproj/Preview.gorm French.lproj
+
+ # Fix compilation, patch from debian
+ epatch ${FILESDIR}/${P}-compilation-errors.patch
}