Hello community,
here is the log from the commit of package glyr for openSUSE:Factory checked in
at 2014-01-03 19:43:33
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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 2013-12-09
16:54:23.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.glyr.new/glyr.changes 2014-01-03
19:43:34.000000000 +0100
@@ -1,0 +2,13 @@
+Sun Dec 29 09:56:35 UTC 2013 - lazy.k...@opensuse.org
+
+- Add glyr-image_discogs.patch: cover|photo:discogs: fix crash when
+ transformed url has only one dash (gh#sahib/glyr#41) (fixed in
+ git).
+
+-------------------------------------------------------------------
+Thu Dec 26 21:13:27 UTC 2013 - crrodrig...@opensuse.org
+
+- CmakeLists.txt, -std=gnu99 is meant instead of -std=c99
+ (extends glyr-optflags.patch)
+
+-------------------------------------------------------------------
New:
----
glyr-image_discogs.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ glyr.spec ++++++
--- /var/tmp/diff_new_pack.YrC0fa/_old 2014-01-03 19:43:35.000000000 +0100
+++ /var/tmp/diff_new_pack.YrC0fa/_new 2014-01-03 19:43:35.000000000 +0100
@@ -33,6 +33,8 @@
Patch1: glyr-optflags.patch
# PATCH-FIX-OPENSUSE glyr-pkgconfig.patch crrodrig...@opensuse.org -- do not
inject bogus dependencies into other packages.
Patch2: glyr-pkgconfig.patch
+# PATCH-FIX-UPSTREAM glyr-image_discogs.patch gh#sahib/glyr#41 sa...@online.de
-- cover|photo:discogs: fix crash when transformed url has only one dash
+Patch3: glyr-image_discogs.patch
BuildRequires: cmake
BuildRequires: pkgconfig(glib-2.0) >= 2.32
BuildRequires: pkgconfig(libcurl)
@@ -137,6 +139,7 @@
%patch0
%patch1 -p1
%patch2
+%patch3 -p1
%build
mkdir build
++++++ glyr-image_discogs.patch ++++++
Index: glyr-1.0.2/lib/intern/cover/discogs.c
===================================================================
--- glyr-1.0.2.orig/lib/intern/cover/discogs.c
+++ glyr-1.0.2/lib/intern/cover/discogs.c
@@ -89,13 +89,15 @@ static GlyrMemCache * transform_url (cb_
if (sp != NULL)
{
char * ep = strchr (sp + 1, '-');
- size_t rest_len = rc_size - (ep - rc_url) + 1;
- memmove (sp,ep,rest_len);
+ if(ep != NULL) {
+ 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->dsrc = g_strdup (s->url);
+ rc = DL_init();
+ rc->data = (char*) rc_url;
+ rc->size = strlen (url);
+ rc->dsrc = g_strdup (s->url);
+ }
}
}
}
Index: glyr-1.0.2/lib/intern/photos/discogs.c
===================================================================
--- glyr-1.0.2.orig/lib/intern/photos/discogs.c
+++ glyr-1.0.2/lib/intern/photos/discogs.c
@@ -80,13 +80,15 @@ static GlyrMemCache * transform_url (cb_
if (sp != NULL)
{
char * ep = strchr (sp + 1, '-');
- size_t rest_len = rc_size - (ep - rc_url) + 1;
- memmove (sp,ep,rest_len);
+ if(ep != NULL) {
+ 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->dsrc = g_strdup (s->url);
+ rc = DL_init();
+ rc->data = (char*) rc_url;
+ rc->size = strlen (url);
+ rc->dsrc = g_strdup (s->url);
+ }
}
}
}
++++++ glyr-optflags.patch ++++++
--- /var/tmp/diff_new_pack.YrC0fa/_old 2014-01-03 19:43:35.000000000 +0100
+++ /var/tmp/diff_new_pack.YrC0fa/_new 2014-01-03 19:43:35.000000000 +0100
@@ -1,8 +1,12 @@
-Index: glyr-1.0.2/CMakeLists.txt
-===================================================================
--- glyr-1.0.2.orig/CMakeLists.txt
+++ glyr-1.0.2/CMakeLists.txt
-@@ -62,8 +62,8 @@ IF(CMAKE_COMPILER_IS_GNUCC)
+@@ -57,13 +57,13 @@ ENDIF()
+ MESSAGE("-- Building Target: ${CMAKE_BUILD_TYPE}")
+
+ IF(CMAKE_COMPILER_IS_GNUCC)
+- SET(GCC_ONLY_FLAGS "-std=c99")
++ SET(GCC_ONLY_FLAGS "-std=gnu99")
+ SET(GCC_ONLY_OPT "-s")
ENDIF()
SET(COMMON_FLAGS "${GCC_ONLY_FLAGS} -Wall -Wextra -Wstrict-prototypes -W
-Wno-unused-parameter -Wno-strict-prototypes -fvisibility=hidden")
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
