diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-03-08 13:56:34 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-03-08 14:01:29 +0100 |
| commit | 6eb45016d6e6742a757606a53d6065f8f32f3340 (patch) | |
| tree | 591e9d7ad9c7cbbf6aacc9d310ff6e541123e2c7 | |
| parent | 1b5292ca54288d52493cdfd1c2ae058724ff8d76 (diff) | |
| download | guix-6eb45016d6e6742a757606a53d6065f8f32f3340.tar guix-6eb45016d6e6742a757606a53d6065f8f32f3340.tar.gz | |
gnu: graphite2: Update to 1.3.11.
* gnu/packages/patches/graphite2-ffloat-store.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
* gnu/packages/fontutils.scm (graphite2): Update to 1.3.11.
[source](patches): Remove.
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/fontutils.scm | 5 | ||||
| -rw-r--r-- | gnu/packages/patches/graphite2-ffloat-store.patch | 34 |
3 files changed, 2 insertions, 38 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 2df11950c5..0fee442e33 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -729,7 +729,6 @@ dist_patch_DATA = \ %D%/packages/patches/gpm-glibc-2.26.patch \ %D%/packages/patches/gpsbabel-minizip.patch \ %D%/packages/patches/gpsbabel-qstring.patch \ - %D%/packages/patches/graphite2-ffloat-store.patch \ %D%/packages/patches/grep-timing-sensitive-test.patch \ %D%/packages/patches/groff-source-date-epoch.patch \ %D%/packages/patches/gsl-test-i686.patch \ diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index a04441a005..74e6a716f5 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -378,16 +378,15 @@ applications should be.") (define-public graphite2 (package (name "graphite2") - (version "1.3.10") + (version "1.3.11") (source (origin (method url-fetch) (uri (string-append "https://github.com/silnrsi/graphite/releases/" "download/" version "/" name "-" version ".tgz")) - (patches (search-patches "graphite2-ffloat-store.patch")) (sha256 (base32 - "1bm1rl2ww0m8rvmknh8fpajyz9xqv43qs9qrzf7xd5gaz6rf7zch")))) + "0z5dcgh8r3678awq6fb8igik7xmar5m6z9xxwpkkhradhk8jxfds")))) (build-system cmake-build-system) (native-inputs `(("python" ,python-2) ; because of "import imap" in tests diff --git a/gnu/packages/patches/graphite2-ffloat-store.patch b/gnu/packages/patches/graphite2-ffloat-store.patch deleted file mode 100644 index f6ee56973e..0000000000 --- a/gnu/packages/patches/graphite2-ffloat-store.patch +++ /dev/null @@ -1,34 +0,0 @@ -Fix test failures of awamicmp1 and awamicmp2. - -Debian bug report: - -https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=855814 - -Patch adapted from upstream source repository: - -https://github.com/silnrsi/graphite/commit/f7bbdd87d510d587c872e314d6458160c0069c65 - -From f7bbdd87d510d587c872e314d6458160c0069c65 Mon Sep 17 00:00:00 2001 -From: Martin Hosken <martin_hosken@sil.org> -Date: Tue, 14 Feb 2017 17:00:03 +0000 -Subject: [PATCH] try -ffloat-store for fp stability. Remove nested const to - work around VS bug - ---- - src/CMakeLists.txt | 2 +- - src/inc/locale2lcid.h | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 4f1e7e5..5b61b5c 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -108,7 +108,7 @@ set_target_properties(graphite2 PROPERTIES PUBLIC_HEADER "${GRAPHITE_HEADERS}" - - if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") - set_target_properties(graphite2 PROPERTIES -- COMPILE_FLAGS "-Wall -Wextra -Wno-unknown-pragmas -Wendif-labels -Wshadow -Wctor-dtor-privacy -Wnon-virtual-dtor -fno-rtti -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden -fno-stack-protector" -+ COMPILE_FLAGS "-Wall -Wextra -Wno-unknown-pragmas -Wendif-labels -Wshadow -Wctor-dtor-privacy -Wnon-virtual-dtor -fno-rtti -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden -fno-stack-protector -ffloat-store" - LINK_FLAGS "-nodefaultlibs ${GRAPHITE_LINK_FLAGS}" - LINKER_LANGUAGE C) - if (CMAKE_COMPILER_IS_GNUCXX) |