diff --git a/guile-cairo-1.10.0.tar.gz b/guile-cairo-1.10.0.tar.gz deleted file mode 100644 index 055e3e6..0000000 --- a/guile-cairo-1.10.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ae3d7e0f0a8ae93d0a15c692514eb30f2478d407052064976fc59a291cccdd5c -size 633917 diff --git a/guile-cairo-1.10.0.tar.gz.sig b/guile-cairo-1.10.0.tar.gz.sig deleted file mode 100644 index 61e36bf..0000000 Binary files a/guile-cairo-1.10.0.tar.gz.sig and /dev/null differ diff --git a/guile-cairo-1.11.1.tar.gz b/guile-cairo-1.11.1.tar.gz new file mode 100644 index 0000000..0eeb7d9 --- /dev/null +++ b/guile-cairo-1.11.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f4f6337eb5c90fc2f5fd2043de6f237ef336da6285ae042b8452379bb22086bd +size 672079 diff --git a/guile-cairo-1.11.1.tar.gz.sig b/guile-cairo-1.11.1.tar.gz.sig new file mode 100644 index 0000000..ab5c94c Binary files /dev/null and b/guile-cairo-1.11.1.tar.gz.sig differ diff --git a/guile-cairo.changes b/guile-cairo.changes index 2a887d9..4896475 100644 --- a/guile-cairo.changes +++ b/guile-cairo.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Fri Nov 6 17:10:58 UTC 2020 - Jonathan Brielmaier + +- update to version 1.11.1: + * New bindings cairo-surface-get-mime-data, cairo-surface-set-mime-data. + * Compatibility with Guile 1.8 has been dropped. + * Documentation fixes. +- remove patch: + * use-stdint-types.patch: included in release +- set source links + ------------------------------------------------------------------- Mon Jan 20 14:03:44 UTC 2020 - Jonathan Brielmaier diff --git a/guile-cairo.spec b/guile-cairo.spec index c617f4b..acf55d8 100644 --- a/guile-cairo.spec +++ b/guile-cairo.spec @@ -18,16 +18,14 @@ %define sover 0 Name: guile-cairo -Version: 1.10.0 +Version: 1.11.1 Release: 0 Summary: Guile bindings to Cairo License: LGPL-3.0-or-later Group: Development/Libraries/Other URL: https://www.nongnu.org/guile-cairo/ -Source0: %{name}-%{version}.tar.gz -Source1: %{name}-%{version}.tar.gz.sig -# PATCH-FIX-UPSTREAM: Use stdint types -- 7d7dd23 -Patch0: use-stdint-types.patch +Source0: http://download.savannah.gnu.org/releases/guile-cairo/guile-cairo-%{version}.tar.gz +Source1: http://download.savannah.gnu.org/releases/guile-cairo/guile-cairo-%{version}.tar.gz.sig BuildRequires: cairo-devel >= 1.10.0 BuildRequires: guile-devel Requires(post): %{install_info_prereq} @@ -56,7 +54,6 @@ Files required to build software using Guile Cairo bindings. %prep %setup -q -%patch0 -p1 %build %configure diff --git a/use-stdint-types.patch b/use-stdint-types.patch deleted file mode 100644 index bacf85e..0000000 --- a/use-stdint-types.patch +++ /dev/null @@ -1,110 +0,0 @@ -From 7d7dd2334fc58af5d9859475d86d30b65944b53e Mon Sep 17 00:00:00 2001 -From: Andy Wingo -Date: Mon, 15 Oct 2018 16:45:29 +0200 -Subject: Use stdint types - -* guile-cairo/guile-cairo-vector-types.c (scm_from_cairo_text_clusters): -(scm_fill_cairo_text_clusters): Use wchar_t. -* guile-cairo/guile-cairo.c: Use uint8_t and uint64_t. Include string.h. ---- - guile-cairo/guile-cairo-vector-types.c | 6 +++--- - guile-cairo/guile-cairo.c | 16 +++++++++------- - 2 files changed, 12 insertions(+), 10 deletions(-) - -diff --git a/guile-cairo/guile-cairo-vector-types.c b/guile-cairo/guile-cairo-vector-types.c -index 9545ee7..9be9928 100644 ---- a/guile-cairo/guile-cairo-vector-types.c -+++ b/guile-cairo/guile-cairo-vector-types.c -@@ -1,5 +1,5 @@ - /* guile-cairo -- * Copyright (C) 2007, 2011 Andy Wingo -+ * Copyright (C) 2007, 2011, 2018 Andy Wingo - * - * guile-cairo-vector-types.c: Cairo for Guile - * -@@ -233,7 +233,7 @@ scm_from_cairo_text_clusters (SCM str, cairo_text_cluster_t *clusters, - #if SCM_NEEDS_COMPAT (2, 0, 0) - num_bytes--; - #else -- scm_t_wchar c = SCM_CHAR (scm_c_string_ref (str, n++)); -+ wchar_t c = SCM_CHAR (scm_c_string_ref (str, n++)); - - if (c < 0x80) - num_bytes -= 1; -@@ -290,7 +290,7 @@ scm_fill_cairo_text_clusters (SCM str, SCM scm, - #if SCM_NEEDS_COMPAT (2, 0, 0) - num_bytes++; - #else -- scm_t_wchar c = SCM_CHAR (scm_c_string_ref (str, n++)); -+ wchar_t c = SCM_CHAR (scm_c_string_ref (str, n++)); - - if (c < 0x80) - num_bytes += 1; -diff --git a/guile-cairo/guile-cairo.c b/guile-cairo/guile-cairo.c -index ae97f3d..4136915 100644 ---- a/guile-cairo/guile-cairo.c -+++ b/guile-cairo/guile-cairo.c -@@ -1,5 +1,5 @@ - /* guile-cairo -- * Copyright (C) 2007, 2011, 2012, 2014 Andy Wingo -+ * Copyright (C) 2007, 2011, 2012, 2014, 2018 Andy Wingo - * - * guile-cairo.c: Cairo for Guile - * -@@ -18,6 +18,8 @@ - * . - */ - -+#include -+ - #include - - #include -@@ -2429,13 +2431,13 @@ SCM_DEFINE_PUBLIC (scm_cairo_image_surface_create_for_data, "cairo-image-surface - "") - { - size_t data_len; -- scm_t_uint8 *data_ptr; -+ uint8_t *data_ptr; - cairo_format_t iformat; - int iwidth, iheight, istride; - cairo_surface_t *surf; - - data_len = scm_c_bytevector_length (data); -- data_ptr = (scm_t_uint8 *) SCM_BYTEVECTOR_CONTENTS (data); -+ data_ptr = (uint8_t *) SCM_BYTEVECTOR_CONTENTS (data); - iformat = scm_to_cairo_format (format); - iwidth = scm_to_int (width); - iheight = scm_to_int (height); -@@ -2470,8 +2472,8 @@ SCM_DEFINE_PUBLIC (scm_cairo_image_surface_create_for_data, "cairo-image-surface - (iformat, iwidth))), - SCM_EOL); - -- if ((scm_t_uint64) data_len -- != ((scm_t_uint64) iheight) * ((scm_t_uint64) istride)) -+ if ((uint64_t) data_len -+ != ((uint64_t) iheight) * ((uint64_t) istride)) - scm_error (scm_from_utf8_symbol ("cairo-error"), - NULL, - "Data side and image dimensions do not match", -@@ -2529,7 +2531,7 @@ SCM_DEFINE_PUBLIC (scm_cairo_image_surface_set_data, "cairo-image-surface-set-da - size_t len; - unsigned char *ptr; - size_t data_len; -- scm_t_uint8 *data_ptr; -+ uint8_t *data_ptr; - - csurf = scm_to_cairo_surface (surf); - height = cairo_image_surface_get_height (csurf); -@@ -2544,7 +2546,7 @@ SCM_DEFINE_PUBLIC (scm_cairo_image_surface_set_data, "cairo-image-surface-set-da - SCM_EOL, SCM_EOL); - - data_len = scm_c_bytevector_length (data); -- data_ptr = (scm_t_uint8 *) SCM_BYTEVECTOR_CONTENTS (data); -+ data_ptr = (uint8_t *) SCM_BYTEVECTOR_CONTENTS (data); - - len = ((size_t) height) * ((size_t) stride); - if (len != data_len) --- -cgit v1.2.1 -