From be879aa01a77cb65f5cb502e6318b35d1dbf415e Mon Sep 17 00:00:00 2001 From: Harald van Dijk Date: Sat, 10 Mar 2007 08:44:37 +0000 Subject: [PATCH] Automatically find fpc source directory, preventing a crash on amd64 (#168168). Also, set default LCL interface to gtk2. Package-Manager: portage-2.1.2.2 --- dev-lang/lazarus/ChangeLog | 12 +++++- dev-lang/lazarus/Manifest | 38 +++++++++++-------- ...azarus-0.9.20 => digest-lazarus-0.9.20-r1} | 0 .../lazarus/files/lazarus-0.9.20-fpcsrc.patch | 12 ++++++ .../files/lazarus-0.9.20-lclintf.patch | 11 ++++++ ...0.9.20.ebuild => lazarus-0.9.20-r1.ebuild} | 26 ++++++++----- 6 files changed, 72 insertions(+), 27 deletions(-) rename dev-lang/lazarus/files/{digest-lazarus-0.9.20 => digest-lazarus-0.9.20-r1} (100%) create mode 100644 dev-lang/lazarus/files/lazarus-0.9.20-fpcsrc.patch create mode 100644 dev-lang/lazarus/files/lazarus-0.9.20-lclintf.patch rename dev-lang/lazarus/{lazarus-0.9.20.ebuild => lazarus-0.9.20-r1.ebuild} (80%) 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 + +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 -lazarus-0.9.10.ebuild, -lazarus-0.9.12.ebuild, -lazarus-0.9.16.ebuild: diff --git a/dev-lang/lazarus/Manifest b/dev-lang/lazarus/Manifest index 988b4e7f2d4e..d881304b115b 100644 --- a/dev-lang/lazarus/Manifest +++ b/dev-lang/lazarus/Manifest @@ -1,26 +1,34 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +AUX lazarus-0.9.20-fpcsrc.patch 333 RMD160 2afa08d4a5e11c38dd3e6b6907c117b00c5b523f SHA1 3e5c47eac41249dd2c78321be6ae9604b8d55931 SHA256 2ebf6b5a9a5ff2746339c2b6bfe4149c663803fa4dfe98408240b33cdf1f544c +MD5 728fbd094be35bcec4b8e9b83eea9b6a files/lazarus-0.9.20-fpcsrc.patch 333 +RMD160 2afa08d4a5e11c38dd3e6b6907c117b00c5b523f files/lazarus-0.9.20-fpcsrc.patch 333 +SHA256 2ebf6b5a9a5ff2746339c2b6bfe4149c663803fa4dfe98408240b33cdf1f544c files/lazarus-0.9.20-fpcsrc.patch 333 +AUX lazarus-0.9.20-lclintf.patch 266 RMD160 0e3e711034be39f7cda9375a5df5b7f0dd150a1c SHA1 4fdedeb7a33588e216367de2d3ad3004b4535f00 SHA256 400c2e5bf2183d2e21a930a752701d62a4d75fc552111cf7a5c366f6e745eee5 +MD5 c24d1e618b5b6d3d1a1948b12d40491c files/lazarus-0.9.20-lclintf.patch 266 +RMD160 0e3e711034be39f7cda9375a5df5b7f0dd150a1c files/lazarus-0.9.20-lclintf.patch 266 +SHA256 400c2e5bf2183d2e21a930a752701d62a4d75fc552111cf7a5c366f6e745eee5 files/lazarus-0.9.20-lclintf.patch 266 DIST lazarus-0.9.20-0.tar.gz 10241274 RMD160 5a2c061e42306008858cf8b3a51ecaa1aa3f0bca SHA1 6f72cda6ed67d4855118c9147d46ff575232bed1 SHA256 c3416c557e510c9fcca5de59f128854eb5605f69fc7472cea11fc09ed5f8285e -EBUILD lazarus-0.9.20.ebuild 2009 RMD160 7ee0c42307a84e2ce3cab50ae690c9075c6430c5 SHA1 f964fd964be7c975a1d96ec37e0d0db6d4a765b1 SHA256 5fd7f35b72269f82ea09dcd36bf687a1b5ccf820eddc95bfdf16c26db39fdf16 -MD5 0dba058c40eab88e822258de0e3ed363 lazarus-0.9.20.ebuild 2009 -RMD160 7ee0c42307a84e2ce3cab50ae690c9075c6430c5 lazarus-0.9.20.ebuild 2009 -SHA256 5fd7f35b72269f82ea09dcd36bf687a1b5ccf820eddc95bfdf16c26db39fdf16 lazarus-0.9.20.ebuild 2009 -MISC ChangeLog 1800 RMD160 865f07341f3c765cd9f9182f5673312aab2fd037 SHA1 1aa184ff252ecb5cdd8428901a88e699c42e9ed0 SHA256 0324684b314924f2bc0ca3e52b1967ec04475823d6b09c92dbd030a89efdf5c3 -MD5 2925dc076b26773552bea655b16ce75e ChangeLog 1800 -RMD160 865f07341f3c765cd9f9182f5673312aab2fd037 ChangeLog 1800 -SHA256 0324684b314924f2bc0ca3e52b1967ec04475823d6b09c92dbd030a89efdf5c3 ChangeLog 1800 +EBUILD lazarus-0.9.20-r1.ebuild 2055 RMD160 3ad069e9b050edc66743449f1b8f12bb1a01bee4 SHA1 3ae5c20ae64e137d7dfcae1c5b6e3aa2fab0441f SHA256 e3ac2388894ac4fbad48868ce298a7327bad04f0ae1257ad6d2efc56ca6b00a0 +MD5 9db9e915311c5d11f55f963da4411693 lazarus-0.9.20-r1.ebuild 2055 +RMD160 3ad069e9b050edc66743449f1b8f12bb1a01bee4 lazarus-0.9.20-r1.ebuild 2055 +SHA256 e3ac2388894ac4fbad48868ce298a7327bad04f0ae1257ad6d2efc56ca6b00a0 lazarus-0.9.20-r1.ebuild 2055 +MISC ChangeLog 2140 RMD160 ac76d31e7c8b87947859f09dd5faa722ade81f33 SHA1 5d73bed123d63354212b8d15eaf8c6f4fb35ab5f SHA256 063db0d0b87520e745cf7ca49090b86b62a46d389acf2fbca1268e4feaaed0a3 +MD5 47335487b5b23e882899a6dede16da16 ChangeLog 2140 +RMD160 ac76d31e7c8b87947859f09dd5faa722ade81f33 ChangeLog 2140 +SHA256 063db0d0b87520e745cf7ca49090b86b62a46d389acf2fbca1268e4feaaed0a3 ChangeLog 2140 MISC metadata.xml 281 RMD160 423ab877620b713044c2d08753af1fa18a3adce4 SHA1 c861318fcfa3725a45dd0deb55fbfc26a49245b6 SHA256 d0d50fc65f6bc2ce65700e4ea995148f15c4e7a0eca5d0f86e3f4b9a73a4aae6 MD5 8773813255798a06aad7b06e083a1a55 metadata.xml 281 RMD160 423ab877620b713044c2d08753af1fa18a3adce4 metadata.xml 281 SHA256 d0d50fc65f6bc2ce65700e4ea995148f15c4e7a0eca5d0f86e3f4b9a73a4aae6 metadata.xml 281 -MD5 84c87b76f87fa0bdfc738b94b819489e files/digest-lazarus-0.9.20 256 -RMD160 e9a791d6655e4d9143e7e71a20dc3b226a99f744 files/digest-lazarus-0.9.20 256 -SHA256 49f58ce799154ff503040c5f74a333cbf4e2b2eac6005a1516a466aa8f597c96 files/digest-lazarus-0.9.20 256 +MD5 84c87b76f87fa0bdfc738b94b819489e files/digest-lazarus-0.9.20-r1 256 +RMD160 e9a791d6655e4d9143e7e71a20dc3b226a99f744 files/digest-lazarus-0.9.20-r1 256 +SHA256 49f58ce799154ff503040c5f74a333cbf4e2b2eac6005a1516a466aa8f597c96 files/digest-lazarus-0.9.20-r1 256 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.5 (GNU/Linux) +Version: GnuPG v2.0.3 (GNU/Linux) -iD8DBQFFcTt8wnQyISwouHwRAtoJAKC8vRcpp/RFM94lk5yr9qgqExBE9ACeJMPo -uLD5CoKw/ozWP8uapmbBJXQ= -=btWD +iD8DBQFF8m8UwnQyISwouHwRAj5HAKDCkqwwYl6km7f18Y+RvGL+PsiySACfcIja +pMT+kHp6jrb7ZmhrvKft74E= +=lFzS -----END PGP SIGNATURE----- diff --git a/dev-lang/lazarus/files/digest-lazarus-0.9.20 b/dev-lang/lazarus/files/digest-lazarus-0.9.20-r1 similarity index 100% rename from dev-lang/lazarus/files/digest-lazarus-0.9.20 rename to 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 similarity index 80% rename from dev-lang/lazarus/lazarus-0.9.20.ebuild rename to 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." -} -- 2.26.2