summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorTeus Benschop <teusjannette@gmail.com>2018-10-28 11:54:56 +0100
committerTeus Benschop <teusjannette@gmail.com>2018-10-28 11:54:56 +0100
commit17ce4c65c5e3399785ae8c6e54c4f0099c2feb2b (patch)
tree3d458248bfddf9d44b34934863839f8a6706c599 /debian
parenta4eaec94e03d8683fade2313526a07ec3fdeb68e (diff)
remove already applied patches
Diffstat (limited to 'debian')
-rw-r--r--debian/patches/series1
-rw-r--r--debian/patches/sword-TEI-images.patch118
2 files changed, 0 insertions, 119 deletions
diff --git a/debian/patches/series b/debian/patches/series
index 84b01f8..91f13b0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-sword-TEI-images.patch
13_curl.diff
multiarch-clucene.patch
no-included-zconf.h.diff
diff --git a/debian/patches/sword-TEI-images.patch b/debian/patches/sword-TEI-images.patch
deleted file mode 100644
index b881847..0000000
--- a/debian/patches/sword-TEI-images.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-Description: Add Images and Tables support to TEI encoded modules (dictionaries)
-Author: Dominique Corbex <dominique@corbex.org>
-Origin: upstream, http://www.crosswire.org/pipermail/sword-devel/2015-November/042858.html
-Applied-Upstream: Fri, 18 Dec 2015, http://www.crosswire.org/pipermail/sword-devel/2015-December/042888.html
-Last-Update: 2017-04-08
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-
---- sword-1.7.5/src/modules/filters/teihtmlhref.cpp 2014-04-17 06:02:17.000000000 +0200
-+++ sword-1.7.5a2+dfsg/src/modules/filters/teihtmlhref.cpp 2015-11-28 16:10:41.485646005 +0100
-@@ -275,6 +275,52 @@
- u->suspendTextPassThru = false;
- }
- }
-+ // <graphic> image tag
-+ else if (!strcmp(tag.getName(), "graphic")) {
-+ const char *url = tag.getAttribute("url");
-+ if (url) { // assert we have a url attribute
-+ SWBuf filepath;
-+ if (userData->module) {
-+ filepath = userData->module->getConfigEntry("AbsoluteDataPath");
-+ if ((filepath.size()) && (filepath[filepath.size()-1] != '/') && (url[0] != '/'))
-+ filepath += '/';
-+ }
-+ filepath += url;
-+ // images become clickable, if the UI supports showImage.
-+ buf.appendFormatted("<a href=\"passagestudy.jsp?action=showImage&value=%s&module=%s\"><img src=\"file:%s\" border=\"0\" /></a>",
-+ URL::encode(filepath.c_str()).c_str(),
-+ URL::encode(u->version.c_str()).c_str(),
-+ filepath.c_str());
-+ u->suspendTextPassThru = true;
-+ }
-+ }
-+ // <table> <row> <cell>
-+ else if (!strcmp(tag.getName(), "table")) {
-+ if ((!tag.isEndTag()) && (!tag.isEmpty())) {
-+ buf += "<table><tbody>\n";
-+ }
-+ else if (tag.isEndTag()) {
-+ buf += "</tbody></table>\n";
-+ u->supressAdjacentWhitespace = true;
-+ }
-+
-+ }
-+ else if (!strcmp(tag.getName(), "row")) {
-+ if ((!tag.isEndTag()) && (!tag.isEmpty())) {
-+ buf += "\t<tr>";
-+ }
-+ else if (tag.isEndTag()) {
-+ buf += "</tr>\n";
-+ }
-+ }
-+ else if (!strcmp(tag.getName(), "cell")) {
-+ if ((!tag.isEndTag()) && (!tag.isEmpty())) {
-+ buf += "<td>";
-+ }
-+ else if (tag.isEndTag()) {
-+ buf += "</td>";
-+ }
-+ }
-
- else {
- return false; // we still didn't handle token
-diff -bru sword-1.7.5/src/modules/filters/teixhtml.cpp sword-1.7.5a2+dfsg/src/modules/filters/teixhtml.cpp
---- sword-1.7.5/src/modules/filters/teixhtml.cpp 2014-04-17 06:04:03.000000000 +0200
-+++ sword-1.7.5a2+dfsg/src/modules/filters/teixhtml.cpp 2015-11-28 16:46:46.638563403 +0100
-@@ -276,7 +276,50 @@
- u->suspendTextPassThru = false;
- }
- }
--
-+ // <graphic> image tag
-+ else if (!strcmp(tag.getName(), "graphic")) {
-+ const char *url = tag.getAttribute("url");
-+ if (url) { // assert we have a url attribute
-+ SWBuf filepath;
-+ if (userData->module) {
-+ filepath = userData->module->getConfigEntry("AbsoluteDataPath");
-+ if ((filepath.size()) && (filepath[filepath.size()-1] != '/') && (url[0] != '/'))
-+ filepath += '/';
-+ }
-+ filepath += url;
-+ buf.appendFormatted("<a href=\"passagestudy.jsp?action=showImage&value=%s&module=%s\"><img src=\"file:%s\" border=\"0\" /></a>",
-+ URL::encode(filepath.c_str()).c_str(),
-+ URL::encode(u->version.c_str()).c_str(),
-+ filepath.c_str());
-+ u->suspendTextPassThru = false;
-+ }
-+ }
-+ // <table> <row> <cell>
-+ else if (!strcmp(tag.getName(), "table")) {
-+ if ((!tag.isEndTag()) && (!tag.isEmpty())) {
-+ buf += "<table><tbody>\n";
-+ }
-+ else if (tag.isEndTag()) {
-+ buf += "</tbody></table>\n";
-+ u->supressAdjacentWhitespace = true;
-+ }
-+ }
-+ else if (!strcmp(tag.getName(), "row")) {
-+ if ((!tag.isEndTag()) && (!tag.isEmpty())) {
-+ buf += "\t<tr>";
-+ }
-+ else if (tag.isEndTag()) {
-+ buf += "</tr>\n";
-+ }
-+ }
-+ else if (!strcmp(tag.getName(), "cell")) {
-+ if ((!tag.isEndTag()) && (!tag.isEmpty())) {
-+ buf += "<td>";
-+ }
-+ else if (tag.isEndTag()) {
-+ buf += "</td>";
-+ }
-+ }
- else {
- return false; // we still didn't handle token
- }