diff options
| author | leot <leot> | 2016-11-07 15:12:33 +0000 |
|---|---|---|
| committer | leot <leot> | 2016-11-07 15:12:33 +0000 |
| commit | e03bef8c50ddecfbcb22768f986a9d9f7c1b8d01 (patch) | |
| tree | 02a2086e5fc601675393c63629355ee65ac3dd34 /audio/glyr | |
| parent | 9a9edd067a88981b9db8d17b42f6225b3b3a01d4 (diff) | |
| download | pkgsrc-e03bef8c50ddecfbcb22768f986a9d9f7c1b8d01.tar.gz | |
Add a patch to fix lyricswiki provider (via upstream from pullup request #80)
Bump PKGREVISION
Diffstat (limited to 'audio/glyr')
| -rw-r--r-- | audio/glyr/Makefile | 4 | ||||
| -rw-r--r-- | audio/glyr/distinfo | 3 | ||||
| -rw-r--r-- | audio/glyr/patches/patch-lib_intern_lyrics_lyricswiki.c | 40 |
3 files changed, 44 insertions, 3 deletions
diff --git a/audio/glyr/Makefile b/audio/glyr/Makefile index 8ab9d34e296..26fb4f49aa6 100644 --- a/audio/glyr/Makefile +++ b/audio/glyr/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.12 2016/10/07 18:25:37 adam Exp $ +# $NetBSD: Makefile,v 1.13 2016/11/07 15:12:33 leot Exp $ # DISTNAME= glyr-1.0.9 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_GITHUB:=sahib/} diff --git a/audio/glyr/distinfo b/audio/glyr/distinfo index 520e60277e1..c3a829549a0 100644 --- a/audio/glyr/distinfo +++ b/audio/glyr/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.7 2016/05/17 13:47:17 leot Exp $ +$NetBSD: distinfo,v 1.8 2016/11/07 15:12:33 leot Exp $ SHA1 (glyr-1.0.9.tar.gz) = 28c6f5ffaaa568149762400cf0c8ebaf134cb3c0 RMD160 (glyr-1.0.9.tar.gz) = b244631677a44d3fdb444bffac3c32d475413347 SHA512 (glyr-1.0.9.tar.gz) = 77144202c99c6e429c8800a7d89d27de5376627194945116b7166d920375a59048d3e3102cf63646b1b57d795999f057977d7b13490e4ca3af44b8ddb3207652 Size (glyr-1.0.9.tar.gz) = 425175 bytes +SHA1 (patch-lib_intern_lyrics_lyricswiki.c) = b4eb47fbb9ef10e84561d87e0d230f4ef81e5bc0 diff --git a/audio/glyr/patches/patch-lib_intern_lyrics_lyricswiki.c b/audio/glyr/patches/patch-lib_intern_lyrics_lyricswiki.c new file mode 100644 index 00000000000..922d1805eba --- /dev/null +++ b/audio/glyr/patches/patch-lib_intern_lyrics_lyricswiki.c @@ -0,0 +1,40 @@ +$NetBSD: patch-lib_intern_lyrics_lyricswiki.c,v 1.1 2016/11/07 15:12:33 leot Exp $ + +Fix lyricswiki provider (from upstream and pull request #80). + +--- lib/intern/lyrics/lyricswiki.c.orig 2016-05-17 11:39:52.000000000 +0000 ++++ lib/intern/lyrics/lyricswiki.c +@@ -66,6 +66,8 @@ static gboolean lv_cmp_content (const gc + #define LYR_NODE "<div class='lyricbox" + #define LYR_BEGIN ">" + #define LYR_ENDIN "<!--" ++#define LYR_FOOTER "<div id=\"songfooter" ++#define LYR_CREDITS "<table" + #define LYR_INSTRUMENTAL "/Category:Instrumental" + #define LYR_SCRIPT_TAG "</script" + +@@ -78,13 +80,23 @@ GList * parse_result_page (GlyrQuery * q + node += (sizeof LYR_NODE); + char *script_tag = strstr(node, LYR_SCRIPT_TAG); + char *end_tag = strstr(node, LYR_ENDIN); ++ char *footer_tag = strstr(node, LYR_FOOTER); ++ char *credits_tag = strstr(node, LYR_CREDITS); ++ char *ending_tag = LYR_ENDIN; ++ ++ if (footer_tag && footer_tag < end_tag) { ++ ending_tag = LYR_FOOTER; ++ } ++ if (credits_tag && credits_tag < end_tag) { ++ ending_tag = LYR_CREDITS; ++ } + + if(script_tag && script_tag < end_tag) { + node = script_tag + sizeof(LYR_SCRIPT_TAG) - 1; + } + + bool is_instrumental = strstr(node, LYR_INSTRUMENTAL) != NULL; +- gchar * lyr = get_search_value (node,LYR_BEGIN,LYR_ENDIN); ++ gchar * lyr = get_search_value (node,LYR_BEGIN,ending_tag); + gchar * beautiness_test = beautify_string (lyr); + + if (is_instrumental || (beautiness_test != NULL && beautiness_test[0])) |