Date: Thu, 7 Jul 2022 10:25:21 GMT From: Gleb Popov <arrowd@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: a7a68b816725 - main - devel/hs-threadscope: Fix build after GHC update. Message-ID: <202207071025.267APL3S095366@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=a7a68b81672568c21acd25bec900367a96ea8959 commit a7a68b81672568c21acd25bec900367a96ea8959 Author: Gleb Popov <arrowd@FreeBSD.org> AuthorDate: 2022-05-09 18:12:20 +0000 Commit: Gleb Popov <arrowd@FreeBSD.org> CommitDate: 2022-07-07 10:24:33 +0000 devel/hs-threadscope: Fix build after GHC update. --- devel/hs-threadscope/Makefile | 32 +++++----- devel/hs-threadscope/distinfo | 72 +++++++++++----------- devel/hs-threadscope/files/patch-GUI_SaveAs.hs | 11 ++++ ...buildtools-0.13.5.0_c2hs_toplevel_C2HSConfig.hs | 2 +- devel/hs-threadscope/files/patch-threadscope.cabal | 19 ++++++ 5 files changed, 82 insertions(+), 54 deletions(-) diff --git a/devel/hs-threadscope/Makefile b/devel/hs-threadscope/Makefile index 7f2e3b7bb051..cdad7736d71b 100644 --- a/devel/hs-threadscope/Makefile +++ b/devel/hs-threadscope/Makefile @@ -15,24 +15,24 @@ USES= cabal gnome pkgconfig USE_GNOME= cairo gdkpixbuf2 glib20 gtk20 -USE_CABAL= alex-3.2.6 \ - cairo-0.13.8.1 \ - exceptions-0.10.4_1 \ - file-embed-0.0.13.0 \ - ghc-events-0.15.1 \ - glib-0.13.8.1 \ - gtk-0.15.5 \ - gtk2hs-buildtools-0.13.8.0 \ - happy-1.20.0 \ - hashable-1.3.1.0 \ - hashtables-1.2.4.1 \ - pango-0.13.8.1 \ - primitive-0.7.1.0_2 \ - random-1.2.0_5 \ - splitmix-0.1.0.3 \ +USE_CABAL= alex-3.2.7.1 \ + cairo-0.13.8.2 \ + file-embed-0.0.15.0 \ + ghc-events-0.17.0.3 \ + gio-0.13.8.2 \ + glib-0.13.8.2 \ + gtk-0.15.7 \ + gtk2hs-buildtools-0.13.8.3 \ + happy-1.20.0_1 \ + hashable-1.4.0.2 \ + hashtables-1.3 \ + pango-0.13.8.2 \ + primitive-0.7.3.0 \ + random-1.2.1.1 \ + splitmix-0.1.0.4 \ temporary-1.3 \ utf8-string-1.0.2 \ - vector-0.12.2.0 + vector-0.12.3.1_1 BROKEN_aarch64= ld.lld: error: relocation R_AARCH64_PREL64 cannot be used against symbol ... recompile with -fPIC diff --git a/devel/hs-threadscope/distinfo b/devel/hs-threadscope/distinfo index 6f2b9626cccb..a5673139bf32 100644 --- a/devel/hs-threadscope/distinfo +++ b/devel/hs-threadscope/distinfo @@ -1,45 +1,43 @@ -TIMESTAMP = 1614880458 +TIMESTAMP = 1652118720 SHA256 (cabal/threadscope-0.2.14.tar.gz) = 9ef14eacea739336bc1eb72cac1c34a3bf4d507f6238f3b4d01a4d3fcd469275 SIZE (cabal/threadscope-0.2.14.tar.gz) = 83506 -SHA256 (cabal/alex-3.2.6/alex-3.2.6.tar.gz) = 91aa08c1d3312125fbf4284815189299bbb0be34421ab963b1f2ae06eccc5410 -SIZE (cabal/alex-3.2.6/alex-3.2.6.tar.gz) = 108832 -SHA256 (cabal/cairo-0.13.8.1/cairo-0.13.8.1.tar.gz) = 1316412d51556205cfc097a354eddf0e51f4d319cde0498626a2854733f4f3c2 -SIZE (cabal/cairo-0.13.8.1/cairo-0.13.8.1.tar.gz) = 53026 -SHA256 (cabal/exceptions-0.10.4/exceptions-0.10.4.tar.gz) = 4d0bfb4355cffcd67d300811df9d5fe44ea3594ed63750795bfc1f797abd84cf -SIZE (cabal/exceptions-0.10.4/exceptions-0.10.4.tar.gz) = 20819 -SHA256 (cabal/exceptions-0.10.4/revision/1.cabal) = 1729ef26a611ae78aa58cdd34192aff710cbaa6d631dd042ddfb63556d00b52c -SIZE (cabal/exceptions-0.10.4/revision/1.cabal) = 2796 -SHA256 (cabal/file-embed-0.0.13.0/file-embed-0.0.13.0.tar.gz) = d13068abb0bd22c5d118164734a097dc591977b2c7561d912af9097803c6e1ea -SIZE (cabal/file-embed-0.0.13.0/file-embed-0.0.13.0.tar.gz) = 6657 -SHA256 (cabal/ghc-events-0.15.1/ghc-events-0.15.1.tar.gz) = bf5f017d4f462f2116610f55684cacaff94dbf4fbbd22497a9a30c603e31709a -SIZE (cabal/ghc-events-0.15.1/ghc-events-0.15.1.tar.gz) = 1482088 -SHA256 (cabal/glib-0.13.8.1/glib-0.13.8.1.tar.gz) = dcd028ac6d4a7476c14585be1d845b8c4aea4c389f34e809ed1a8df7425c1a9c -SIZE (cabal/glib-0.13.8.1/glib-0.13.8.1.tar.gz) = 39557 -SHA256 (cabal/gtk-0.15.5/gtk-0.15.5.tar.gz) = 4219d8b24c26a0e35c070eecae3b7e582bc2648b955d8e356c15ea823057dd24 -SIZE (cabal/gtk-0.15.5/gtk-0.15.5.tar.gz) = 678555 -SHA256 (cabal/gtk2hs-buildtools-0.13.8.0/gtk2hs-buildtools-0.13.8.0.tar.gz) = 8dbb7dbf004e45e48aa77153bc780120d99a329c6bde76618d46b2a4f3bb8598 -SIZE (cabal/gtk2hs-buildtools-0.13.8.0/gtk2hs-buildtools-0.13.8.0.tar.gz) = 178465 +SHA256 (cabal/alex-3.2.7.1/alex-3.2.7.1.tar.gz) = 9bd2f1a27e8f1b2ffdb5b2fbd3ed82b6f0e85191459a1b24ffcbef4e68a81bec +SIZE (cabal/alex-3.2.7.1/alex-3.2.7.1.tar.gz) = 108229 +SHA256 (cabal/cairo-0.13.8.2/cairo-0.13.8.2.tar.gz) = d40b060d1104715b1cd1deaade9e43aa7ca24a31c78260bc5d76a7327c8d02eb +SIZE (cabal/cairo-0.13.8.2/cairo-0.13.8.2.tar.gz) = 53034 +SHA256 (cabal/file-embed-0.0.15.0/file-embed-0.0.15.0.tar.gz) = f066b85d537a20252faa59489f6a854e4e8f39080f08730c9e195e418cec5bdd +SIZE (cabal/file-embed-0.0.15.0/file-embed-0.0.15.0.tar.gz) = 7119 +SHA256 (cabal/ghc-events-0.17.0.3/ghc-events-0.17.0.3.tar.gz) = bb8cd1998227a77d8874c2982fbf8e9ef210d80f7ae9c9bf3f6d90cdbce8a054 +SIZE (cabal/ghc-events-0.17.0.3/ghc-events-0.17.0.3.tar.gz) = 1498692 +SHA256 (cabal/gio-0.13.8.2/gio-0.13.8.2.tar.gz) = b3f5ad488523a5569f410eda582a265c5d7331eee26cd116aada0c68d08100ba +SIZE (cabal/gio-0.13.8.2/gio-0.13.8.2.tar.gz) = 70151 +SHA256 (cabal/glib-0.13.8.2/glib-0.13.8.2.tar.gz) = 86b4bdc832079b6411387a28f0c0bdef3fbe7911a223b8be5257f43bfbac0a27 +SIZE (cabal/glib-0.13.8.2/glib-0.13.8.2.tar.gz) = 39403 +SHA256 (cabal/gtk-0.15.7/gtk-0.15.7.tar.gz) = f6a62f92e63b447e7d4e5bbd3c05faa08c2f605b2a0adf42138f50f42f766f18 +SIZE (cabal/gtk-0.15.7/gtk-0.15.7.tar.gz) = 678934 +SHA256 (cabal/gtk2hs-buildtools-0.13.8.3/gtk2hs-buildtools-0.13.8.3.tar.gz) = 3b0344e4ce5774ca50f0fa5e0c930f282ca84c50317e6f1148325528c6069539 +SIZE (cabal/gtk2hs-buildtools-0.13.8.3/gtk2hs-buildtools-0.13.8.3.tar.gz) = 178555 SHA256 (cabal/happy-1.20.0/happy-1.20.0.tar.gz) = 3b1d3a8f93a2723b554d9f07b2cd136be1a7b2fcab1855b12b7aab5cbac8868c SIZE (cabal/happy-1.20.0/happy-1.20.0.tar.gz) = 184515 -SHA256 (cabal/hashable-1.3.1.0/hashable-1.3.1.0.tar.gz) = 8061823a4ac521b53912edcba36b956f3159cb885b07ec119af295a6568ca7c4 -SIZE (cabal/hashable-1.3.1.0/hashable-1.3.1.0.tar.gz) = 21424 -SHA256 (cabal/hashtables-1.2.4.1/hashtables-1.2.4.1.tar.gz) = 0ac3bf86030eeb1dd0f3d0cd1967cb610ee9564251622371fda560bc4e7def6d -SIZE (cabal/hashtables-1.2.4.1/hashtables-1.2.4.1.tar.gz) = 58425 -SHA256 (cabal/pango-0.13.8.1/pango-0.13.8.1.tar.gz) = 40a67a56687969cee9dd4cc94a8a3d0beb5ea687c8a2f3da552feb915453c82f -SIZE (cabal/pango-0.13.8.1/pango-0.13.8.1.tar.gz) = 52671 -SHA256 (cabal/primitive-0.7.1.0/primitive-0.7.1.0.tar.gz) = 6bebecfdf2a57787d9fd5231bfd612b65a92edd7b33a973b2a0f11312b89a3f0 -SIZE (cabal/primitive-0.7.1.0/primitive-0.7.1.0.tar.gz) = 52184 -SHA256 (cabal/primitive-0.7.1.0/revision/2.cabal) = f6357d5720c1c665096c3e011467daf443198b786a708d2ff926958a24d508d4 -SIZE (cabal/primitive-0.7.1.0/revision/2.cabal) = 2728 -SHA256 (cabal/random-1.2.0/random-1.2.0.tar.gz) = e4519cf7c058bfd5bdbe4acc782284acc9e25e74487208619ca83cbcd63fb9de -SIZE (cabal/random-1.2.0/random-1.2.0.tar.gz) = 37889 -SHA256 (cabal/random-1.2.0/revision/5.cabal) = 30d72df4cc1d2fe2d445c88f0ee9d21965af7ce86660c43a6c32a6a1d90d51c9 -SIZE (cabal/random-1.2.0/revision/5.cabal) = 6094 -SHA256 (cabal/splitmix-0.1.0.3/splitmix-0.1.0.3.tar.gz) = 46009f4b000c9e6613377767b8718bf38476469f2a8e2162d98cc246882d5a35 -SIZE (cabal/splitmix-0.1.0.3/splitmix-0.1.0.3.tar.gz) = 20754 +SHA256 (cabal/happy-1.20.0/revision/1.cabal) = 5d47dc221a9fe964e36aaaa2e1ab7e8f085a225fd6528d6eff310b92360bbe99 +SIZE (cabal/happy-1.20.0/revision/1.cabal) = 5732 +SHA256 (cabal/hashable-1.4.0.2/hashable-1.4.0.2.tar.gz) = 83606edd356d914c075ecd44f6d5fe91a3b186aa0683c8dd8c9a7e8e22a47600 +SIZE (cabal/hashable-1.4.0.2/hashable-1.4.0.2.tar.gz) = 25528 +SHA256 (cabal/hashtables-1.3/hashtables-1.3.tar.gz) = af785a6d13842ebbd804b0ec174dd957a2591b224434e3ce883f537321f90dd3 +SIZE (cabal/hashtables-1.3/hashtables-1.3.tar.gz) = 58599 +SHA256 (cabal/pango-0.13.8.2/pango-0.13.8.2.tar.gz) = 85530fa057b227d5975e2f6faefe1d1c0b8e3b4dd71659d7c5936e02d262cdd6 +SIZE (cabal/pango-0.13.8.2/pango-0.13.8.2.tar.gz) = 52670 +SHA256 (cabal/primitive-0.7.3.0/primitive-0.7.3.0.tar.gz) = 3c0cfda67f1ee6f7f65108ad6f973b5bbb35ddba34b3c87746a7448f787501dc +SIZE (cabal/primitive-0.7.3.0/primitive-0.7.3.0.tar.gz) = 55161 +SHA256 (cabal/random-1.2.1.1/random-1.2.1.1.tar.gz) = 3e1272f7ed6a4d7bd1712b90143ec326fee9b225789222379fea20a9c90c9b76 +SIZE (cabal/random-1.2.1.1/random-1.2.1.1.tar.gz) = 47109 +SHA256 (cabal/splitmix-0.1.0.4/splitmix-0.1.0.4.tar.gz) = 6d065402394e7a9117093dbb4530a21342c9b1e2ec509516c8a8d0ffed98ecaa +SIZE (cabal/splitmix-0.1.0.4/splitmix-0.1.0.4.tar.gz) = 22382 SHA256 (cabal/temporary-1.3/temporary-1.3.tar.gz) = 8c442993694b5ffca823ce864af95bd2841fb5264ee511c61cf48cc71d879890 SIZE (cabal/temporary-1.3/temporary-1.3.tar.gz) = 5686 SHA256 (cabal/utf8-string-1.0.2/utf8-string-1.0.2.tar.gz) = ee48deada7600370728c4156cb002441de770d0121ae33a68139a9ed9c19b09a SIZE (cabal/utf8-string-1.0.2/utf8-string-1.0.2.tar.gz) = 10726 -SHA256 (cabal/vector-0.12.2.0/vector-0.12.2.0.tar.gz) = 17ab0b84c87859333ff681bb9f768368779677925bd589ff4baa05be3fd26b50 -SIZE (cabal/vector-0.12.2.0/vector-0.12.2.0.tar.gz) = 142213 +SHA256 (cabal/vector-0.12.3.1/vector-0.12.3.1.tar.gz) = fb4a53c02bd4d7fdf155c0604da9a5bb0f3b3bfce5d9960aea11c2ae235b9f35 +SIZE (cabal/vector-0.12.3.1/vector-0.12.3.1.tar.gz) = 151420 +SHA256 (cabal/vector-0.12.3.1/revision/1.cabal) = 040210919e5ce454dcee3320f77803da3dbda579c8428dc25ff0155732234808 +SIZE (cabal/vector-0.12.3.1/revision/1.cabal) = 7946 diff --git a/devel/hs-threadscope/files/patch-GUI_SaveAs.hs b/devel/hs-threadscope/files/patch-GUI_SaveAs.hs new file mode 100644 index 000000000000..0f6fa7423346 --- /dev/null +++ b/devel/hs-threadscope/files/patch-GUI_SaveAs.hs @@ -0,0 +1,11 @@ +--- GUI/SaveAs.hs.orig 2001-09-09 01:46:40 UTC ++++ GUI/SaveAs.hs +@@ -27,7 +27,7 @@ saveAs :: HECs -> ViewParameters -> Double -> DrawingA + + saveAs :: HECs -> ViewParameters -> Double -> DrawingArea + -> (Int, Int, Render ()) +-saveAs hecs params' @ViewParameters{xScaleAreaHeight, width, ++saveAs hecs params'@ViewParameters{xScaleAreaHeight, width, + height = oldHeight {-, histogramHeight-}} + yScaleAreaWidth yScaleArea = + let histTotalHeight = histXScaleHeight -- + histogramHeight diff --git a/devel/hs-threadscope/files/patch-gtk2hs-buildtools-0.13.5.0_c2hs_toplevel_C2HSConfig.hs b/devel/hs-threadscope/files/patch-gtk2hs-buildtools-0.13.5.0_c2hs_toplevel_C2HSConfig.hs index 32e7b797c270..769b64d3c9c6 100644 --- a/devel/hs-threadscope/files/patch-gtk2hs-buildtools-0.13.5.0_c2hs_toplevel_C2HSConfig.hs +++ b/devel/hs-threadscope/files/patch-gtk2hs-buildtools-0.13.5.0_c2hs_toplevel_C2HSConfig.hs @@ -1,5 +1,5 @@ --- gtk2hs-buildtools-0.13.8.0/c2hs/toplevel/C2HSConfig.hs.orig 1970-01-01 00:00:00 UTC -+++ _cabal_deps/gtk2hs-buildtools-0.13.8.0/c2hs/toplevel/C2HSConfig.hs ++++ _cabal_deps/gtk2hs-buildtools-0.13.8.3/c2hs/toplevel/C2HSConfig.hs @@ -24,7 +24,7 @@ -- Configuration options; largely set by `configure'. -- diff --git a/devel/hs-threadscope/files/patch-threadscope.cabal b/devel/hs-threadscope/files/patch-threadscope.cabal new file mode 100644 index 000000000000..44df6937eeab --- /dev/null +++ b/devel/hs-threadscope/files/patch-threadscope.cabal @@ -0,0 +1,19 @@ +--- threadscope.cabal.orig 2001-09-09 01:46:40 UTC ++++ threadscope.cabal +@@ -57,14 +57,14 @@ Executable threadscope + array < 0.6, + mtl < 2.3, + filepath < 1.5, +- ghc-events >= 0.13 && < 0.16, ++ ghc-events >= 0.13, + containers >= 0.2 && < 0.7, + deepseq >= 1.1, + text < 1.3, + time >= 1.1 && < 1.12, + bytestring < 0.12, + file-embed < 0.1, +- template-haskell < 2.17, ++ template-haskell, + temporary >= 1.1 && < 1.4 + + include-dirs: include
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202207071025.267APL3S095366>