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
commit64d069211324f4915aa0e2502a8b92149333071b (patch)
treec4a89bea28a5ddbf98ab1e3b0ce219fdda79f69e
parentPatch to fix page table unmap for stack guard page (diff)
downloadhistorical-64d069211324f4915aa0e2502a8b92149333071b.tar.gz
historical-64d069211324f4915aa0e2502a8b92149333071b.tar.bz2
historical-64d069211324f4915aa0e2502a8b92149333071b.zip
Fix compilation, bug #331435
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
-rw-r--r--gnustep-apps/preview/ChangeLog8
-rw-r--r--gnustep-apps/preview/Manifest5
-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
4 files changed, 44 insertions, 6 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/Manifest b/gnustep-apps/preview/Manifest
index a261d9054c31..56f6569959b0 100644
--- a/gnustep-apps/preview/Manifest
+++ b/gnustep-apps/preview/Manifest
@@ -1,4 +1,5 @@
+AUX preview-0.8.5-compilation-errors.patch 1047 RMD160 372818920fe9a00df2eef4805f19b7d6629a45b1 SHA1 a50eb6aa972ad5edb64aafba5eff4f9f70624512 SHA256 7ac12fce66823fe304fd0cc593874c44ad7934ed4fe4b7e0d8835f16c0960fec
DIST Preview-0.8.5.tar.gz 68933 RMD160 d859d0ce40d414621d2542e6ce683f40618355a8 SHA1 6c1295a530553970e52903c6f52cac9935562040 SHA256 ddee5ae39ade5b5820e9af6492fb6b84f7c80e5dac6c026e17ae1f2dd44a62f4
-EBUILD preview-0.8.5-r1.ebuild 616 RMD160 d62044ab3c5b0cd86363c9990c35ae3091bd6066 SHA1 c93d8ec9dc91f8ce22224477268cbc19ecda001e SHA256 dc06ab84d13d22f26cd3be60549a9c2ce877fb8c8b43ac734e476843b81fcbd8
-MISC ChangeLog 2650 RMD160 509ca918aa47e37efea5a4dbd634aeb6ecc9bb48 SHA1 ae19ed034659ec82cd24e6931f2c41170a27e6d5 SHA256 1203685305a2be54b8a3c31759e1404ea42efe91a2df89367ce568313945764d
+EBUILD preview-0.8.5-r1.ebuild 705 RMD160 b90605f75b8206595990e51428da8c4c5d261f58 SHA1 23ceb96ccec4de0c683f653d51466d8cd09b15bb SHA256 834588482c8b88a27fc752a52366cf3b3b96dfada62d4bce785cbfcf7aa9c679
+MISC ChangeLog 2811 RMD160 3c22164193008611c8fc60db0c168b60d42a7226 SHA1 a9ba1f2cf680d51f5fb4b47584a355ed219d2fbe SHA256 605bce8d5c9d18ebd0c4aa1abd103bc1ae9d318aee27d959502e8025ee0a7449
MISC metadata.xml 501 RMD160 b971b037bdf60c925951a292362451b086f95517 SHA1 f0a2b78a425fc9a13c92e2b145ffaa52beaa0271 SHA256 b9a373e569bd1c9fe32ea2f1861a7c5f3295129001cc18baba3551c467ed4e58
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
}