summaryrefslogtreecommitdiff
path: root/Build/source/utils/songs/songs-2.17-PATCHES
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/utils/songs/songs-2.17-PATCHES')
-rw-r--r--Build/source/utils/songs/songs-2.17-PATCHES/ChangeLog7
-rw-r--r--Build/source/utils/songs/songs-2.17-PATCHES/TL-Changes17
-rw-r--r--Build/source/utils/songs/songs-2.17-PATCHES/patch-01-protos41
-rw-r--r--Build/source/utils/songs/songs-2.17-PATCHES/patch-02-const91
4 files changed, 0 insertions, 156 deletions
diff --git a/Build/source/utils/songs/songs-2.17-PATCHES/ChangeLog b/Build/source/utils/songs/songs-2.17-PATCHES/ChangeLog
deleted file mode 100644
index d7d50c2c8bb..00000000000
--- a/Build/source/utils/songs/songs-2.17-PATCHES/ChangeLog
+++ /dev/null
@@ -1,7 +0,0 @@
-2013-12-20 Peter Breitenlohner <peb@mppmu.mpg.de>
-
- Import songs-2.17, patches in songs-2.17-PATCHES.
-
- * patch-01-protos: Prototypes only in headers.
- * patch-02-const: Proper handling of const.
-
diff --git a/Build/source/utils/songs/songs-2.17-PATCHES/TL-Changes b/Build/source/utils/songs/songs-2.17-PATCHES/TL-Changes
deleted file mode 100644
index 2a11360a275..00000000000
--- a/Build/source/utils/songs/songs-2.17-PATCHES/TL-Changes
+++ /dev/null
@@ -1,17 +0,0 @@
-Changes applied to the songs-2.17 tree as obtained from:
- http://songs.sourceforge.net/
-
-Remove:
- Makefile.in
- aclocal.m4
- compile
- configure
- depcomp
- install-sh
- missing
- sample/
- src/sbdchk/
- src/songidx/Makefile.in
- src/songs/
- src/vim/
-
diff --git a/Build/source/utils/songs/songs-2.17-PATCHES/patch-01-protos b/Build/source/utils/songs/songs-2.17-PATCHES/patch-01-protos
deleted file mode 100644
index 6ff7af9397f..00000000000
--- a/Build/source/utils/songs/songs-2.17-PATCHES/patch-01-protos
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -ur songs-2.17.orig/src/songidx/songidx.c songs-2.17/src/songidx/songidx.c
---- songs-2.17.orig/src/songidx/songidx.c 2013-01-02 21:06:06.000000000 +0100
-+++ songs-2.17/src/songidx/songidx.c 2013-12-19 14:45:31.000000000 +0100
-@@ -64,11 +64,6 @@
- #endif
- #endif
-
--extern int gentitleindex(FSTATE *fs, const char *outname);
--extern int genscriptureindex(FSTATE *fs, const char *outname,
-- const char *biblename);
--extern int genauthorindex(FSTATE *fs, const char *outname);
--
- #define BIBLEDEFAULT "bible.can"
-
- #if HAVE_STRRCHR
-diff -ur songs-2.17.orig/src/songidx/songidx.h songs-2.17/src/songidx/songidx.h
---- songs-2.17.orig/src/songidx/songidx.h 2013-01-02 21:06:12.000000000 +0100
-+++ songs-2.17/src/songidx/songidx.h 2013-12-19 14:48:20.000000000 +0100
-@@ -29,6 +29,7 @@
- #endif
-
- #include "chars.h"
-+#include "fileio.h"
-
- /* A SONGENTRY struct consists of three fields:
- * title: a string representing the title of the song
-@@ -50,4 +51,14 @@
- extern void skipesc(const WCHAR **p, int stop_on_space, int skipover_groups);
- extern int songcmp(const void *s1, const void *s2);
-
-+/* The following function is in titleidx.c */
-+extern int gentitleindex(FSTATE *fs, const char *outname);
-+
-+/* The following function is in scripidx.c */
-+extern int genscriptureindex(FSTATE *fs, const char *outname,
-+ const char *biblename);
-+
-+/* The following function is in authidx.c */
-+extern int genauthorindex(FSTATE *fs, const char *outname);
-+
- #endif
diff --git a/Build/source/utils/songs/songs-2.17-PATCHES/patch-02-const b/Build/source/utils/songs/songs-2.17-PATCHES/patch-02-const
deleted file mode 100644
index 632dcf2f7c4..00000000000
--- a/Build/source/utils/songs/songs-2.17-PATCHES/patch-02-const
+++ /dev/null
@@ -1,91 +0,0 @@
-diff -ur songs-2.17.orig/src/songidx/authidx.c songs-2.17/src/songidx/authidx.c
---- songs-2.17.orig/src/songidx/authidx.c 2013-01-02 21:05:12.000000000 +0100
-+++ songs-2.17/src/songidx/authidx.c 2013-12-20 13:18:55.000000000 +0100
-@@ -55,9 +55,12 @@
- }
- WORDLIST;
-
--WORDLIST wl_and = { NULL, ws_lit("and") };
--WORDLIST wl_by = { NULL, ws_lit("by") };
--WORDLIST wl_unknown = { NULL, ws_lit("unknown") };
-+WCHAR ws_and[] = ws_lit("and");
-+WCHAR ws_by[] = ws_lit("by");
-+WCHAR ws_unknown[] = ws_lit("unknown");
-+WORDLIST wl_and = { NULL, ws_and };
-+WORDLIST wl_by = { NULL, ws_by };
-+WORDLIST wl_unknown = { NULL, ws_unknown };
-
- /* wl_insert(<wordlist>,<word>)
- * Insert a word onto the head of a wordlist. */
-@@ -333,10 +336,10 @@
- int arraysize, numauthors, i;
- WORDLIST *seplist=&wl_and, *afterlist=&wl_by, *ignorelist=&wl_unknown;
- SONGENTRY **authors;
-- WCHAR authorbuf[MAXLINELEN], *bp;
-+ WCHAR authorbuf[MAXLINELEN];
- WCHAR songnumbuf[MAXLINELEN], linknamebuf[MAXLINELEN];
- WCHAR *thisnum, *thislink;
-- const WCHAR *auth;
-+ const WCHAR *auth, *bp;
-
- fprintf(stderr, "songidx: Parsing author index data file %s...\n",
- fs->filename);
-@@ -395,7 +398,7 @@
- ws_strcpy(thislink, linknamebuf);
-
- for (bp=authorbuf;
-- (auth=grabauthor((const WCHAR **) &bp, seplist, afterlist,
-+ (auth=grabauthor(&bp, seplist, afterlist,
- ignorelist)) != NULL;
- ++numauthors)
- {
-diff -ur songs-2.17.orig/src/songidx/songsort.c songs-2.17/src/songidx/songsort.c
---- songs-2.17.orig/src/songidx/songsort.c 2013-04-24 07:19:20.000000000 +0200
-+++ songs-2.17/src/songidx/songsort.c 2013-12-19 15:10:08.000000000 +0100
-@@ -96,8 +96,8 @@
- {
- static WCHAR buf1[MAXLINELEN+1], *bp1;
- static WCHAR buf2[MAXLINELEN+1], *bp2;
-- const WCHAR *t1 = (*((const SONGENTRY **) s1))->title;
-- const WCHAR *t2 = (*((const SONGENTRY **) s2))->title;
-+ const WCHAR *t1 = (*((SONGENTRY * const *) s1))->title;
-+ const WCHAR *t2 = (*((SONGENTRY * const *) s2))->title;
- int diff;
-
- for (;;)
-@@ -151,14 +151,14 @@
-
- /* If each corresponding word/number is identical, then sort alternate-
- * form entries (e.g., lyrics) after normal entries (e.g., titles). */
-- if (((*((const SONGENTRY **) s1))->title[0] == wc_asterisk)
-- && ((*((const SONGENTRY **) s2))->title[0] != wc_asterisk))
-+ if (((*((SONGENTRY * const *) s1))->title[0] == wc_asterisk)
-+ && ((*((SONGENTRY * const *) s2))->title[0] != wc_asterisk))
- return 1;
-- if (((*((const SONGENTRY **) s1))->title[0] != wc_asterisk)
-- && ((*((const SONGENTRY **) s2))->title[0] == wc_asterisk))
-+ if (((*((SONGENTRY * const *) s1))->title[0] != wc_asterisk)
-+ && ((*((SONGENTRY * const *) s2))->title[0] == wc_asterisk))
- return -1;
-
- /* If everything is the same, sort by the right-hand sides of the index
- * entries (e.g., the song or page numbers). */
-- return (*((const SONGENTRY **) s1))->idx - (*((const SONGENTRY **) s2))->idx;
-+ return (*((SONGENTRY * const *) s1))->idx - (*((SONGENTRY * const *) s2))->idx;
- }
-diff -ur songs-2.17.orig/src/songidx/titleidx.c songs-2.17/src/songidx/titleidx.c
---- songs-2.17.orig/src/songidx/titleidx.c 2013-01-02 21:06:28.000000000 +0100
-+++ songs-2.17/src/songidx/titleidx.c 2013-12-20 13:22:35.000000000 +0100
-@@ -49,8 +49,10 @@
- }
- PREFIX;
-
--PREFIX pre_A = { NULL, ws_lit("A") };
--PREFIX pre_defaults = { &pre_A, ws_lit("The") };
-+WCHAR ws_A[] = ws_lit("A");
-+WCHAR ws_The[] = ws_lit("The");
-+PREFIX pre_A = { NULL, ws_A };
-+PREFIX pre_defaults = { &pre_A, ws_The };
-
- /* freeprefixes(<list>)
- * Free prefix list <list>. */