From 1bf91b21fb8a0d784238d7dc009d4f2e73b82f23 Mon Sep 17 00:00:00 2001 From: Scott Stoddard Date: Tue, 28 Mar 2006 13:05:50 +0000 Subject: [PATCH] new version (0.99.8 final) with patches (*2) from upstream. Package-Manager: portage-2.1_pre7-r1 --- app-pda/jpilot/ChangeLog | 9 ++- app-pda/jpilot/Manifest | 18 ++++- app-pda/jpilot/files/digest-jpilot-0.99.8 | 3 + app-pda/jpilot/files/jpilot-0.99.8-glob.patch | 15 +++++ .../jpilot/files/jpilot-0.99.8-memory.patch | 12 ++++ app-pda/jpilot/jpilot-0.99.8.ebuild | 65 +++++++++++++++++++ 6 files changed, 118 insertions(+), 4 deletions(-) create mode 100644 app-pda/jpilot/files/digest-jpilot-0.99.8 create mode 100644 app-pda/jpilot/files/jpilot-0.99.8-glob.patch create mode 100644 app-pda/jpilot/files/jpilot-0.99.8-memory.patch create mode 100644 app-pda/jpilot/jpilot-0.99.8.ebuild diff --git a/app-pda/jpilot/ChangeLog b/app-pda/jpilot/ChangeLog index b1c7e0515d73..ac9d5f718fde 100644 --- a/app-pda/jpilot/ChangeLog +++ b/app-pda/jpilot/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-pda/jpilot # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-pda/jpilot/ChangeLog,v 1.27 2006/03/28 01:05:50 deltacow Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-pda/jpilot/ChangeLog,v 1.28 2006/03/28 13:05:49 deltacow Exp $ + +*jpilot-0.99.8 (28 Mar 2006) + + 28 Mar 2006; Scott Stoddard + +files/jpilot-0.99.8-glob.patch, +files/jpilot-0.99.8-memory.patch, + +jpilot-0.99.8.ebuild: + New version. Patches applied to bring it up to date with upstream. 28 Mar 2006; Scott Stoddard jpilot-0.99.7-r1.ebuild, jpilot-0.99.8_pre9.ebuild: diff --git a/app-pda/jpilot/Manifest b/app-pda/jpilot/Manifest index babc8f02d1df..56eaa64affe7 100644 --- a/app-pda/jpilot/Manifest +++ b/app-pda/jpilot/Manifest @@ -1,18 +1,30 @@ -MD5 d4cc589464cb5d04ae5004bf1122f0a0 ChangeLog 5363 -RMD160 913ccd549fecd4ac13dc802742fb4b081366075f ChangeLog 5363 -SHA256 c5b2da9bb15abdac0d311ff7b854f3537e7d2a48aa29b4727d99454e5fa9226d ChangeLog 5363 +MD5 8e5eaea3f1f8d0801a869e4ad0fc2d02 ChangeLog 5611 +RMD160 de69c5714704e9f87fcb003cb8b1d322bc0a5ff7 ChangeLog 5611 +SHA256 bae45aa43d2c292b51a4ff5e1ad649a20dcdf4e5f0d33925c92d3bec5c355096 ChangeLog 5611 MD5 ac0b77783e7cf50e9f7f63397d19e774 files/digest-jpilot-0.99.7-r1 66 RMD160 7ba31dd21e12b056d8417f0ad40cd0f7e09fab1b files/digest-jpilot-0.99.7-r1 66 SHA256 cdc69ccadeb271aeedc66e948fd097f1d20fa6fb8b101c51fc4cc7564f3a1b7c files/digest-jpilot-0.99.7-r1 66 +MD5 b81afd92dceabab1182817baea3fcbce files/digest-jpilot-0.99.8 244 +RMD160 b033a9588eda4e4ff3ec0cbfd25f179e2f272492 files/digest-jpilot-0.99.8 244 +SHA256 cb32673ac1727867e12aa6248bf3ef8caf3af85d53ed9a515b13553e958b36d1 files/digest-jpilot-0.99.8 244 MD5 077de68f5266a8517c2e4c315046f00e files/digest-jpilot-0.99.8_pre9 71 RMD160 4c603e431c9b6a780455bf0b48a8c6cc85dda6d9 files/digest-jpilot-0.99.8_pre9 71 SHA256 9575b6fcb1b26d8a9d0158f31fe5ebd2976bfe354d5007e67e85924285b1b51d files/digest-jpilot-0.99.8_pre9 71 MD5 1a69d9c2c611a27639d15707d1a54549 files/jpilot-0.99.7-gcc2.patch 583 RMD160 b6f3ba7c0484d1966affa357baa9ac153a7bbb4b files/jpilot-0.99.7-gcc2.patch 583 SHA256 f852f3a6539965559dc63a765fb2eb0bcfeba946af48a984cb7ad8c73b9122ad files/jpilot-0.99.7-gcc2.patch 583 +MD5 57d5d8d16ab24394a87b2df189cb5180 files/jpilot-0.99.8-glob.patch 437 +RMD160 30d1095f1afb0f7fe7d921eb2026f270e29144fa files/jpilot-0.99.8-glob.patch 437 +SHA256 8e56a5df2d427ebadf0093bd205ead98f06e0acd9ce1004d51f39eb09ba75834 files/jpilot-0.99.8-glob.patch 437 +MD5 c1a8a08ca04295435b30b908fc3adff3 files/jpilot-0.99.8-memory.patch 438 +RMD160 e42c2dc9306e14cfbe08d5ef234dbb4daecd41b5 files/jpilot-0.99.8-memory.patch 438 +SHA256 288e27781e8b9f3729f851b11e70b8910b471621042542774901348e1a3785b6 files/jpilot-0.99.8-memory.patch 438 MD5 60f137e0367e0a0d1a406ca723ba2628 jpilot-0.99.7-r1.ebuild 1710 RMD160 a077c858dda2c99b24801e3587095d403d512a9e jpilot-0.99.7-r1.ebuild 1710 SHA256 ec38a3fce252fb14b1c0c5145fa156c5672411736091e88b93a0324c774f5703 jpilot-0.99.7-r1.ebuild 1710 +MD5 62871f1370f7903c7896b77b2307ae3d jpilot-0.99.8.ebuild 1707 +RMD160 8bd37d835352cd469498864fba342da1d9d5d7ba jpilot-0.99.8.ebuild 1707 +SHA256 3a00e5a4ffe6775f20f6b7f145ea0e79f461466d5f47b6554ed2963737dd077b jpilot-0.99.8.ebuild 1707 MD5 9fd7ceffce549c02bf9086bb0dce133e jpilot-0.99.8_pre9.ebuild 1733 RMD160 bf2a439b0e9d153cb0ab6fbb4675e4d72e5a84eb jpilot-0.99.8_pre9.ebuild 1733 SHA256 16f7f55852ef0b1b78123769c5ec53572395b9a59a4a2003461bd6f070f1d7cb jpilot-0.99.8_pre9.ebuild 1733 diff --git a/app-pda/jpilot/files/digest-jpilot-0.99.8 b/app-pda/jpilot/files/digest-jpilot-0.99.8 new file mode 100644 index 000000000000..79669a2350c1 --- /dev/null +++ b/app-pda/jpilot/files/digest-jpilot-0.99.8 @@ -0,0 +1,3 @@ +MD5 4bdb200367e691e64d02bd6dfcdec604 jpilot-0.99.8.tar.gz 1589217 +RMD160 9d19e41a8d73f1dbfc5107e0ee1657ac09b55189 jpilot-0.99.8.tar.gz 1589217 +SHA256 a89ca99df142efa6046509df7522794c34da84158893bfbce836c9f5fd943d78 jpilot-0.99.8.tar.gz 1589217 diff --git a/app-pda/jpilot/files/jpilot-0.99.8-glob.patch b/app-pda/jpilot/files/jpilot-0.99.8-glob.patch new file mode 100644 index 000000000000..3b478400f286 --- /dev/null +++ b/app-pda/jpilot/files/jpilot-0.99.8-glob.patch @@ -0,0 +1,15 @@ +Index: jpilot-sync.c +=================================================================== +RCS file: /cvs/jpilot/jpilot_src/jpilot-sync.c,v +retrieving revision 1.23 +diff -u -r1.23 jpilot-sync.c +--- jpilot-sync.c 28 Jan 2005 16:54:13 -0000 1.23 ++++ jpilot-sync.c 5 Nov 2005 15:07:57 -0000 +@@ -44,6 +44,7 @@ + pid_t glob_child_pid; + GtkWidget *glob_dialog; + pid_t glob_child_pid; ++GtkTooltips *glob_tooltips; + + unsigned char skip_plugins; + diff --git a/app-pda/jpilot/files/jpilot-0.99.8-memory.patch b/app-pda/jpilot/files/jpilot-0.99.8-memory.patch new file mode 100644 index 000000000000..cb8e270b1c21 --- /dev/null +++ b/app-pda/jpilot/files/jpilot-0.99.8-memory.patch @@ -0,0 +1,12 @@ +--- utils.c.orig 2005-12-11 13:04:24.000000000 -0500 ++++ utils.c 2005-12-11 13:04:38.000000000 -0500 +@@ -2042,9 +2042,6 @@ + fwrite(RecordBuffer->data, header.rec_len, 1, pc_in); + #endif /* PILOT_LINK_0_12 */ + jp_logf(JP_LOG_DEBUG, "record deleted\n"); +-#ifdef PILOT_LINK_0_12 +- pi_buffer_free(RecordBuffer); +-#endif /* PILOT_LINK_0_12 */ + fclose(pc_in); + #ifdef PILOT_LINK_0_12 + pi_buffer_free(RecordBuffer); diff --git a/app-pda/jpilot/jpilot-0.99.8.ebuild b/app-pda/jpilot/jpilot-0.99.8.ebuild new file mode 100644 index 000000000000..b2ddf39a9cdb --- /dev/null +++ b/app-pda/jpilot/jpilot-0.99.8.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-pda/jpilot/jpilot-0.99.8.ebuild,v 1.1 2006/03/28 13:05:50 deltacow Exp $ + +inherit eutils multilib + +DESCRIPTION="Desktop Organizer Software for the Palm Pilot" +HOMEPAGE="http://jpilot.org/" +SRC_URI="mirror://gentoo/distfiles/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86" +IUSE="nls gtk2" + +RDEPEND="gtk2? ( >=x11-libs/gtk+-2 ) + !gtk2? ( >=x11-libs/gtk+-1.2 ) + >=app-pda/pilot-link-0.11.5" +DEPEND="${RDEPEND} + gtk2? ( dev-util/pkgconfig ) + nls? ( sys-devel/gettext )" + +src_unpack() { + unpack ${A} + cd ${S} || die + + # There are four icons available. Use the third. + sed -i 's/jpilot.xpm/jpilot-icon3.xpm/' jpilot.desktop || die + + # these two patches are from upstream + epatch ${FILESDIR}/${P}-memory.patch + epatch ${FILESDIR}/${P}-glob.patch +} + +src_compile() { + econf $(use_enable gtk2) $(use_enable nls) || die "configure failed" + emake -j1 || die "make failed" +} + +src_install() { + make install DESTDIR=${D} \ + libdir=/usr/$(get_libdir) \ + docdir=/usr/share/doc/${PF} \ + icondir=/usr/share/pixmaps \ + desktopdir=/usr/share/applications || die "install failed" + + dodoc README TODO UPGRADING ABOUT-NLS BUGS ChangeLog + doman docs/*.1 + + dodir /usr/share/${PN} + insinto /usr/share/${PN} + doins ${S}/jpilotrc.* +} + +pkg_postinst() { + einfo + einfo "The jpilot-syncmal plugin has moved to its own ebuild." + einfo "If you want to use that plugin, please run" + einfo " emerge jpilot-syncmal" + einfo + einfo "There are other plugins available as well. To see the" + einfo "list, please run" + einfo " emerge -s jpilot" + einfo +} -- 2.26.2