From 53a85318b85e426fa7a714c62a2becc151a650de8ace276175535d4199fbc856 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 1 Mar 2024 19:00:05 +0000 Subject: [PATCH 1/3] osc copypac from project:devel:languages:haskell:ghc-9.8.x package:ghc-tasty revision:4, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-tasty?expand=0&rev=25 --- ghc-tasty.spec | 7 ++----- riscv64-unbounded-delays.patch | 10 ++++++---- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/ghc-tasty.spec b/ghc-tasty.spec index 6f93690..8b9c456 100644 --- a/ghc-tasty.spec +++ b/ghc-tasty.spec @@ -26,8 +26,6 @@ License: MIT URL: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/2.cabal#/%{pkg_name}.cabal -# https://github.com/UnkindPartition/tasty/pull/371 -Patch0: riscv64-unbounded-delays.patch BuildRequires: ghc-Cabal-devel BuildRequires: ghc-ansi-terminal-devel BuildRequires: ghc-ansi-terminal-prof @@ -80,9 +78,8 @@ Supplements: (ghc-%{pkg_name}-devel and ghc-prof) This package provides the Haskell %{pkg_name} profiling library. %prep -%setup -q -n %{pkg_name}-%{version} -tr -d '\r' <%{SOURCE1} >%{pkg_name}.cabal -%autopatch -p0 +%autosetup -n %{pkg_name}-%{version} +cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build diff --git a/riscv64-unbounded-delays.patch b/riscv64-unbounded-delays.patch index 9e656b8..dc3d9ff 100644 --- a/riscv64-unbounded-delays.patch +++ b/riscv64-unbounded-delays.patch @@ -1,7 +1,9 @@ ---- tasty.cabal.orig 2024-02-09 21:02:29.437780992 +0000 -+++ tasty.cabal 2024-02-09 21:03:32.232599568 +0000 -@@ -69,7 +69,7 @@ - ansi-terminal >= 0.9 && < 1.2 +Index: tasty.cabal +=================================================================== +--- tasty.cabal.orig 2023-11-07 17:48:13.765306814 +0000 ++++ tasty.cabal 2023-11-07 17:48:44.757109342 +0000 +@@ -69,7 +69,7 @@ library + ansi-terminal >= 0.9 && < 1.1 -- No reason to depend on unbounded-delays on 64-bit architecture - if(!arch(x86_64) && !arch(aarch64)) From 2faa30cce4065b161ac3def10b8da64c0cbba9e9a139960db8f2be1180c881bf Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 1 Mar 2024 21:25:57 +0000 Subject: [PATCH 2/3] osc copypac from project:devel:languages:haskell:ghc-9.8.x package:ghc-tasty revision:5, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-tasty?expand=0&rev=26 --- ghc-tasty.spec | 7 +++++-- riscv64-unbounded-delays.patch | 10 ++++------ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/ghc-tasty.spec b/ghc-tasty.spec index 8b9c456..6f93690 100644 --- a/ghc-tasty.spec +++ b/ghc-tasty.spec @@ -26,6 +26,8 @@ License: MIT URL: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/2.cabal#/%{pkg_name}.cabal +# https://github.com/UnkindPartition/tasty/pull/371 +Patch0: riscv64-unbounded-delays.patch BuildRequires: ghc-Cabal-devel BuildRequires: ghc-ansi-terminal-devel BuildRequires: ghc-ansi-terminal-prof @@ -78,8 +80,9 @@ Supplements: (ghc-%{pkg_name}-devel and ghc-prof) This package provides the Haskell %{pkg_name} profiling library. %prep -%autosetup -n %{pkg_name}-%{version} -cp -p %{SOURCE1} %{pkg_name}.cabal +%setup -q -n %{pkg_name}-%{version} +tr -d '\r' <%{SOURCE1} >%{pkg_name}.cabal +%autopatch -p0 %build %ghc_lib_build diff --git a/riscv64-unbounded-delays.patch b/riscv64-unbounded-delays.patch index dc3d9ff..ae7cfc4 100644 --- a/riscv64-unbounded-delays.patch +++ b/riscv64-unbounded-delays.patch @@ -1,9 +1,7 @@ -Index: tasty.cabal -=================================================================== ---- tasty.cabal.orig 2023-11-07 17:48:13.765306814 +0000 -+++ tasty.cabal 2023-11-07 17:48:44.757109342 +0000 -@@ -69,7 +69,7 @@ library - ansi-terminal >= 0.9 && < 1.1 +--- tasty.cabal.orig 2024-03-01 20:46:02.849342429 +0000 ++++ tasty.cabal 2024-03-01 20:46:12.567277033 +0000 +@@ -69,7 +69,7 @@ + ansi-terminal >= 0.9 && < 1.2 -- No reason to depend on unbounded-delays on 64-bit architecture - if(!arch(x86_64) && !arch(aarch64)) From e9140b3af529b4213ebec36a43137d65f8d134c860bc35c9144142b106ad15a3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 12 Mar 2024 15:13:45 +0000 Subject: [PATCH 3/3] osc copypac from project:devel:languages:haskell:ghc-9.8.x package:ghc-tasty revision:6, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-tasty?expand=0&rev=27 --- ghc-tasty.changes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ghc-tasty.changes b/ghc-tasty.changes index 76496d1..5d46d80 100644 --- a/ghc-tasty.changes +++ b/ghc-tasty.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Mar 12 15:11:13 UTC 2024 - Peter Simons + +- Refresh 'riscv64-unbounded-delays.patch'. + ------------------------------------------------------------------- Wed Feb 7 12:35:30 UTC 2024 - Peter Simons