From f55ef78b5cede8b04463db781ea2d04eaaba3e7c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 20 Feb 2018 14:33:22 +0100 Subject: gnu: gtk+@2: Update to 2.24.32. * gnu/packages/patches/gtk2-fix-failing-test.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. * gnu/packages/gtk.scm (gtk+-2): Update to 2.24.32. [source]: Remove 'gtk2-fix-failing-test.patch'. --- gnu/local.mk | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu/local.mk') diff --git a/gnu/local.mk b/gnu/local.mk index 2bb9e6d15c..b2f34a42d5 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -730,7 +730,6 @@ dist_patch_DATA = \ %D%/packages/patches/gtk2-respect-GUIX_GTK2_PATH.patch \ %D%/packages/patches/gtk2-respect-GUIX_GTK2_IM_MODULE_FILE.patch \ %D%/packages/patches/gtk2-theme-paths.patch \ - %D%/packages/patches/gtk2-fix-failing-test.patch \ %D%/packages/patches/gtk3-respect-GUIX_GTK3_PATH.patch \ %D%/packages/patches/gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch \ %D%/packages/patches/gtkglext-disable-disable-deprecated.patch \ -- cgit v1.2.3 From 5697897537b410f6e16aef80028928c05b437398 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 25 Feb 2018 04:28:21 +0100 Subject: gnu: json-glib: Fix 32-bit test failures. * gnu/packages/patches/json-glib-fix-tests-32bit.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/gnome.scm (json-glib)[source](patches): New field. --- gnu/local.mk | 1 + gnu/packages/gnome.scm | 1 + .../patches/json-glib-fix-tests-32bit.patch | 174 +++++++++++++++++++++ 3 files changed, 176 insertions(+) create mode 100644 gnu/packages/patches/json-glib-fix-tests-32bit.patch (limited to 'gnu/local.mk') diff --git a/gnu/local.mk b/gnu/local.mk index 49aea157a1..8151f7c9b0 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -788,6 +788,7 @@ dist_patch_DATA = \ %D%/packages/patches/java-xerces-xjavac_taskdef.patch \ %D%/packages/patches/jemalloc-arm-address-bits.patch \ %D%/packages/patches/jbig2dec-ignore-testtest.patch \ + %D%/packages/patches/json-glib-fix-tests-32bit.patch \ %D%/packages/patches/jq-CVE-2015-8863.patch \ %D%/packages/patches/kdbusaddons-kinit-file-name.patch \ %D%/packages/patches/khmer-use-libraries.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index c45c821a91..c4fb3398f4 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2271,6 +2271,7 @@ configuration storage systems.") (uri (string-append "mirror://gnome/sources/" name "/" (version-major+minor version) "/" name "-" version ".tar.xz")) + (patches (search-patches "json-glib-fix-tests-32bit.patch")) (sha256 (base32 "1j3dd2xj1l9fi12m1gpmfgf5p4c1w0i970m6k62k3is98yj0jxrd")))) diff --git a/gnu/packages/patches/json-glib-fix-tests-32bit.patch b/gnu/packages/patches/json-glib-fix-tests-32bit.patch new file mode 100644 index 0000000000..77ea134915 --- /dev/null +++ b/gnu/packages/patches/json-glib-fix-tests-32bit.patch @@ -0,0 +1,174 @@ +Fix floating point issues on 32-bit platforms: + +https://gitlab.gnome.org/GNOME/json-glib/issues/27 + +This is an amalgamation of the following upstream commits: +https://gitlab.gnome.org/GNOME/json-glib/commit/70e2648e02232c1a439a7418388f18fee9afb3fe +https://gitlab.gnome.org/GNOME/json-glib/commit/675e27505776a1d77fa1ffd1974284890caec1f4 + +diff --git a/json-glib/tests/json-test-utils.h b/json-glib/tests/json-test-utils.h +new file mode 100644 +index 0000000..83a02c6 +--- /dev/null ++++ b/json-glib/tests/json-test-utils.h +@@ -0,0 +1,21 @@ ++#include ++#include ++#include ++#include ++#include ++ ++#define json_fuzzy_equals(n1,n2,epsilon) \ ++ (((n1) > (n2) ? ((n1) - (n2)) : ((n2) - (n1))) < (epsilon)) ++ ++#define json_assert_fuzzy_equals(n1,n2,epsilon) \ ++ G_STMT_START { \ ++ double __n1 = (n1), __n2 = (n2), __epsilon = (epsilon); \ ++ if (json_fuzzy_equals (__n1, __n2, __epsilon)) ; else { \ ++ g_assertion_message_cmpnum (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, \ ++ #n1 " == " #n2 " (+/- " #epsilon ")", \ ++ __n1, "==", __n2, 'f'); \ ++ } \ ++ } G_STMT_END ++ ++#define json_assert_almost_equals(n1,n2) \ ++ json_assert_fuzzy_equals (n1, n2, DBL_EPSILON) +diff --git a/json-glib/tests/array.c b/json-glib/tests/array.c +index 98afeab..426cd72 100644 +--- a/json-glib/tests/array.c ++++ b/json-glib/tests/array.c +@@ -1,9 +1,4 @@ +-#include +-#include +-#include +- +-#include +-#include ++#include "json-test-utils.h" + + static void + test_empty_array (void) +@@ -37,7 +32,7 @@ test_add_element (void) + + json_array_add_double_element (array, 3.14); + g_assert_cmpint (json_array_get_length (array), ==, 3); +- g_assert_cmpfloat (json_array_get_double_element (array, 2), ==, 3.14); ++ json_assert_fuzzy_equals (json_array_get_double_element (array, 2), 3.14, 0.001); + + json_array_add_boolean_element (array, TRUE); + g_assert_cmpint (json_array_get_length (array), ==, 4); +diff --git a/json-glib/tests/node.c b/json-glib/tests/node.c +index 23bda63..80beb78 100644 +--- a/json-glib/tests/node.c ++++ b/json-glib/tests/node.c +@@ -1,6 +1,4 @@ +-#include +-#include +-#include ++#include "json-test-utils.h" + + static void + test_init_int (void) +@@ -19,7 +17,7 @@ test_init_double (void) + JsonNode *node = json_node_new (JSON_NODE_VALUE); + + json_node_set_double (node, 3.14159); +- g_assert_cmpfloat (json_node_get_double (node), ==, 3.14159); ++ json_assert_fuzzy_equals (json_node_get_double (node), 3.14159, 0.00001); + + json_node_free (node); + } +@@ -119,13 +117,13 @@ test_get_int (void) + + json_node_set_int (node, 0); + g_assert_cmpint (json_node_get_int (node), ==, 0); +- g_assert_cmpfloat (json_node_get_double (node), ==, 0.0); ++ json_assert_almost_equals (json_node_get_double (node), 0.0); + g_assert (!json_node_get_boolean (node)); + g_assert (!json_node_is_null (node)); + + json_node_set_int (node, 42); + g_assert_cmpint (json_node_get_int (node), ==, 42); +- g_assert_cmpfloat (json_node_get_double (node), ==, 42.0); ++ json_assert_almost_equals (json_node_get_double (node), 42.0); + g_assert (json_node_get_boolean (node)); + g_assert (!json_node_is_null (node)); + +@@ -138,7 +136,7 @@ test_get_double (void) + JsonNode *node = json_node_new (JSON_NODE_VALUE); + + json_node_set_double (node, 3.14); +- g_assert_cmpfloat (json_node_get_double (node), ==, 3.14); ++ json_assert_fuzzy_equals (json_node_get_double (node), 3.14, 0.001); + g_assert_cmpint (json_node_get_int (node), ==, 3); + g_assert (json_node_get_boolean (node)); + +@@ -232,9 +230,9 @@ test_gvalue_autopromotion (void) + g_print ("Expecting a gdouble, got a %s\n", g_type_name (G_VALUE_TYPE (&check))); + + g_assert_cmpint (G_VALUE_TYPE (&check), ==, G_TYPE_DOUBLE); +- g_assert_cmpfloat ((float) g_value_get_double (&check), ==, 3.14159f); ++ json_assert_fuzzy_equals (g_value_get_double (&check), 3.14159, 0.00001); + g_assert_cmpint (G_VALUE_TYPE (&value), !=, G_VALUE_TYPE (&check)); +- g_assert_cmpfloat ((gdouble) g_value_get_float (&value), ==, g_value_get_double (&check)); ++ json_assert_almost_equals (g_value_get_float (&value), g_value_get_double (&check)); + + g_value_unset (&value); + g_value_unset (&check); +diff --git a/json-glib/tests/parser.c b/json-glib/tests/parser.c +index f71584a..8c52a1d 100644 +--- a/json-glib/tests/parser.c ++++ b/json-glib/tests/parser.c +@@ -1,11 +1,5 @@ +-#include "config.h" +- ++#include "json-test-utils.h" + #include +-#include +- +-#include +- +-#include + + static const gchar *test_empty_string = ""; + static const gchar *test_empty_array_string = "[ ]"; +@@ -38,13 +32,13 @@ verify_string_value (JsonNode *node) + static void + verify_double_value (JsonNode *node) + { +- g_assert_cmpfloat (10.2e3, ==, json_node_get_double (node)); ++ json_assert_fuzzy_equals (10.2e3, json_node_get_double (node), 0.1); + } + + static void + verify_negative_double_value (JsonNode *node) + { +- g_assert_cmpfloat (-3.14, ==, json_node_get_double (node)); ++ json_assert_fuzzy_equals (-3.14, json_node_get_double (node), 0.01); + } + + static const struct { +diff --git a/json-glib/tests/reader.c b/json-glib/tests/reader.c +index 43a6aac..9bab312 100644 +--- a/json-glib/tests/reader.c ++++ b/json-glib/tests/reader.c +@@ -1,9 +1,4 @@ +-#include +-#include +- +-#include +- +-#include ++#include "json-test-utils.h" + + static const gchar *test_base_array_data = + "[ 0, true, null, \"foo\", 3.14, [ false ], { \"bar\" : 42 } ]"; +@@ -78,7 +73,7 @@ test_base_object (void) + g_assert (json_reader_get_error (reader) == NULL); + + json_reader_read_member (reader, "double"); +- g_assert_cmpfloat (json_reader_get_double_value (reader), ==, 42.47); ++ json_assert_fuzzy_equals (json_reader_get_double_value (reader), 42.47, 0.01); + json_reader_end_element (reader); + + g_object_unref (reader); -- cgit v1.2.3 From 5de561a79634e0814ea22f1cfece9a09efa120be Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 6 Mar 2018 17:25:02 +0100 Subject: gnu: gnome-todo: Fix compatibility with libical >= 3.0. * gnu/packages/patches/gnome-todo-libical-compat.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/gnome.scm (gnome-todo)[source](patches): Use it. --- gnu/local.mk | 1 + gnu/packages/gnome.scm | 1 + gnu/packages/patches/gnome-todo-libical-compat.patch | 17 +++++++++++++++++ 3 files changed, 19 insertions(+) create mode 100644 gnu/packages/patches/gnome-todo-libical-compat.patch (limited to 'gnu/local.mk') diff --git a/gnu/local.mk b/gnu/local.mk index ea9c5da0cc..6c64068528 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -724,6 +724,7 @@ dist_patch_DATA = \ %D%/packages/patches/glog-gcc-5-demangling.patch \ %D%/packages/patches/gmp-arm-asm-nothumb.patch \ %D%/packages/patches/gmp-faulty-test.patch \ + %D%/packages/patches/gnome-todo-libical-compat.patch \ %D%/packages/patches/gnome-tweak-tool-search-paths.patch \ %D%/packages/patches/gnucash-price-quotes-perl.patch \ %D%/packages/patches/gnutls-skip-trust-store-test.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index de66705b05..516a590dc4 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6207,6 +6207,7 @@ desktop. It supports multiple calendars, month, week and year view.") (uri (string-append "mirror://gnome/sources/" name "/" (version-major+minor version) "/" name "-" version ".tar.xz")) + (patches (search-patches "gnome-todo-libical-compat.patch")) (sha256 (base32 "106xx1w18pxjmj5k0k2qjzi6b3c3kaz7b5kyrpknykibnr401ff9")))) diff --git a/gnu/packages/patches/gnome-todo-libical-compat.patch b/gnu/packages/patches/gnome-todo-libical-compat.patch new file mode 100644 index 0000000000..34f2e254b2 --- /dev/null +++ b/gnu/packages/patches/gnome-todo-libical-compat.patch @@ -0,0 +1,17 @@ +Fix compatibility with libical 3.0. + +Patch copied from Arch Linux: +https://git.archlinux.org/svntogit/packages.git/tree/trunk/gnome-todo-3.26.2-libical-3.0.patch?h=packages/gnome-todo + +diff -up gnome-todo-3.26.2/src/gtd-task.c.libical-3.0 gnome-todo-3.26.2/src/gtd-task.c +--- gnome-todo-3.26.2/src/gtd-task.c.libical-3.0 2017-11-08 14:53:53.484294926 +0100 ++++ gnome-todo-3.26.2/src/gtd-task.c 2017-11-08 14:53:57.208294874 +0100 +@@ -778,7 +778,7 @@ gtd_task_set_complete (GtdTask *task, + dt->minute = g_date_time_get_minute (now); + dt->second = g_date_time_get_seconds (now); + dt->is_date = 0; +- dt->is_utc = 1; ++ dt->zone = icaltimezone_get_utc_timezone (); + + /* convert timezone + * -- cgit v1.2.3 From 7ac43c44e80541a53ed1751de904b0d8a5dc3a4a Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Wed, 28 Feb 2018 20:43:21 +0100 Subject: gnu: giflib: Make "reallocarray" private, solve glibc@2.26 conflict. Rename the function and move the declaration from gif_lib.h to gif_lib_private.h to solve conflicts when some .c-file #includes both stdlib.h and gif_lib.h. See also https://sourceforge.net/p/giflib/bugs/110/ * gnu/packages/patches/giflib-make-reallocarray-private.patch: New file * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/image.scm(giflib)[source](patches): New field. --- gnu/local.mk | 1 + gnu/packages/image.scm | 4 +- .../patches/giflib-make-reallocarray-private.patch | 120 +++++++++++++++++++++ 3 files changed, 124 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/giflib-make-reallocarray-private.patch (limited to 'gnu/local.mk') diff --git a/gnu/local.mk b/gnu/local.mk index d90d8a318d..c26d0e47d8 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -697,6 +697,7 @@ dist_patch_DATA = \ %D%/packages/patches/ghostscript-no-header-uuid.patch \ %D%/packages/patches/ghostscript-no-header-creationdate.patch \ %D%/packages/patches/ghostscript-runpath.patch \ + %D%/packages/patches/giflib-make-reallocarray-private.patch \ %D%/packages/patches/gimp-CVE-2017-17784.patch \ %D%/packages/patches/gimp-CVE-2017-17785.patch \ %D%/packages/patches/gimp-CVE-2017-17786.patch \ diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index e3e3a3ccc7..a397189037 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -572,7 +572,9 @@ error-resilience, a Java-viewer for j2k-images, ...") version ".tar.bz2")) (sha256 (base32 - "1md83dip8rf29y40cm5r7nn19705f54iraz6545zhwa6y8zyq9yz")))) + "1md83dip8rf29y40cm5r7nn19705f54iraz6545zhwa6y8zyq9yz")) + (patches (search-patches + "giflib-make-reallocarray-private.patch")))) (build-system gnu-build-system) (outputs '("bin" ; utility programs "out")) ; library diff --git a/gnu/packages/patches/giflib-make-reallocarray-private.patch b/gnu/packages/patches/giflib-make-reallocarray-private.patch new file mode 100644 index 0000000000..69228c5be8 --- /dev/null +++ b/gnu/packages/patches/giflib-make-reallocarray-private.patch @@ -0,0 +1,120 @@ +Move the declaration from gif_lib.h to gif_lib_private.h to solve +conflicts when some .c-file #includes both stdlib.h and gif_lib.h. +See also https://sourceforge.net/p/giflib/bugs/110/ + +diff -ur giflib-5.1.4.orig/lib/dgif_lib.c giflib-5.1.4/lib/dgif_lib.c +--- giflib-5.1.4.orig/lib/dgif_lib.c 2018-02-28 20:31:02.294682673 +0100 ++++ giflib-5.1.4/lib/dgif_lib.c 2018-02-28 22:38:11.659126414 +0100 +@@ -396,7 +396,7 @@ + + if (GifFile->SavedImages) { + SavedImage* new_saved_images = +- (SavedImage *)reallocarray(GifFile->SavedImages, ++ (SavedImage *)giflib_private_reallocarray(GifFile->SavedImages, + (GifFile->ImageCount + 1), sizeof(SavedImage)); + if (new_saved_images == NULL) { + GifFile->Error = D_GIF_ERR_NOT_ENOUGH_MEM; +@@ -1108,7 +1108,7 @@ + if (ImageSize > (SIZE_MAX / sizeof(GifPixelType))) { + return GIF_ERROR; + } +- sp->RasterBits = (unsigned char *)reallocarray(NULL, ImageSize, ++ sp->RasterBits = (unsigned char *)giflib_private_reallocarray(NULL, ImageSize, + sizeof(GifPixelType)); + + if (sp->RasterBits == NULL) { +diff -ur giflib-5.1.4.orig/lib/gifalloc.c giflib-5.1.4/lib/gifalloc.c +--- giflib-5.1.4.orig/lib/gifalloc.c 2018-02-28 20:31:02.294682673 +0100 ++++ giflib-5.1.4/lib/gifalloc.c 2018-02-28 22:38:11.657126423 +0100 +@@ -8,7 +8,7 @@ + #include + #include + +-#include "gif_lib.h" ++#include "gif_lib_private.h" + + #define MAX(x, y) (((x) > (y)) ? (x) : (y)) + +@@ -188,7 +188,7 @@ + + /* perhaps we can shrink the map? */ + if (RoundUpTo < ColorUnion->ColorCount) { +- GifColorType *new_map = (GifColorType *)reallocarray(Map, ++ GifColorType *new_map = (GifColorType *)giflib_private_reallocarray(Map, + RoundUpTo, sizeof(GifColorType)); + if( new_map == NULL ) { + GifFreeMapObject(ColorUnion); +@@ -232,7 +232,7 @@ + if (*ExtensionBlocks == NULL) + *ExtensionBlocks=(ExtensionBlock *)malloc(sizeof(ExtensionBlock)); + else { +- ExtensionBlock* ep_new = (ExtensionBlock *)reallocarray ++ ExtensionBlock* ep_new = (ExtensionBlock *)giflib_private_reallocarray + (*ExtensionBlocks, (*ExtensionBlockCount + 1), + sizeof(ExtensionBlock)); + if( ep_new == NULL ) +@@ -325,7 +325,7 @@ + if (GifFile->SavedImages == NULL) + GifFile->SavedImages = (SavedImage *)malloc(sizeof(SavedImage)); + else +- GifFile->SavedImages = (SavedImage *)reallocarray(GifFile->SavedImages, ++ GifFile->SavedImages = (SavedImage *)giflib_private_reallocarray(GifFile->SavedImages, + (GifFile->ImageCount + 1), sizeof(SavedImage)); + + if (GifFile->SavedImages == NULL) +@@ -355,7 +355,7 @@ + } + + /* next, the raster */ +- sp->RasterBits = (unsigned char *)reallocarray(NULL, ++ sp->RasterBits = (unsigned char *)giflib_private_reallocarray(NULL, + (CopyFrom->ImageDesc.Height * + CopyFrom->ImageDesc.Width), + sizeof(GifPixelType)); +@@ -369,7 +369,7 @@ + + /* finally, the extension blocks */ + if (sp->ExtensionBlocks != NULL) { +- sp->ExtensionBlocks = (ExtensionBlock *)reallocarray(NULL, ++ sp->ExtensionBlocks = (ExtensionBlock *)giflib_private_reallocarray(NULL, + CopyFrom->ExtensionBlockCount, + sizeof(ExtensionBlock)); + if (sp->ExtensionBlocks == NULL) { +diff -ur giflib-5.1.4.orig/lib/gif_lib.h giflib-5.1.4/lib/gif_lib.h +--- giflib-5.1.4.orig/lib/gif_lib.h 2018-02-28 20:31:02.294682673 +0100 ++++ giflib-5.1.4/lib/gif_lib.h 2018-02-28 20:31:43.135716712 +0100 +@@ -244,9 +244,6 @@ + GifPixelType ColorTransIn2[]); + extern int GifBitSize(int n); + +-extern void * +-reallocarray(void *optr, size_t nmemb, size_t size); +- + /****************************************************************************** + Support for the in-core structures allocation (slurp mode). + ******************************************************************************/ +diff -ur giflib-5.1.4.orig/lib/gif_lib_private.h giflib-5.1.4/lib/gif_lib_private.h +--- giflib-5.1.4.orig/lib/gif_lib_private.h 2018-02-28 20:31:02.294682673 +0100 ++++ giflib-5.1.4/lib/gif_lib_private.h 2018-02-28 22:38:11.657126423 +0100 +@@ -54,6 +54,9 @@ + bool gif89; + } GifFilePrivateType; + ++extern void * ++giflib_private_reallocarray(void *optr, size_t nmemb, size_t size); ++ + #endif /* _GIF_LIB_PRIVATE_H */ + + /* end */ +diff -ur giflib-5.1.4.orig/lib/openbsd-reallocarray.c giflib-5.1.4/lib/openbsd-reallocarray.c +--- giflib-5.1.4.orig/lib/openbsd-reallocarray.c 2018-02-28 20:31:02.295682659 +0100 ++++ giflib-5.1.4/lib/openbsd-reallocarray.c 2018-02-28 22:38:11.656126428 +0100 +@@ -27,7 +27,7 @@ + #define MUL_NO_OVERFLOW ((size_t)1 << (sizeof(size_t) * 4)) + + void * +-reallocarray(void *optr, size_t nmemb, size_t size) ++giflib_private_reallocarray(void *optr, size_t nmemb, size_t size) + { + if ((nmemb >= MUL_NO_OVERFLOW || size >= MUL_NO_OVERFLOW) && + nmemb > 0 && SIZE_MAX / nmemb < size) { -- cgit v1.2.3