Automatically find fpc source directory, preventing a crash on amd64 (#168168). Also, set default LCL interface to gtk2.

(Portage version: 2.1.2.2)

5 files changed, 49 insertions, 12 deletions

diff --git a/dev-lang/lazarus/ChangeLog b/dev-lang/lazarus/ChangeLog
index 85f8826fd1b9..f8e0a52a94aa 100644
--- a/dev-lang/lazarus/ChangeLog
+++ b/dev-lang/lazarus/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-lang/lazarus
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/lazarus/ChangeLog,v 1.11 2006/12/02 08:37:56 truedfx Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lazarus/ChangeLog,v 1.12 2007/03/10 08:44:37 truedfx Exp $
+
+*lazarus-0.9.20-r1 (10 Mar 2007)
+
+  10 Mar 2007; Harald van Dijk <truedfx@gentoo.org>
+  +files/lazarus-0.9.20-fpcsrc.patch, +files/lazarus-0.9.20-lclintf.patch,
+  -lazarus-0.9.20.ebuild, +lazarus-0.9.20-r1.ebuild:
+  Automatically find fpc source directory, preventing a crash on amd64
+  (#168168). Also, set default LCL interface to gtk2.
 
   02 Dec 2006; Harald van Dijk <truedfx@gentoo.org> -lazarus-0.9.10.ebuild,
   -lazarus-0.9.12.ebuild, -lazarus-0.9.16.ebuild:
diff --git a/dev-lang/lazarus/files/digest-lazarus-0.9.20 b/dev-lang/lazarus/files/digest-lazarus-0.9.20-r1
index 0f4e94fdb392..0f4e94fdb392 100644
--- a/dev-lang/lazarus/files/digest-lazarus-0.9.20
+++ b/dev-lang/lazarus/files/digest-lazarus-0.9.20-r1
diff --git a/dev-lang/lazarus/files/lazarus-0.9.20-fpcsrc.patch b/dev-lang/lazarus/files/lazarus-0.9.20-fpcsrc.patch
new file mode 100644
index 000000000000..dbde4e06a548
--- /dev/null
+++ b/dev-lang/lazarus/files/lazarus-0.9.20-fpcsrc.patch
@@ -0,0 +1,12 @@
+--- lazarus/ide/include/unix/lazbaseconf.inc
++++ lazarus/ide/include/unix/lazbaseconf.inc
+@@ -24,7 +24,8 @@
+ }
+ 
+ const
+-  DefaultFPCSrcDirs: array[1..14] of string = (
++  DefaultFPCSrcDirs: array[1..15] of string = (
++    '/usr/lib/fpc/@FPCVER@/source',
+     '/usr/share/fpcsrc',
+     '/usr/local/share/fpcsrc',
+     '/usr/fpcsrc',
diff --git a/dev-lang/lazarus/files/lazarus-0.9.20-lclintf.patch b/dev-lang/lazarus/files/lazarus-0.9.20-lclintf.patch
new file mode 100644
index 000000000000..b515efa4e0ee
--- /dev/null
+++ b/dev-lang/lazarus/files/lazarus-0.9.20-lclintf.patch
@@ -0,0 +1,11 @@
+--- lazarus/ide/include/unix/lazbaseconf.inc
++++ lazarus/ide/include/unix/lazbaseconf.inc
+@@ -180,7 +180,7 @@
+ 
+ function GetDefaultLCLWidgetType: string;
+ begin
+-  Result:='gtk';
++  Result:='gtk2';
+ end;
+ 
+ procedure GetDefaultBrowser(var Browser, Params: string);
diff --git a/dev-lang/lazarus/lazarus-0.9.20.ebuild b/dev-lang/lazarus/lazarus-0.9.20-r1.ebuild
index 41a8af410ec4..458546d1aaf5 100644
--- a/dev-lang/lazarus/lazarus-0.9.20.ebuild
+++ b/dev-lang/lazarus/lazarus-0.9.20-r1.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/lazarus/lazarus-0.9.20.ebuild,v 1.2 2006/11/23 07:14:50 truedfx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lazarus/lazarus-0.9.20-r1.ebuild,v 1.1 2007/03/10 08:44:37 truedfx Exp $
 
 inherit eutils
 
+FPCVER="2.0.4"
+
 SLOT="0" # Note: Slotting Lazarus needs slotting fpc, see DEPEND.
 LICENSE="GPL-2 LGPL-2.1 LGPL-2.1-linking-exception"
 KEYWORDS="~amd64 ~ppc ~x86"
@@ -12,11 +14,11 @@ HOMEPAGE="http://www.lazarus.freepascal.org/"
 IUSE=""
 SRC_URI="mirror://sourceforge/lazarus/${P}-0.tar.gz"
 
-DEPEND="~dev-lang/fpc-2.0.4
+DEPEND="~dev-lang/fpc-${FPCVER}
 	net-misc/rsync
 	>=x11-libs/gtk+-2.0"
 
-S=${WORKDIR}/lazarus
+S=${WORKDIR}/${PN}
 
 pkg_setup() {
 	if ! built_with_use "dev-lang/fpc" source; then
@@ -26,6 +28,16 @@ pkg_setup() {
 	fi
 }
 
+src_unpack() {
+	unpack ${A}
+	sed -e "s/@FPCVER@/${FPCVER}/" "${FILESDIR}"/${P}-fpcsrc.patch \
+		> "${T}"/fpcsrc.patch || die "could not sed fpcsrc patch"
+
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-lclintf.patch
+	epatch "${T}"/fpcsrc.patch
+}
+
 src_compile() {
 	LCL_PLATFORM=gtk2 emake -j1 || die "make failed!"
 }
@@ -52,9 +64,3 @@ src_install() {
 
 	make_desktop_entry startlazarus "Lazarus IDE" "lazarus.xpm" || die "Failed making desktop entry!"
 }
-
-pkg_postinst() {
-	ewarn "Although this version of Lazarus uses GTK2, its default interface"
-	ewarn "for projects is still GTK1. Please make sure to change this if you"
-	ewarn "wish to build GTK2 applications."
-}