From 60d8368735ce4f35b0163362fb1656cda3d48375 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Miroslav=20=C5=A0ulc?= Date: Sat, 10 Feb 2007 01:50:03 +0000 Subject: [PATCH] Added patch from nebojsa that solves bug #166146. Package-Manager: portage-2.1.2-r9 --- app-misc/freemind/ChangeLog | 9 ++++- app-misc/freemind/Manifest | 34 +++++++++++-------- .../freemind/files/digest-freemind-0.7.1-r1 | 2 ++ ...mind-0.8.0-r2 => digest-freemind-0.8.0-r3} | 0 .../files/freemind-0.8.0-source.patch | 12 +++++++ ...8.0-r2.ebuild => freemind-0.8.0-r3.ebuild} | 9 ++++- 6 files changed, 49 insertions(+), 17 deletions(-) rename app-misc/freemind/files/{digest-freemind-0.8.0-r2 => digest-freemind-0.8.0-r3} (100%) create mode 100644 app-misc/freemind/files/freemind-0.8.0-source.patch rename app-misc/freemind/{freemind-0.8.0-r2.ebuild => freemind-0.8.0-r3.ebuild} (87%) diff --git a/app-misc/freemind/ChangeLog b/app-misc/freemind/ChangeLog index 1302955c4a06..b478b05813f2 100644 --- a/app-misc/freemind/ChangeLog +++ b/app-misc/freemind/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-misc/freemind # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/freemind/ChangeLog,v 1.25 2007/01/19 14:18:59 masterdriverz Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/freemind/ChangeLog,v 1.26 2007/02/10 01:50:03 fordfrog Exp $ + +*freemind-0.8.0-r3 (10 Feb 2007) + + 10 Feb 2007; Miroslav Å ulc + +files/freemind-0.8.0-source.patch, -freemind-0.8.0-r2.ebuild, + +freemind-0.8.0-r3.ebuild: + Added patch from nebojsa that solves bug #166146. 19 Jan 2007; Charlie Shepherd freemind-0.8.0-r2.ebuild: diff --git a/app-misc/freemind/Manifest b/app-misc/freemind/Manifest index e285e6593799..8ebb7ed200d7 100644 --- a/app-misc/freemind/Manifest +++ b/app-misc/freemind/Manifest @@ -1,24 +1,28 @@ -DIST freemind-src-0_7_1.tar.gz 239660 +AUX freemind-0.8.0-source.patch 707 RMD160 564bee084b34c484d36819b5ccfafd2691b3cd4a SHA1 0afdbf3b0a0e2ebecb3e3de00c4f4ed85816c5ea SHA256 95172076011a2b98eeaaa1d4267926abf0c2a9828ba27abf254450757b33fa8f +MD5 46a5acee95e2fde1f398d4f376ff7447 files/freemind-0.8.0-source.patch 707 +RMD160 564bee084b34c484d36819b5ccfafd2691b3cd4a files/freemind-0.8.0-source.patch 707 +SHA256 95172076011a2b98eeaaa1d4267926abf0c2a9828ba27abf254450757b33fa8f files/freemind-0.8.0-source.patch 707 +DIST freemind-src-0_7_1.tar.gz 239660 RMD160 f1e919489d30823433d0ae698ea3a565f13255a8 SHA1 26ae7156a7c5e358d8589351bb9e2831f4d5851c SHA256 39bc7f6794c470060b4a639c014f913803059ab2e755defc9f6c886c4bdc7202 DIST freemind-src-0_8_0.zip 9857214 RMD160 df7f47aedef7b761c94f938f7c851f0b8ed32e04 SHA1 17c65bdc65b292d7d62fe7a8d633a24c2ad618df SHA256 c28902151f0089ddd1270c662820b6e33a85a686083c53dcfe6dd7205493da78 EBUILD freemind-0.7.1-r1.ebuild 1257 RMD160 0d3e7d091978d7af7f377999dbe355148457466c SHA1 9f0ebaa445958cba557aa4eb69ecb5a54968afce SHA256 20625a3e0378e39e68297c345f7557597d634b084e82502cde38ea84f88ba2c0 MD5 7a532aaf0d10c04e1487ba3931e619df freemind-0.7.1-r1.ebuild 1257 RMD160 0d3e7d091978d7af7f377999dbe355148457466c freemind-0.7.1-r1.ebuild 1257 SHA256 20625a3e0378e39e68297c345f7557597d634b084e82502cde38ea84f88ba2c0 freemind-0.7.1-r1.ebuild 1257 -EBUILD freemind-0.8.0-r2.ebuild 1272 RMD160 41327dd15cd43ad360e8b81b028c6c3e2b2ca01e SHA1 a6a4d0eefcfdf5814c72a0cfc9c8bc5392977ec8 SHA256 8025208c61c0db156fe8d58e77ce5bf311407cdbdef2161930fb8a281f1b9352 -MD5 ced9cb7c594a3052531c56fd4c2142b6 freemind-0.8.0-r2.ebuild 1272 -RMD160 41327dd15cd43ad360e8b81b028c6c3e2b2ca01e freemind-0.8.0-r2.ebuild 1272 -SHA256 8025208c61c0db156fe8d58e77ce5bf311407cdbdef2161930fb8a281f1b9352 freemind-0.8.0-r2.ebuild 1272 -MISC ChangeLog 3804 RMD160 6b05e5e641cd38d6ee4947d1781a02c4d138ab8f SHA1 35b1d521ef0f349d9333efd444816253e0bba35a SHA256 e4214a906408e5a97ba907205c2d563cdcac5d853fe38d4b43e6ecbd4b36773c -MD5 aeb8c1a82d9a496ac4e308c3cfbc8798 ChangeLog 3804 -RMD160 6b05e5e641cd38d6ee4947d1781a02c4d138ab8f ChangeLog 3804 -SHA256 e4214a906408e5a97ba907205c2d563cdcac5d853fe38d4b43e6ecbd4b36773c ChangeLog 3804 +EBUILD freemind-0.8.0-r3.ebuild 1388 RMD160 fd5b8e4799a4cf6c81950b18df9c2c1d9d17e890 SHA1 a11aa5ced3984f6b79faf249d96402cf83675f58 SHA256 5c47e9b44d2e70bba7631c673fdf45295b06c931cd86b73770012203c8ee366a +MD5 26835e965f9bfe65c0684df894dbc05e freemind-0.8.0-r3.ebuild 1388 +RMD160 fd5b8e4799a4cf6c81950b18df9c2c1d9d17e890 freemind-0.8.0-r3.ebuild 1388 +SHA256 5c47e9b44d2e70bba7631c673fdf45295b06c931cd86b73770012203c8ee366a freemind-0.8.0-r3.ebuild 1388 +MISC ChangeLog 4055 RMD160 c166d7276a79eafeee557fc93e2768332ff0e624 SHA1 426f3490a52b8c726f13350586c55588bdd6cb64 SHA256 3aee900279998ceee6b1f1cfe3925224f8897f75218cea49d037a43a6f4e7616 +MD5 35226257a4f18bc1d94f656156468667 ChangeLog 4055 +RMD160 c166d7276a79eafeee557fc93e2768332ff0e624 ChangeLog 4055 +SHA256 3aee900279998ceee6b1f1cfe3925224f8897f75218cea49d037a43a6f4e7616 ChangeLog 4055 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 metadata.xml 157 -MD5 615ccb469eb93e22c5e84358d55e6c0f files/digest-freemind-0.7.1-r1 70 -RMD160 d6021de6a622d5b711b54063c317ae902e4f5fe0 files/digest-freemind-0.7.1-r1 70 -SHA256 85607ed73f061cb4b2982e5ee859a79aff008b4706d677cd93f8b6d20c890494 files/digest-freemind-0.7.1-r1 70 -MD5 e75fc73afee14840c7adde42fd20c5dc files/digest-freemind-0.8.0-r2 250 -RMD160 4d9c90efc878c55d90451e44f10bd0688ea49f19 files/digest-freemind-0.8.0-r2 250 -SHA256 acb0002f27a8184908bd2dad8b845aa4d86934676addb489fec640e8c47ee47c files/digest-freemind-0.8.0-r2 250 +MD5 f58af955877221f41e3d550a7a1d7675 files/digest-freemind-0.7.1-r1 256 +RMD160 4566cb70b52b5aab7eae51aa3be4ad1e30e9f303 files/digest-freemind-0.7.1-r1 256 +SHA256 bdf99de663ef83d211a3ce9d5aa3418d5cd1c12bccfa8a86de8507a58b676d50 files/digest-freemind-0.7.1-r1 256 +MD5 e75fc73afee14840c7adde42fd20c5dc files/digest-freemind-0.8.0-r3 250 +RMD160 4d9c90efc878c55d90451e44f10bd0688ea49f19 files/digest-freemind-0.8.0-r3 250 +SHA256 acb0002f27a8184908bd2dad8b845aa4d86934676addb489fec640e8c47ee47c files/digest-freemind-0.8.0-r3 250 diff --git a/app-misc/freemind/files/digest-freemind-0.7.1-r1 b/app-misc/freemind/files/digest-freemind-0.7.1-r1 index 5f4e8561322a..8effcd9efd79 100644 --- a/app-misc/freemind/files/digest-freemind-0.7.1-r1 +++ b/app-misc/freemind/files/digest-freemind-0.7.1-r1 @@ -1 +1,3 @@ MD5 45bab60d1c9de145661b82650ad09951 freemind-src-0_7_1.tar.gz 239660 +RMD160 f1e919489d30823433d0ae698ea3a565f13255a8 freemind-src-0_7_1.tar.gz 239660 +SHA256 39bc7f6794c470060b4a639c014f913803059ab2e755defc9f6c886c4bdc7202 freemind-src-0_7_1.tar.gz 239660 diff --git a/app-misc/freemind/files/digest-freemind-0.8.0-r2 b/app-misc/freemind/files/digest-freemind-0.8.0-r3 similarity index 100% rename from app-misc/freemind/files/digest-freemind-0.8.0-r2 rename to app-misc/freemind/files/digest-freemind-0.8.0-r3 diff --git a/app-misc/freemind/files/freemind-0.8.0-source.patch b/app-misc/freemind/files/freemind-0.8.0-source.patch new file mode 100644 index 000000000000..2a3a62a07900 --- /dev/null +++ b/app-misc/freemind/files/freemind-0.8.0-source.patch @@ -0,0 +1,12 @@ +diff -ur f1/freemind/freemind/controller/Controller.java f2/freemind/freemind/controller/Controller.java +--- f1/freemind/freemind/controller/Controller.java 2005-06-14 22:38:06.000000000 +0200 ++++ f2/freemind/freemind/controller/Controller.java 2007-02-09 21:13:16.000000000 +0100 +@@ -1191,7 +1191,7 @@ + options.buildPanel(); + options.setProperties(getFrame().getProperties()); + dialog.setTitle("Freemind Properties"); +- dialog.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE); ++ dialog.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE); + dialog.addWindowListener(new WindowAdapter(){ + public void windowClosing(WindowEvent event) { + options.closeWindow(); diff --git a/app-misc/freemind/freemind-0.8.0-r2.ebuild b/app-misc/freemind/freemind-0.8.0-r3.ebuild similarity index 87% rename from app-misc/freemind/freemind-0.8.0-r2.ebuild rename to app-misc/freemind/freemind-0.8.0-r3.ebuild index 5c1575585274..b978ffcd8969 100644 --- a/app-misc/freemind/freemind-0.8.0-r2.ebuild +++ b/app-misc/freemind/freemind-0.8.0-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-misc/freemind/freemind-0.8.0-r2.ebuild,v 1.2 2007/01/19 14:18:59 masterdriverz Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/freemind/freemind-0.8.0-r3.ebuild,v 1.1 2007/02/10 01:50:03 fordfrog Exp $ inherit java-pkg-2 java-ant-2 eutils @@ -24,6 +24,13 @@ RDEPEND=">=virtual/jre-1.4" S="${WORKDIR}/${PN}" +src_unpack() { + unpack "${A}" + cd "${S}" + # patch for JDK 1.6 (see bug #109678) + epatch ${FILESDIR}/${P}-source.patch +} + src_compile() { eant dist browser $(use_doc doc) } -- 2.26.2