[Git][haskell-team/DHG_packages][master] 7 commits: integer-roots: Fix tests on 32-bit platforms
Ilias Tsitsimpis (@iliastsi)
gitlab at salsa.debian.org
Sun Oct 13 06:57:06 BST 2024
Ilias Tsitsimpis pushed to branch master at Debian Haskell Group / DHG_packages
Commits:
f73c8811 by Ilias Tsitsimpis at 2024-10-13T08:22:30+03:00
integer-roots: Fix tests on 32-bit platforms
- - - - -
d1f8af81 by Ilias Tsitsimpis at 2024-10-13T08:42:11+03:00
gi-dbusmenugtk3: Upgrading from 0.4.14 to 0.4.15
- - - - -
1b163e6c by Ilias Tsitsimpis at 2024-10-13T08:44:28+03:00
gi-vte: Upgrading from 2.91.31 to 2.91.33
- - - - -
e9fefb1b by Ilias Tsitsimpis at 2024-10-13T08:54:01+03:00
gi-gtk-hs: Sourceful upload for GHC 9.6
- - - - -
99e764ca by Ilias Tsitsimpis at 2024-10-13T08:54:01+03:00
gtk-strut: Sourceful upload for GHC 9.6
- - - - -
28e99258 by Ilias Tsitsimpis at 2024-10-13T08:54:01+03:00
yesod-auth-hashdb: Sourceful upload for GHC 9.6
- - - - -
464515ed by Ilias Tsitsimpis at 2024-10-13T08:54:01+03:00
yesod-auth-oauth: Sourceful upload for GHC 9.6
- - - - -
21 changed files:
- p/haskell-gi-dbusmenugtk3/debian/changelog
- p/haskell-gi-dbusmenugtk3/debian/control
- p/haskell-gi-dbusmenugtk3/debian/patches/no-haskell-gi-overloading
- p/haskell-gi-gtk-hs/debian/changelog
- p/haskell-gi-gtk-hs/debian/control
- p/haskell-gi-vte/debian/changelog
- p/haskell-gi-vte/debian/control
- − p/haskell-gi-vte/debian/patches/gi-cairo.patch
- p/haskell-gi-vte/debian/patches/no-haskell-gi-overloading
- p/haskell-gi-vte/debian/patches/series
- p/haskell-gtk-strut/debian/changelog
- p/haskell-gtk-strut/debian/control
- p/haskell-integer-roots/debian/changelog
- + p/haskell-integer-roots/debian/patches/disable-doctests
- + p/haskell-integer-roots/debian/patches/fix-tests-32bit
- p/haskell-integer-roots/debian/patches/newer-deps
- p/haskell-integer-roots/debian/patches/series
- p/haskell-yesod-auth-hashdb/debian/changelog
- p/haskell-yesod-auth-hashdb/debian/control
- p/haskell-yesod-auth-oauth/debian/changelog
- p/haskell-yesod-auth-oauth/debian/control
Changes:
=====================================
p/haskell-gi-dbusmenugtk3/debian/changelog
=====================================
@@ -1,8 +1,9 @@
-haskell-gi-dbusmenugtk3 (0.4.14-2) UNRELEASED; urgency=medium
+haskell-gi-dbusmenugtk3 (0.4.15-1) unstable; urgency=medium
* Declare compliance with Debian policy 4.7.0
+ * New upstream release
- -- Ilias Tsitsimpis <iliastsi at debian.org> Wed, 11 Sep 2024 15:17:26 +0300
+ -- Ilias Tsitsimpis <iliastsi at debian.org> Sun, 13 Oct 2024 08:41:43 +0300
haskell-gi-dbusmenugtk3 (0.4.14-1) unstable; urgency=medium
=====================================
p/haskell-gi-dbusmenugtk3/debian/control
=====================================
@@ -33,7 +33,7 @@ Build-Depends: debhelper (>= 10),
libghc-gi-gtk-dev (>= 3.0),
libghc-gi-gtk-dev (<< 3.1),
libghc-gi-gtk-prof,
- libghc-haskell-gi-dev (>= 0.26),
+ libghc-haskell-gi-dev (>= 0.26.9),
libghc-haskell-gi-dev (<< 0.27),
libghc-haskell-gi-prof,
libghc-haskell-gi-base-dev (>= 0.26),
=====================================
p/haskell-gi-dbusmenugtk3/debian/patches/no-haskell-gi-overloading
=====================================
@@ -5,7 +5,7 @@ Index: b/gi-dbusmenugtk3.cabal
@@ -35,7 +35,6 @@ library
build-depends: base >= 4.7 && <5,
haskell-gi-base >= 0.26 && < 0.27,
- haskell-gi >= 0.26 && < 0.27,
+ haskell-gi >= 0.26.9 && < 0.27,
- haskell-gi-overloading < 1.1,
gi-glib == 2.0.*,
gi-gobject == 2.0.*,
=====================================
p/haskell-gi-gtk-hs/debian/changelog
=====================================
@@ -1,8 +1,9 @@
-haskell-gi-gtk-hs (0.3.16-2) UNRELEASED; urgency=medium
+haskell-gi-gtk-hs (0.3.16-2) unstable; urgency=medium
* Declare compliance with Debian policy 4.7.0
+ * Sourceful upload for GHC 9.6
- -- Ilias Tsitsimpis <iliastsi at debian.org> Wed, 11 Sep 2024 15:17:27 +0300
+ -- Ilias Tsitsimpis <iliastsi at debian.org> Sun, 13 Oct 2024 08:54:00 +0300
haskell-gi-gtk-hs (0.3.16-1) unstable; urgency=medium
=====================================
p/haskell-gi-gtk-hs/debian/control
=====================================
@@ -7,7 +7,7 @@ Rules-Requires-Root: no
Build-Depends: debhelper (>= 10),
haskell-devscripts-minimal | haskell-devscripts (>= 0.15),
cdbs,
- ghc,
+ ghc (>= 9.6),
ghc-prof,
libghc-base-compat-dev (>= 0.9.0),
libghc-base-compat-dev (<< 0.14),
=====================================
p/haskell-gi-vte/debian/changelog
=====================================
@@ -1,8 +1,9 @@
-haskell-gi-vte (2.91.31-2) UNRELEASED; urgency=medium
+haskell-gi-vte (2.91.33-1) unstable; urgency=medium
* Declare compliance with Debian policy 4.7.0
+ * New upstream release
- -- Ilias Tsitsimpis <iliastsi at debian.org> Wed, 11 Sep 2024 15:17:28 +0300
+ -- Ilias Tsitsimpis <iliastsi at debian.org> Sun, 13 Oct 2024 08:43:18 +0300
haskell-gi-vte (2.91.31-1) unstable; urgency=medium
=====================================
p/haskell-gi-vte/debian/control
=====================================
@@ -14,6 +14,9 @@ Build-Depends: debhelper (>= 10),
libghc-gi-atk-dev (>= 2.0),
libghc-gi-atk-dev (<< 2.1),
libghc-gi-atk-prof,
+ libghc-gi-cairo-dev (>= 1.0),
+ libghc-gi-cairo-dev (<< 1.1),
+ libghc-gi-cairo-prof,
libghc-gi-gdk-dev (>= 3.0),
libghc-gi-gdk-dev (<< 3.1),
libghc-gi-gdk-prof,
@@ -32,7 +35,7 @@ Build-Depends: debhelper (>= 10),
libghc-gi-pango-dev (>= 1.0),
libghc-gi-pango-dev (<< 1.1),
libghc-gi-pango-prof,
- libghc-haskell-gi-dev (>= 0.26),
+ libghc-haskell-gi-dev (>= 0.26.9),
libghc-haskell-gi-dev (<< 0.27),
libghc-haskell-gi-prof,
libghc-haskell-gi-base-dev (>= 0.26),
@@ -40,6 +43,7 @@ Build-Depends: debhelper (>= 10),
libghc-haskell-gi-base-prof,
Build-Depends-Indep: ghc-doc,
libghc-gi-atk-doc,
+ libghc-gi-cairo-doc,
libghc-gi-gdk-doc,
libghc-gi-gio-doc,
libghc-gi-glib-doc,
=====================================
p/haskell-gi-vte/debian/patches/gi-cairo.patch deleted
=====================================
@@ -1,36 +0,0 @@
-Description: Fix build failure due to new at-spi2-common 2.49.90-2 and cairo
-
-[15 of 19] Compiling GI.Vte.Structs.Regex ( GI/Vte/Structs/Regex.hs, dist-ghc/build/GI/Vte/Structs/Regex.o, dist-ghc/build/GI/Vte/Structs/Regex.dyn_o )
-[16 of 19] Compiling GI.Vte.Structs ( GI/Vte/Structs.hs, dist-ghc/build/GI/Vte/Structs.o, dist-ghc/build/GI/Vte/Structs.dyn_o )
-[17 of 19] Compiling GI.Vte.Objects.Terminal ( GI/Vte/Objects/Terminal.hs, dist-ghc/build/GI/Vte/Objects/Terminal.o, dist-ghc/build/GI/Vte/Objects/Terminal.dyn_o )
-
-GI/Vte/Objects/Terminal.hs:1910:1: error:
- Could not load module ‘GI.Cairo.Structs.FontOptions’
- It is a member of the hidden package ‘gi-cairo-1.0.27’.
- Perhaps you need to add ‘gi-cairo’ to the build-depends in your .cabal file.
- Use -v (or `:set -v` in ghci) to see a list of the files searched for.
- |
-1910 | import qualified GI.Cairo.Structs.FontOptions as Cairo.FontOptions
- | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
--e: error: debian/hlibrary.setup build --builddir=dist-ghc returned exit code 1
- at /usr/share/perl5/Debian/Debhelper/Dh_Lib.pm line 880.
- Debian::Debhelper::Dh_Lib::error("debian/hlibrary.setup build --builddir=dist-ghc returned exit"...) called at /usr/share/perl5/Debian/Debhelper/Dh_Lib.pm line 610
- Debian::Debhelper::Dh_Lib::error_exitcode("debian/hlibrary.setup build --builddir=dist-ghc") called at /usr/share/perl5/Debian/Debhelper/Dh_Lib.pm line 473
- Debian::Debhelper::Dh_Lib::doit("debian/hlibrary.setup", "build", "--builddir=dist-ghc") called at /usr/share/perl5/Debian/Debhelper/Buildsystem/Haskell/Recipes.pm line 650
- Debian::Debhelper::Buildsystem::Haskell::Recipes::build_recipe() called at -e line 1
-make: *** [/usr/share/cdbs/1/class/hlibrary.mk:160: build-ghc-stamp] Error 25
-dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 2
-
-Author: Gianfranco Costamagna <locutusofborg at debian.org>
-Last-Update: 2023-08-10
-
---- haskell-gi-vte-2.91.30.orig/gi-vte.cabal
-+++ haskell-gi-vte-2.91.30/gi-vte.cabal
-@@ -35,6 +35,7 @@ library
- build-depends: base >= 4.7 && <5,
- haskell-gi-base >= 0.26 && < 0.27,
- haskell-gi >= 0.26 && < 0.27,
-+ gi-cairo == 1.0.*,
- gi-pango == 1.0.*,
- gi-gtk == 3.0.*,
- gi-gio == 2.0.*,
=====================================
p/haskell-gi-vte/debian/patches/no-haskell-gi-overloading
=====================================
@@ -2,10 +2,10 @@ Index: b/gi-vte.cabal
===================================================================
--- a/gi-vte.cabal
+++ b/gi-vte.cabal
-@@ -35,7 +35,6 @@ library
+@@ -36,7 +36,6 @@ library
build-depends: base >= 4.7 && <5,
haskell-gi-base >= 0.26 && < 0.27,
- haskell-gi >= 0.26 && < 0.27,
+ haskell-gi >= 0.26.9 && < 0.27,
- haskell-gi-overloading < 1.1,
gi-pango == 1.0.*,
gi-gtk == 3.0.*,
=====================================
p/haskell-gi-vte/debian/patches/series
=====================================
@@ -1,2 +1 @@
no-haskell-gi-overloading
-gi-cairo.patch
=====================================
p/haskell-gtk-strut/debian/changelog
=====================================
@@ -1,8 +1,9 @@
-haskell-gtk-strut (0.1.3.2-3) UNRELEASED; urgency=medium
+haskell-gtk-strut (0.1.3.2-3) unstable; urgency=medium
* Declare compliance with Debian policy 4.7.0
+ * Sourceful upload for GHC 9.6
- -- Ilias Tsitsimpis <iliastsi at debian.org> Wed, 11 Sep 2024 15:17:29 +0300
+ -- Ilias Tsitsimpis <iliastsi at debian.org> Sun, 13 Oct 2024 08:54:01 +0300
haskell-gtk-strut (0.1.3.2-2) unstable; urgency=medium
=====================================
p/haskell-gtk-strut/debian/control
=====================================
@@ -6,7 +6,7 @@ Section: haskell
Build-Depends: debhelper (>= 10),
haskell-devscripts-minimal | haskell-devscripts (>= 0.8),
cdbs,
- ghc (>= 9.4),
+ ghc (>= 9.6),
ghc-prof,
libghc-data-default-dev,
libghc-data-default-prof,
=====================================
p/haskell-integer-roots/debian/changelog
=====================================
@@ -1,3 +1,9 @@
+haskell-integer-roots (1.0.2.0-4) unstable; urgency=medium
+
+ * Fix tests on 32-bit platforms
+
+ -- Ilias Tsitsimpis <iliastsi at debian.org> Sun, 13 Oct 2024 08:14:07 +0300
+
haskell-integer-roots (1.0.2.0-3) unstable; urgency=medium
* Declare compliance with Debian policy 4.7.0
=====================================
p/haskell-integer-roots/debian/patches/disable-doctests
=====================================
@@ -0,0 +1,12 @@
+Index: b/integer-roots.cabal
+===================================================================
+--- a/integer-roots.cabal
++++ b/integer-roots.cabal
+@@ -65,6 +65,7 @@ test-suite integer-roots-tests
+ ghc-options: -Wall -Widentities -Wcompat
+
+ test-suite integer-roots-doctests
++ buildable: False
+ type: exitcode-stdio-1.0
+ main-is: Doctest.hs
+ hs-source-dirs: test-suite
=====================================
p/haskell-integer-roots/debian/patches/fix-tests-32bit
=====================================
@@ -0,0 +1,33 @@
+From 7688a75dedf52b4e1ae20cc5017afa042caad909 Mon Sep 17 00:00:00 2001
+From: Bodigrim <andrew.lelechenko at gmail.com>
+Date: Wed, 12 Oct 2022 21:14:27 +0100
+Subject: [PATCH] Fix tests on i386
+
+---
+ test-suite/Math/NumberTheory/Roots/GeneralTests.hs | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+Index: b/test-suite/Math/NumberTheory/Roots/GeneralTests.hs
+===================================================================
+--- a/test-suite/Math/NumberTheory/Roots/GeneralTests.hs
++++ b/test-suite/Math/NumberTheory/Roots/GeneralTests.hs
+@@ -13,6 +13,7 @@ module Math.NumberTheory.Roots.GeneralTe
+ ( testSuite
+ ) where
+
++import Data.Bits
+ import Test.Tasty
+ import Test.Tasty.HUnit
+ import Test.Tasty.QuickCheck as QC
+@@ -90,9 +91,9 @@ highestPowerSpecialCases =
+ , 3
+ , 2)
+
+- , a ( -2 ^ 63 :: Int
++ , a ( minBound :: Int
+ , -2 :: Int
+- , 63)
++ , fromIntegral (finiteBitSize (0 :: Int) - 1))
+
+ , a ( (2 ^ 63 - 1) ^ 21
+ , 2 ^ 63 - 1
=====================================
p/haskell-integer-roots/debian/patches/newer-deps
=====================================
@@ -1,3 +1,5 @@
+Index: b/integer-roots.cabal
+===================================================================
--- a/integer-roots.cabal
+++ b/integer-roots.cabal
@@ -27,7 +27,7 @@ library
=====================================
p/haskell-integer-roots/debian/patches/series
=====================================
@@ -1 +1,3 @@
newer-deps
+fix-tests-32bit
+disable-doctests
=====================================
p/haskell-yesod-auth-hashdb/debian/changelog
=====================================
@@ -1,8 +1,9 @@
-haskell-yesod-auth-hashdb (1.7.1.7-3) UNRELEASED; urgency=medium
+haskell-yesod-auth-hashdb (1.7.1.7-3) unstable; urgency=medium
* Declare compliance with Debian policy 4.7.0
+ * Sourceful upload for GHC 9.6
- -- Ilias Tsitsimpis <iliastsi at debian.org> Wed, 11 Sep 2024 15:18:42 +0300
+ -- Ilias Tsitsimpis <iliastsi at debian.org> Sun, 13 Oct 2024 08:54:01 +0300
haskell-yesod-auth-hashdb (1.7.1.7-2) unstable; urgency=medium
=====================================
p/haskell-yesod-auth-hashdb/debian/control
=====================================
@@ -8,7 +8,7 @@ Rules-Requires-Root: no
Build-Depends:
cdbs,
debhelper (>= 10),
- ghc (>= 9.4),
+ ghc (>= 9.6),
ghc-prof,
haskell-devscripts (>= 0.13),
libghc-aeson-dev,
=====================================
p/haskell-yesod-auth-oauth/debian/changelog
=====================================
@@ -1,8 +1,9 @@
-haskell-yesod-auth-oauth (1.6.1-3) UNRELEASED; urgency=medium
+haskell-yesod-auth-oauth (1.6.1-3) unstable; urgency=medium
* Declare compliance with Debian policy 4.7.0
+ * Sourceful upload for GHC 9.6
- -- Ilias Tsitsimpis <iliastsi at debian.org> Wed, 11 Sep 2024 15:18:42 +0300
+ -- Ilias Tsitsimpis <iliastsi at debian.org> Sun, 13 Oct 2024 08:54:01 +0300
haskell-yesod-auth-oauth (1.6.1-2) unstable; urgency=medium
=====================================
p/haskell-yesod-auth-oauth/debian/control
=====================================
@@ -8,7 +8,7 @@ Rules-Requires-Root: no
Build-Depends:
cdbs,
debhelper (>= 10),
- ghc (>= 9.4),
+ ghc (>= 9.6),
ghc-prof,
haskell-devscripts (>= 0.13),
libghc-authenticate-oauth-dev (>= 1.5),
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/compare/9f62f37d38ff129dfadcaaab6cb157a3b4dca3bc...464515ed42871b259d5e5b58d2c2fe1902013c83
--
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/compare/9f62f37d38ff129dfadcaaab6cb157a3b4dca3bc...464515ed42871b259d5e5b58d2c2fe1902013c83
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-haskell-commits/attachments/20241013/43bb772a/attachment-0001.htm>
More information about the Pkg-haskell-commits
mailing list