<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[127373] trunk/dports/textproc/bibledit</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/127373">127373</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2014-10-26 07:13:35 -0700 (Sun, 26 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>bibledit: apply upstream patches to fix build on Mavericks, Yosemite, update desktop database post-activate, livecheck (#45607).</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportstextprocbibleditPortfile">trunk/dports/textproc/bibledit/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/dports/textproc/bibledit/files/</li>
<li><a href="#trunkdportstextprocbibleditfilespatchsrckeytermscppdiff">trunk/dports/textproc/bibledit/files/patch-src-keyterms.cpp.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportstextprocbibleditPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/textproc/bibledit/Portfile (127372 => 127373)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/textproc/bibledit/Portfile 2014-10-26 13:39:04 UTC (rev 127372)
+++ trunk/dports/textproc/bibledit/Portfile 2014-10-26 14:13:35 UTC (rev 127373)
</span><span class="lines">@@ -4,8 +4,9 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name bibledit
</span><ins>+set gname bibledit-gtk
</ins><span class="cx"> version 4.8
</span><del>-revision 1
</del><ins>+revision 2
</ins><span class="cx"> categories textproc
</span><span class="cx"> license GPL-3+
</span><span class="cx"> maintainers nomaintainer
</span><span class="lines">@@ -29,7 +30,8 @@
</span><span class="cx"> depends_build port:pkgconfig \
</span><span class="cx"> bin:merge:rcs
</span><span class="cx">
</span><del>-depends_lib port:gtk2 \
</del><ins>+depends_lib port:desktop-file-utils \
+ port:gtk2 \
</ins><span class="cx"> port:sqlite3 \
</span><span class="cx"> port:git \
</span><span class="cx"> port:enchant \
</span><span class="lines">@@ -38,12 +40,22 @@
</span><span class="cx"> port:libsoup \
</span><span class="cx"> path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
</span><span class="cx">
</span><del>-distname ${name}-gtk-${version}
-worksrcdir ${name}-gtk-${version}
</del><ins>+distname ${gname}-${version}
+worksrcdir ${gname}-${version}
</ins><span class="cx">
</span><ins>+patchfiles patch-src-keyterms.cpp.diff
+
</ins><span class="cx"> platform darwin {
</span><span class="cx"> if {${configure.cxx_stdlib} eq "libstdc++"} {
</span><span class="cx"> depends_lib-delete path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
</span><span class="cx"> depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
+post-activate {
+ system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
+}
+
+livecheck.type regex
+livecheck.url [lindex ${master_sites} 0]
+livecheck.regex "${gname}-(\\d+(?:\\.\\d+)*)${extract.suffix}"
</ins></span></pre></div>
<a id="trunkdportstextprocbibleditfilespatchsrckeytermscppdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/textproc/bibledit/files/patch-src-keyterms.cpp.diff (0 => 127373)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/textproc/bibledit/files/patch-src-keyterms.cpp.diff (rev 0)
+++ trunk/dports/textproc/bibledit/files/patch-src-keyterms.cpp.diff 2014-10-26 14:13:35 UTC (rev 127373)
</span><span class="lines">@@ -0,0 +1,69 @@
</span><ins>+From 4b44db4eea4f7ec4db3c1bc23a35c0a3b18110fe Mon Sep 17 00:00:00 2001
+From: Teus Benschop <teusjannette@gmail.com>
+Date: Fri, 28 Feb 2014 06:48:31 +0000
+Subject: Fixed: keyterms.cpp:753:57: note: put the semicolon on a separate line to silence this warning
+
+---
+diff --git a/gtk/src/keyterms.cpp b/gtk/src/keyterms.cpp
+index 997af74..0b3c84e 100644
+--- src/keyterms.cpp
++++ src/keyterms.cpp
+@@ -750,8 +750,7 @@ void keyterms_import_ktbh_txt(const ustring& textfile, ustring category)
+ catch(exception & ex) {
+ ustring msg = "Skipping: ";
+ msg.append(ex.what());
+- if (write(1, msg.c_str(), strlen(msg.c_str()))) ;
+- cout << endl;
++ cout << msg << endl;
+ }
+
+ }
+--
+cgit v0.9.0.2
+From 87b405bd3d305a48c64dfea5d28dca3d7b9e4afb Mon Sep 17 00:00:00 2001
+From: Teus Benschop <teusjannette@gmail.com>
+Date: Fri, 28 Feb 2014 08:14:15 +0000
+Subject: trying to fix: keyterms.cpp:1073:207: error: cannot pass non-POD object of type...
+
+---
+diff --git a/gtk/src/keyterms.cpp b/gtk/src/keyterms.cpp
+index 0b3c84e..fa6fa9c 100644
+--- src/keyterms.cpp
++++ src/keyterms.cpp
+@@ -1070,7 +1070,10 @@ void keyterms_store_renderings(const ustring & project, const ustring & keyterm,
+ rc = sqlite3_exec(db, sql, NULL, NULL, &error);
+ g_free(sql);
+ for (unsigned int i = 0; i < renderings.size(); i++) {
+- sql = g_strdup_printf("insert into renderings values ('%s', '%s', '%s', %d, %d);", double_apostrophy(keyterm).c_str(), double_apostrophy(collection).c_str(), double_apostrophy(renderings[i]).c_str(), wholewords[i], casesensitives[i]);
++ ustring s1 = double_apostrophy(keyterm);
++ ustring s2 = double_apostrophy(collection);
++ ustring s3 = double_apostrophy(renderings[i]);
++ sql = g_strdup_printf("insert into renderings values ('%s', '%s', '%s', %d, %d);", s1.c_str(), s2.c_str(), s3.c_str(), wholewords[i], casesensitives[i]);
+ rc = sqlite3_exec(db, sql, NULL, NULL, &error);
+ g_free(sql);
+ if (rc)
+--
+cgit v0.9.0.2
+From cbb0c28a08707094cefedd754b07406d2e349eb2 Mon Sep 17 00:00:00 2001
+From: Teus Benschop <teusjannette@gmail.com>
+Date: Fri, 28 Feb 2014 17:10:24 +0000
+Subject: fixed: keyterms.cpp:1076:126: error: cannot pass non-POD object of type
+
+---
+diff --git a/gtk/src/keyterms.cpp b/gtk/src/keyterms.cpp
+index fa6fa9c..9d85135 100644
+--- src/keyterms.cpp
++++ src/keyterms.cpp
+@@ -1073,7 +1073,9 @@ void keyterms_store_renderings(const ustring & project, const ustring & keyterm,
+ ustring s1 = double_apostrophy(keyterm);
+ ustring s2 = double_apostrophy(collection);
+ ustring s3 = double_apostrophy(renderings[i]);
+- sql = g_strdup_printf("insert into renderings values ('%s', '%s', '%s', %d, %d);", s1.c_str(), s2.c_str(), s3.c_str(), wholewords[i], casesensitives[i]);
++ int i1 = wholewords[i];
++ int i2 = casesensitives[i];
++ sql = g_strdup_printf("insert into renderings values ('%s', '%s', '%s', %d, %d);", s1.c_str(), s2.c_str(), s3.c_str(), i1, i2);
+ rc = sqlite3_exec(db, sql, NULL, NULL, &error);
+ g_free(sql);
+ if (rc)
+--
+cgit v0.9.0.2
</ins></span></pre>
</div>
</div>
</body>
</html>