Hello community, here is the log from the commit of package glyr for openSUSE:Factory checked in at 2016-05-23 16:39:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/glyr (Old) and /work/SRC/openSUSE:Factory/.glyr.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "glyr" Changes: -------- --- /work/SRC/openSUSE:Factory/glyr/glyr.changes 2015-02-16 22:12:18.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.glyr.new/glyr.changes 2016-05-23 16:39:53.000000000 +0200 @@ -1,0 +2,15 @@ +Fri May 20 09:27:43 UTC 2016 - [email protected] + +- Update to 1.0.9. + * Bugfixes: + + Support reproducible builds. + + Build problems. + + Spelling errors. + * Fixed providers: + + lyrics/lyricswikia. + + cover/slothradio. + + cover/discogs. +- Drop glyr-version.patch: fixed upstream. +- Don't package CHANGELOG. It is obsolete and discontinued. + +------------------------------------------------------------------- Old: ---- 1.0.8.tar.gz glyr-version.patch New: ---- 1.0.9.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ glyr.spec ++++++ --- /var/tmp/diff_new_pack.q7uSnc/_old 2016-05-23 16:39:54.000000000 +0200 +++ /var/tmp/diff_new_pack.q7uSnc/_new 2016-05-23 16:39:54.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package glyr # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %define major 1 Name: glyr -Version: 1.0.8 +Version: 1.0.9 Release: 0 Summary: Searcheninge for Musicrelated Metadata License: GPL-3.0+ @@ -33,9 +33,8 @@ Patch1: glyr-optflags.patch # PATCH-FIX-OPENSUSE glyr-pkgconfig.patch [email protected] -- do not inject bogus dependencies into other packages. Patch2: glyr-pkgconfig.patch -# PATCH-FIX-UPSTREAM glyr-version.patch [email protected] -- correct program version -Patch3: glyr-version.patch BuildRequires: cmake +BuildRequires: pkgconfig BuildRequires: pkgconfig(glib-2.0) >= 2.32 BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(sqlite3) @@ -141,7 +140,6 @@ %patch0 -p1 %patch1 -p1 %patch2 -%patch3 -p1 %build %cmake @@ -156,7 +154,7 @@ %files -n glyrc %defattr(-,root,root,-) -%doc AUTHORS CHANGELOG COPYING README.textile state_of_providers.txt +%doc AUTHORS COPYING README.textile state_of_providers.txt %{_bindir}/glyrc %files -n lib%{name}%{major} @@ -166,7 +164,7 @@ %files devel %defattr(-,root,root,-) -%doc AUTHORS CHANGELOG COPYING README.textile state_of_providers.txt +%doc AUTHORS COPYING README.textile state_of_providers.txt %doc src/examples %{_includedir}/%{name}/ %{_libdir}/*.so ++++++ 1.0.8.tar.gz -> 1.0.9.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glyr-1.0.8/CMakeLists.txt new/glyr-1.0.9/CMakeLists.txt --- old/glyr-1.0.8/CMakeLists.txt 2015-01-19 00:47:10.000000000 +0100 +++ new/glyr-1.0.9/CMakeLists.txt 2016-05-17 13:39:52.000000000 +0200 @@ -38,7 +38,7 @@ # ------------------------------------------------ SET(GLYR_VERSION_MAJOR "1") SET(GLYR_VERSION_MINOR "0") -SET(GLYR_VERSION_MICRO "6") +SET(GLYR_VERSION_MICRO "9") SET(GLYR_VERSION_NAME "Raving Raven") # ------------------------------------------------ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glyr-1.0.8/lib/CMakeLists.txt new/glyr-1.0.9/lib/CMakeLists.txt --- old/glyr-1.0.8/lib/CMakeLists.txt 2015-01-19 00:47:10.000000000 +0100 +++ new/glyr-1.0.9/lib/CMakeLists.txt 2016-05-17 13:39:52.000000000 +0200 @@ -6,6 +6,12 @@ SET(GENERIC_LIB_VERSION ${GLYR_VERSION_MAJOR}.${GLYR_VERSION_MINOR}) SET(GLYR_API_SOVERSION 1) +IF(DEFINED ENV{BUILD_DATE}) + ADD_DEFINITIONS(-DBUILD_DATE="$ENV{BUILD_DATE}") +ENDIF() +IF(DEFINED ENV{BUILD_TIME}) + ADD_DEFINITIONS(-DBUILD_TIME="$ENV{BUILD_TIME}") +ENDIF() # Link libglyr as shared library ADD_LIBRARY(glyr SHARED ${LIB_SOURCE_LOCATIONS}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glyr-1.0.8/lib/config.h new/glyr-1.0.9/lib/config.h --- old/glyr-1.0.8/lib/config.h 2015-01-19 00:47:10.000000000 +0100 +++ new/glyr-1.0.9/lib/config.h 2016-05-17 13:39:52.000000000 +0200 @@ -12,11 +12,11 @@ #define GLYR_VERSION_MAJOR "1" #define GLYR_VERSION_MINOR "0" -#define GLYR_VERSION_MICRO "6" +#define GLYR_VERSION_MICRO "8" #define GLYR_VERSION_MAJOR_INT 1 #define GLYR_VERSION_MINOR_INT 0 -#define GLYR_VERSION_MICRO_INT 6 +#define GLYR_VERSION_MICRO_INT 8 /** * GLYR_CHECK_VERSION: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glyr-1.0.8/lib/glyr.c new/glyr-1.0.9/lib/glyr.c --- old/glyr-1.0.8/lib/glyr.c 2015-01-19 00:47:10.000000000 +0100 +++ new/glyr-1.0.9/lib/glyr.c 2016-05-17 13:39:52.000000000 +0200 @@ -243,10 +243,17 @@ ///////////////////////////////// +#ifndef BUILD_DATE +#define BUILD_DATE __DATE__ +#endif +#ifndef BUILD_TIME +#define BUILD_TIME __TIME__ +#endif + __attribute__ ( (visibility ("default") ) ) const char * glyr_version (void) { - return "Version "GLYR_VERSION_MAJOR"."GLYR_VERSION_MINOR"."GLYR_VERSION_MICRO" ("GLYR_VERSION_NAME") of ["__DATE__"] compiled at ["__TIME__"]"; + return "Version "GLYR_VERSION_MAJOR"."GLYR_VERSION_MINOR"."GLYR_VERSION_MICRO" ("GLYR_VERSION_NAME") of ["BUILD_DATE"] compiled at ["BUILD_TIME"]"; } ///////////////////////////////// diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glyr-1.0.8/lib/intern/cover/discogs.c new/glyr-1.0.9/lib/intern/cover/discogs.c --- old/glyr-1.0.8/lib/intern/cover/discogs.c 2015-01-19 00:47:10.000000000 +0100 +++ new/glyr-1.0.9/lib/intern/cover/discogs.c 2016-05-17 13:39:52.000000000 +0200 @@ -21,7 +21,7 @@ #include "../../core.h" #include "../../stringlib.h" -#define API_ENTRY "http://api.discogs.com/database/search?type=release&q=${artist}"; +#define API_ENTRY "https://api.discogs.com/database/search?type=release&q=${artist}&token=gUtGiYqikFIMrDYStQNgewQbrCdRoTBOTXDNtRgB"; ///////////////////////////////// @@ -77,7 +77,6 @@ static GlyrMemCache * transform_url (cb_object * s, const char * url) { GlyrMemCache * rc = NULL; - size_t rc_size = strlen (url); char * rc_url = g_strdup (url); if (rc_url != NULL) @@ -90,12 +89,12 @@ { char * ep = strchr (sp + 1, '-'); if(ep != NULL) { - size_t rest_len = rc_size - (ep - rc_url) + 1; - memmove (sp,ep,rest_len); + // size_t rest_len = rc_size - (ep - rc_url) + 1; + // memmove (sp,ep,rest_len); rc = DL_init(); rc->data = (char*) rc_url; - rc->size = strlen (url); + rc->size = strlen (rc_url); rc->dsrc = g_strdup (s->url); } } @@ -134,7 +133,6 @@ char * thumb_url = get_search_value (node,THUMB_SUBDNOE,ENDOF_SUBNODE); if (thumb_url) { - GlyrMemCache * p = transform_url (capo,thumb_url); if (p != NULL) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glyr-1.0.8/lib/intern/cover/slothradio.c new/glyr-1.0.9/lib/intern/cover/slothradio.c --- old/glyr-1.0.8/lib/intern/cover/slothradio.c 2015-01-19 00:47:10.000000000 +0100 +++ new/glyr-1.0.9/lib/intern/cover/slothradio.c 2016-05-17 13:39:52.000000000 +0200 @@ -21,7 +21,7 @@ #include "../../stringlib.h" #include "../../core.h" -#define API_URL "http://www.slothradio.com/covers/?adv=1&artist=%s&album=%s&imgsize=%c&locale=%s&sort=salesrank"; +#define API_URL "http://www.slothradio.com/covers/?adv=1&artist=${artist}&album=${album}&imgsize=%c&locale=%s&sort=salesrank"; #define RESULT_LIST_START "<!-- RESULT LIST START -->" #define RESULT_ITEM_START "<!-- RESULT ITEM START -->" @@ -57,7 +57,7 @@ image_size = 'l'; } - return g_strdup_printf (API_URL,s->artist,s->album,image_size,locale); + return g_strdup_printf (API_URL, image_size, locale); } /////////////////////// diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glyr-1.0.8/lib/intern/lyrics/lyricswiki.c new/glyr-1.0.9/lib/intern/lyrics/lyricswiki.c --- old/glyr-1.0.8/lib/intern/lyrics/lyricswiki.c 2015-01-19 00:47:10.000000000 +0100 +++ new/glyr-1.0.9/lib/intern/lyrics/lyricswiki.c 2016-05-17 13:39:52.000000000 +0200 @@ -63,7 +63,7 @@ ///////////////////////////////// -#define LYR_NODE "<div class='lyricbox'>" +#define LYR_NODE "<div class='lyricbox" #define LYR_BEGIN ">" #define LYR_ENDIN "<!--" #define LYR_INSTRUMENTAL "/Category:Instrumental" @@ -73,17 +73,20 @@ { GList * result_list = NULL; gchar * node = to_parse->data; - while (continue_search (g_list_length (result_list),query) && (node = strstr (node,LYR_NODE) ) ) + while (continue_search (g_list_length (result_list),query) && (node = strstr (node,LYR_NODE))) { node += (sizeof LYR_NODE); char *script_tag = strstr(node, LYR_SCRIPT_TAG); - if(script_tag) { + char *end_tag = strstr(node, LYR_ENDIN); + + 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 * beautiness_test = beautify_string (lyr); + if (is_instrumental || (beautiness_test != NULL && beautiness_test[0])) { if (is_instrumental || (lyr != NULL && strstr (lyr,BAD_STRING) == NULL && strstr (lyr,EXTERNAL_LINKS) == NULL)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glyr-1.0.8/lib/stringlib.c new/glyr-1.0.9/lib/stringlib.c --- old/glyr-1.0.8/lib/stringlib.c 2015-01-19 00:47:10.000000000 +0100 +++ new/glyr-1.0.9/lib/stringlib.c 2016-05-17 13:39:52.000000000 +0200 @@ -927,8 +927,8 @@ for (gsize it = 0; it < str_len; it++) { - gboolean is_space = isspace (string[it]); - gboolean is_lfeed = !isblank (string[it]) && is_space; + gboolean is_space = isspace ((unsigned char)string[it]); + gboolean is_lfeed = !isblank ((unsigned char)string[it]) && is_space; lfeed_ctr = (is_lfeed) ? lfeed_ctr + 1 : 0; space_ctr = (is_space) ? space_ctr + 1 : 0; @@ -1011,7 +1011,7 @@ gchar c; /* skip spaces at start */ - while (input[0] && isspace (*input) ) + while (input[0] && isspace ((unsigned char)*input) ) { ++input; } @@ -1023,7 +1023,7 @@ c = * (output++) = * (input++); /* if its not a whitespace, this *could* be the last character */ - if ( !isspace (c) ) + if ( !isspace ((unsigned char)c) ) { end = output; } @@ -1050,14 +1050,14 @@ gchar * end = NULL; /* skip spaces at start */ - while (*start && isspace (*start) ) + while (*start && isspace ((unsigned char)*start) ) ++start; /* iterate over the rest remebering last non-whitespace */ char *i = start; while (*i) { - if ( !isspace (* (i++) ) ) + if ( !isspace ((unsigned char) * (i++) ) ) end = i; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glyr-1.0.8/src/glyrc/glyrc.c new/glyr-1.0.9/src/glyrc/glyrc.c --- old/glyr-1.0.8/src/glyrc/glyrc.c 2015-01-19 00:47:10.000000000 +0100 +++ new/glyr-1.0.9/src/glyrc/glyrc.c 2016-05-17 13:39:52.000000000 +0200 @@ -287,7 +287,7 @@ IN"-k --proxy String: Set the proxy to use in the form of [protocol://][user:pass@]yourproxy.domain[:port]\n" "\nPROVIDER SPECIFIC OPTIONS\n" IN"-d --download Download Images.\n" - IN"-D --skip-download Don't download images, but return the URLs to them (act like a search engine)\n" + IN"-D --no-download Don't download images, but return the URLs to them (act like a search engine)\n" IN"-a --artist String: Artist name to search for\n" IN"-b --album String: Album name to search for\n" IN"-t --title String: Songname to search for\n" ++++++ glyr-date-n-time.patch ++++++ --- /var/tmp/diff_new_pack.q7uSnc/_old 2016-05-23 16:39:54.000000000 +0200 +++ /var/tmp/diff_new_pack.q7uSnc/_new 2016-05-23 16:39:54.000000000 +0200 @@ -1,14 +1,12 @@ -Description: Remove __DATE and __TIME__ that causes the package to rebuild when not needed. -Author: Kyrill Detinov <[email protected]> -Index: glyr-1.0.7/lib/glyr.c +Index: glyr-1.0.9/lib/glyr.c =================================================================== ---- glyr-1.0.7.orig/lib/glyr.c -+++ glyr-1.0.7/lib/glyr.c -@@ -246,7 +246,7 @@ GlyrMemCache * glyr_cache_copy (GlyrMemC +--- glyr-1.0.9.orig/lib/glyr.c ++++ glyr-1.0.9/lib/glyr.c +@@ -253,7 +253,7 @@ GlyrMemCache * glyr_cache_copy (GlyrMemC __attribute__ ( (visibility ("default") ) ) const char * glyr_version (void) { -- return "Version "GLYR_VERSION_MAJOR"."GLYR_VERSION_MINOR"."GLYR_VERSION_MICRO" ("GLYR_VERSION_NAME") of ["__DATE__"] compiled at ["__TIME__"]"; +- return "Version "GLYR_VERSION_MAJOR"."GLYR_VERSION_MINOR"."GLYR_VERSION_MICRO" ("GLYR_VERSION_NAME") of ["BUILD_DATE"] compiled at ["BUILD_TIME"]"; + return "Version "GLYR_VERSION_MAJOR"."GLYR_VERSION_MINOR"."GLYR_VERSION_MICRO" ("GLYR_VERSION_NAME") compiled for openSUSE"; }
