From: W. Trevor King Date: Thu, 16 Jun 2011 20:32:00 +0000 (-0400) Subject: Add divorce patch to lifelines. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=80e6da69423d4981f7add87f3a16c5423d7247c5;p=wtk-overlay.git Add divorce patch to lifelines. --- diff --git a/app-misc/lifelines/ChangeLog b/app-misc/lifelines/ChangeLog index c213127..9840324 100644 --- a/app-misc/lifelines/ChangeLog +++ b/app-misc/lifelines/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*lifelines-3.0.62.0 (16 Jun 2011) + 16 Jun 2011: W. Trevor King lifelines-3.0.62.0.ebuild : + - Add divorce patch so Dave Close's html.ll report will run. + *lifelines-3.0.62.0 (31 Dec 2010) 31 Dec 2010; W. Trevor King lifelines-3.0.62.0.ebuild, -lifelines-3.0.37.2.ebuild : - Fix repoman-reported issues with 3.0.62.0. diff --git a/app-misc/lifelines/Manifest b/app-misc/lifelines/Manifest index a67177c..8aa08d4 100644 --- a/app-misc/lifelines/Manifest +++ b/app-misc/lifelines/Manifest @@ -1,4 +1,5 @@ +AUX lifelines-3.0.62-divorce.patch 3873 RMD160 30b99a211a231a8a5d367c826069ac9d263647c2 SHA1 7a2036c0725cecd8c8abe1ab462700631aedfc04 SHA256 12b33cf433e5a71ee034e10166c4b61ce55af145cd505c4b97f1e0749a5a0e39 DIST lifelines-3.0.62.tar.bz2 2289866 RMD160 5335b6d5a9c8300ee8a9bbdc41c66a8632a439df SHA1 1d402e42cb0e4386367afa98c2cb04a3dbc28a26 SHA256 1c279958748e0f80b399bd8ea29f4030aa6db93059785d68abccf98b59c41e05 -EBUILD lifelines-3.0.62.ebuild 1544 RMD160 4896f07869bd639b7a39ac38870a3caa875ecfd9 SHA1 02fb06847df281a944376a9ded16bea2fe898cf3 SHA256 d977babf3ecfae941d04fdbea110c4e2b295cf9b60feba9a8b2828b38c83f129 -MISC ChangeLog 1775 RMD160 85ac9d1d8bf44842751455fa0afe2965b443a94c SHA1 7e24bfcc1517cf6137323229cab3703e510e348d SHA256 bf85f11668da0b28708a6423298742b376fa8fef2e5db75b421cf49b2f64608d +EBUILD lifelines-3.0.62.ebuild 1585 RMD160 cb7045c888707dd1431d87e04a0110d534dbc07f SHA1 eadc71540b74d180fe049a40fab73197e8e01010 SHA256 a67917151ede4544c7e177d50218501005d8b2c15a05b9c80f660f6fb7ed7657 +MISC ChangeLog 1950 RMD160 fbafc89caf138cda3a291122e3ef510740b5c263 SHA1 e72b898a0448a36747c5fe101149c272d9a9c3f2 SHA256 5b2d7eb84068f52a0afc5d055fad1b28fe57822e944b6fecde9fcb9014507193 MISC metadata.xml 419 RMD160 f7dac0bed6d1f352c05cb03788c9ae236b88f914 SHA1 ce8a25646d3ecff0b0b3ae71ec58d0b364aec5f6 SHA256 fe9dca99fc4c9d248ebb7495f874adae2e6562a00fba094c9acfae8ebe893381 diff --git a/app-misc/lifelines/files/lifelines-3.0.62-divorce.patch b/app-misc/lifelines/files/lifelines-3.0.62-divorce.patch new file mode 100644 index 0000000..afb434d --- /dev/null +++ b/app-misc/lifelines/files/lifelines-3.0.62-divorce.patch @@ -0,0 +1,97 @@ +http://listserv.nodak.edu/cgi-bin/wa.exe?A2=ind0211b&L=lines-l&T=0&F=&S=&P=356 +Date: Tue, 12 Nov 2002 21:36:50 -0800 +Reply-To: LifeLines Genealogical System <[log in to unmask]> +Sender: LifeLines Genealogical System <[log in to unmask]> +From: Dave Close <[log in to unmask]> +Subject: Divorce function +Content-Type: text/plain; charset=us-ascii + +The following patch against LifeLines 3.0.21 attempts to add a new +"divorce" function to the interpreter language. It has the same syntax +as the current "marriage" function. It works for me, but the +experience of others might be useful. + +[Updated to match version 3.0.62 by W. Trevor King on 16 June 2011] + +--- a/src/gedlib/messages.c Tue Nov 12 21:29:51 2002 ++++ b/src/gedlib/messages.c Tue Nov 12 20:04:32 2002 +@@ -379,6 +379,7 @@ + ZST qSdspa_chbr = N_("cb. "); + /* &&end display abbreviations, begin long forms */ + ZST qSdspl_mar = N_("married: "); ++ZST qSdspl_div = N_("divorced: "); + ZST qSdspl_bir = N_("born: "); + ZST qSdspl_chr = N_("bapt: "); + ZST qSdspl_dea = N_("died: "); + +--- a/src/gedlib/gstrings.c Tue Nov 12 21:29:51 2002 ++++ b/src/gedlib/gstrings.c Tue Nov 12 20:03:19 2002 +@@ -122,6 +122,7 @@ + /* TODO: Shouldn't we len -= strlen(p) first ? Perry, 2007-09-29 */ + p += strlen(p); + if (fam) evt = fam_to_event(fam, "MARR", _(qSdspa_mar), len, rfmt); ++ if (!evt) evt = fam_to_event(fam, "DIVO", _(qSdspa_mar), len, rfmt); + if (!evt) evt = indi_to_event(indi, "BIRT", _(qSdspa_bir), len, rfmt); + if (!evt) evt = indi_to_event(indi, "CHR", _(qSdspa_chr), len, rfmt); + if (!evt) evt = indi_to_event(indi, "DEAT", _(qSdspa_dea), len, rfmt); + +--- a/src/interp/builtin.c Tue Nov 12 21:29:43 2002 ++++ b/src/interp/builtin.c Tue Nov 12 19:58:51 2002 +@@ -777,6 +777,24 @@ + } + return create_pvalue_from_indi(fam_to_wife_node(fam)); + } ++/*=================================+ ++ * llrpt_divo -- Find divorce of family ++ * usage: divorce(FAM) -> EVENT ++ *================================*/ ++PVALUE ++llrpt_divo (PNODE node, SYMTAB stab, BOOLEAN *eflg) ++{ ++ PNODE arg = (PNODE) iargs(node); ++ NODE fam = eval_fam(arg, stab, eflg, NULL); ++ NODE event = NULL; ++ if (*eflg) { ++ prog_var_error(node, stab, arg, NULL, nonfam1, "divorce"); ++ return NULL; ++ } ++ if (fam) ++ event = DIVO(fam); ++ return create_pvalue_from_node(event); ++} + /*==========================================+ + * llrpt_firstchild -- Find first child of family + * usage: firstchild(FAM) -> INDI + +--- a/src/interp/functab.c Tue Nov 12 21:29:43 2002 ++++ b/src/interp/functab.c Tue Nov 12 19:56:09 2002 +@@ -100,6 +100,7 @@ + {"detachnode", 1, 1, llrpt_detachnode}, + {"difference", 2, 2, llrpt_difference}, + {"div", 2, 2, llrpt_div}, ++ {"divorce", 1, 1, llrpt_divo}, + {"dms2deg", 4, 4, llrpt_dms2deg}, + {"dup", 1, 1, llrpt_dup}, + {"empty", 1, 1, llrpt_empty}, + +--- a/src/interp/interpi.h Tue Nov 12 21:29:44 2002 ++++ b/src/interp/interpi.h Tue Nov 12 20:00:27 2002 +@@ -294,6 +294,7 @@ + PVALUE llrpt_detachnode(PNODE, SYMTAB, BOOLEAN *); + PVALUE llrpt_difference(PNODE, SYMTAB, BOOLEAN *); + PVALUE llrpt_div(PNODE, SYMTAB, BOOLEAN *); ++PVALUE llrpt_divo(PNODE, SYMTAB, BOOLEAN *); + PVALUE llrpt_dms2deg(PNODE, SYMTAB, BOOLEAN *); + PVALUE llrpt_dup(PNODE, SYMTAB, BOOLEAN *); + PVALUE llrpt_empty(PNODE, SYMTAB, BOOLEAN *); + +--- a/src/hdrs/gedcom_macros.h Tue Nov 12 21:29:15 2002 ++++ b/src/hdrs/gedcom_macros.h Tue Nov 12 20:17:14 2002 +@@ -47,6 +47,7 @@ + #define HUSB(fam) find_tag(nchild(fam),"HUSB") + #define WIFE(fam) find_tag(nchild(fam),"WIFE") + #define MARR(fam) find_tag(nchild(fam),"MARR") ++#define DIVO(fam) find_tag(nchild(fam),"DIVO") + #define CHIL(fam) find_tag(nchild(fam),"CHIL") + + #define DATE(evnt) find_tag(nchild(evnt),"DATE") diff --git a/app-misc/lifelines/lifelines-3.0.62.ebuild b/app-misc/lifelines/lifelines-3.0.62.ebuild index 12f80f4..bd39272 100644 --- a/app-misc/lifelines/lifelines-3.0.62.ebuild +++ b/app-misc/lifelines/lifelines-3.0.62.ebuild @@ -16,6 +16,7 @@ RDEPEND="" IUSE="doc nls" src_configure() { + epatch "${FILESDIR}/${P}-divorce.patch" # So that "make install" does not try to install documentation in # /usr/share/doc/lifelines. sed -ie 's/SUBDIRS = build intl po win32 src docs reports tt/SUBDIRS = build intl po src reports tt/' Makefile.in || die