From 952cf19d5483da766fb7ac577729a0b69be70fc2 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 14 Feb 2020 11:31:06 +0800 Subject: [PATCH] update to 0.13.8.0 --- .gitignore | 1 + ...cf524f1beaf227d8cce140abdf7c45efc8c6.patch | 28 ------------------- ghc-gio.spec | 9 +++--- sources | 2 +- 4 files changed, 7 insertions(+), 33 deletions(-) delete mode 100644 f0f7cf524f1beaf227d8cce140abdf7c45efc8c6.patch diff --git a/.gitignore b/.gitignore index 8fb91f8..5f70344 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /gio-0.13.4.1.tar.gz /gio-0.13.5.0.tar.gz /gio-0.13.6.0.tar.gz +/gio-0.13.8.0.tar.gz diff --git a/f0f7cf524f1beaf227d8cce140abdf7c45efc8c6.patch b/f0f7cf524f1beaf227d8cce140abdf7c45efc8c6.patch deleted file mode 100644 index 500f0c4..0000000 --- a/f0f7cf524f1beaf227d8cce140abdf7c45efc8c6.patch +++ /dev/null @@ -1,28 +0,0 @@ -From f0f7cf524f1beaf227d8cce140abdf7c45efc8c6 Mon Sep 17 00:00:00 2001 -From: Peter Simons -Date: Mon, 7 Oct 2019 14:00:54 +0200 -Subject: [PATCH] gio: ignore the __attribute__(A) annotation introduced in - glib-2.61.2 - ---- - gio/gio.cabal | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/gio/gio.cabal b/gio/gio.cabal -index be64b529..47a880a3 100644 ---- a/gio/gio.cabal -+++ b/gio/gio.cabal -@@ -80,10 +80,10 @@ Library - - default-language: Haskell98 - default-extensions: ForeignFunctionInterface -- -- cpp-options: -U__BLOCKS__ -Ubool -+ -+ cpp-options: -U__BLOCKS__ -Ubool -D__attribute__(A)= - if os(darwin) || os(freebsd) -- cpp-options: -D__attribute__(A)= -D_Nullable= -D_Nonnull= -D_Noreturn= -+ cpp-options: -D_Nullable= -D_Nonnull= -D_Noreturn= - - x-Signals-File: System/GIO/Signals.chs - x-Signals-Modname: System.GIO.Signals diff --git a/ghc-gio.spec b/ghc-gio.spec index 6b3303c..ce03a28 100644 --- a/ghc-gio.spec +++ b/ghc-gio.spec @@ -5,8 +5,8 @@ %global pkgver %{pkg_name}-%{version} Name: ghc-%{pkg_name} -Version: 0.13.6.0 -Release: 2%{?dist} +Version: 0.13.8.0 +Release: 1%{?dist} Summary: Binding to GIO License: LGPLv2+ @@ -14,7 +14,6 @@ Url: https://hackage.haskell.org/package/%{pkg_name} # Begin cabal-rpm sources: Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz # End cabal-rpm sources -Patch0: https://github.com/gtk2hs/gtk2hs/commit/f0f7cf524f1beaf227d8cce140abdf7c45efc8c6.patch # Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel @@ -79,7 +78,6 @@ This package provides the Haskell %{pkg_name} profiling library. # Begin cabal-rpm setup: %setup -q -n %{pkgver} # End cabal-rpm setup -%patch0 -p2 -b .orig %build @@ -129,6 +127,9 @@ rm -r %{buildroot}%{_datadir}/%{pkg_name}-%{version} %changelog +* Fri Feb 14 2020 Jens Petersen - 0.13.8.0-1 +- update to 0.13.8.0 + * Tue Jan 28 2020 Fedora Release Engineering - 0.13.6.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index d9d1e2b..b6b771f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gio-0.13.6.0.tar.gz) = d9bd77f887d7112d878b7349b7c79dcaf483ac5567d9fea0e902c161700eeb9be9b574584b440ccd580c504b1b76b0bc2b4d6d30de2c3b1a05c72c8f67790de9 +SHA512 (gio-0.13.8.0.tar.gz) = efc8169eda02456ac41aeb72b5cf513743bdff52e37e247ecc438cba41985a8e14c55df14814eabadd2b4604e0f96bc39bcfd731924a17c5f04b443f1e0e2bc0