[127373] trunk/dports/textproc/bibledit

[devans at macports.org]

Revision: 127373
          https://trac.macports.org/changeset/127373
Author:   devans at macports.org
Date:     2014-10-26 07:13:35 -0700 (Sun, 26 Oct 2014)
Log Message:
-----------
bibledit: apply upstream patches to fix build on Mavericks, Yosemite, update desktop database post-activate, livecheck (#45607).

Modified Paths:
--------------
    trunk/dports/textproc/bibledit/Portfile

Added Paths:
-----------
    trunk/dports/textproc/bibledit/files/
    trunk/dports/textproc/bibledit/files/patch-src-keyterms.cpp.diff

Modified: trunk/dports/textproc/bibledit/Portfile
===================================================================
--- 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)
@@ -4,8 +4,9 @@
 PortSystem          1.0
 
 name                bibledit
+set gname           bibledit-gtk
 version             4.8
-revision            1
+revision            2
 categories          textproc
 license             GPL-3+
 maintainers         nomaintainer
@@ -29,7 +30,8 @@
 depends_build       port:pkgconfig \
                     bin:merge:rcs
 
-depends_lib         port:gtk2  \
+depends_lib         port:desktop-file-utils \
+                    port:gtk2  \
                     port:sqlite3 \
                     port:git \
                     port:enchant \
@@ -38,12 +40,22 @@
                     port:libsoup \
                     path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
 
-distname            ${name}-gtk-${version}
-worksrcdir          ${name}-gtk-${version}
+distname            ${gname}-${version}
+worksrcdir          ${gname}-${version}
 
+patchfiles          patch-src-keyterms.cpp.diff
+
 platform darwin {
     if {${configure.cxx_stdlib} eq "libstdc++"} {
        depends_lib-delete path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
        depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
     }
 }
+
+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}"

Added: trunk/dports/textproc/bibledit/files/patch-src-keyterms.cpp.diff
===================================================================
--- 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)
@@ -0,0 +1,69 @@
+From 4b44db4eea4f7ec4db3c1bc23a35c0a3b18110fe Mon Sep 17 00:00:00 2001
+From: Teus Benschop <teusjannette at 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 at 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 at 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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141026/4d3d7cd3/attachment.html>