Skip to content

Commit

Permalink
Update to X11-1.10.2
Browse files Browse the repository at this point in the history 
1.10.2 (2021-10-24)
* Restored compatibility with GHC 7.10 (and possibly even older) (#80)

1.10.1 (2021-08-15)
* Fixed possible high CPU usage of some blocking calls with the threaded
  RTS (#78)

1.10 (2021-05-31)
* Added setClientMessageEvent' (#71)
* Fixed type of xrrUpdateConfiguration (#72)
* Fixed bottom when deserializing XRRNotifyEvent in getEvent (#72)
* Added xrrGetMonitors and XRRMonitorInfo (#42)
* Added setClassHint (#76)
* Added a few missing event mask fields to WindowAttributes (#77)
  • Loading branch information
@depressed-pho
depressed-pho committed Feb 11, 2022
1 parent ce6d17c commit 95b74e4
Show file tree
Hide file tree
Showing 4 changed files with 39 additions and 25 deletions.
12 changes: 2 additions & 10 deletions x11/hs-X11/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,12 @@
# $NetBSD: Makefile,v 1.10 2022/01/18 02:48:33 pho Exp $
# $NetBSD: Makefile,v 1.11 2022/02/11 15:53:34 pho Exp $

DISTNAME= X11-1.9.2
PKGREVISION= 2
DISTNAME= X11-1.10.2
CATEGORIES= x11 graphics

MAINTAINER= esg@sdf.lonestar.org
COMMENT= Haskell binding to the X11 graphics library
LICENSE= modified-bsd

# Work around a Cabal bug. It ignores "ld-options" in X11.buildinfo
# while linking shared libraries:
# https://github.com/haskell/cabal/issues/4925
HASKELL_ENABLE_SHARED_LIBRARY= no
# Note to devs: when you remove this please also remove it from
# ../../x11/hs-X11/buildlink3.mk

.include "../../mk/haskell.mk"
.include "../../devel/hs-data-default/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
Expand Down
31 changes: 30 additions & 1 deletion x11/hs-X11/PLIST
View file
Original file line number Diff line number Diff line change
@@ -1,67 +1,96 @@
@comment $NetBSD: PLIST,v 1.4 2021/04/24 19:02:53 pho Exp $
@comment $NetBSD: PLIST,v 1.5 2022/02/11 15:53:34 pho Exp $
lib/X11-${PKGVERSION}/${HS_VERSION}/package-description
lib/X11-${PKGVERSION}/${HS_VERSION}/package-id
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11.dyn_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11.p_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11/ExtraTypes.dyn_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11/ExtraTypes.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11/ExtraTypes.p_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11/ExtraTypes/AP.dyn_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11/ExtraTypes/AP.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11/ExtraTypes/AP.p_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11/ExtraTypes/DEC.dyn_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11/ExtraTypes/DEC.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11/ExtraTypes/DEC.p_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11/ExtraTypes/HP.dyn_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11/ExtraTypes/HP.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11/ExtraTypes/HP.p_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11/ExtraTypes/Sun.dyn_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11/ExtraTypes/Sun.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11/ExtraTypes/Sun.p_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11/ExtraTypes/XF86.dyn_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11/ExtraTypes/XF86.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11/ExtraTypes/XF86.p_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11/ExtraTypes/XorgDefault.dyn_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11/ExtraTypes/XorgDefault.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11/ExtraTypes/XorgDefault.p_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11/Types.dyn_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11/Types.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11/Types.p_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11/XScreenSaver.dyn_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11/XScreenSaver.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11/XScreenSaver.p_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11/Xinerama.dyn_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11/Xinerama.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11/Xinerama.p_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11/Xlib.dyn_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11/Xlib.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11/Xlib.p_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11/Xlib/Atom.dyn_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11/Xlib/Atom.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11/Xlib/Atom.p_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11/Xlib/Color.dyn_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11/Xlib/Color.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11/Xlib/Color.p_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11/Xlib/Context.dyn_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11/Xlib/Context.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11/Xlib/Context.p_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11/Xlib/Cursor.dyn_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11/Xlib/Cursor.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11/Xlib/Cursor.p_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11/Xlib/Display.dyn_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11/Xlib/Display.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11/Xlib/Display.p_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11/Xlib/Event.dyn_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11/Xlib/Event.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11/Xlib/Event.p_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11/Xlib/Extras.dyn_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11/Xlib/Extras.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11/Xlib/Extras.p_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11/Xlib/Font.dyn_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11/Xlib/Font.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11/Xlib/Font.p_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11/Xlib/Image.dyn_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11/Xlib/Image.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11/Xlib/Image.p_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11/Xlib/Internal.dyn_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11/Xlib/Internal.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11/Xlib/Internal.p_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11/Xlib/Misc.dyn_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11/Xlib/Misc.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11/Xlib/Misc.p_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11/Xlib/Region.dyn_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11/Xlib/Region.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11/Xlib/Region.p_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11/Xlib/Screen.dyn_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11/Xlib/Screen.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11/Xlib/Screen.p_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11/Xlib/Types.dyn_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11/Xlib/Types.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11/Xlib/Types.p_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11/Xlib/Window.dyn_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11/Xlib/Window.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11/Xlib/Window.p_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11/Xrandr.dyn_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11/Xrandr.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Graphics/X11/Xrandr.p_hi
lib/${HS_PLATFORM}/${HS_PKGID}/include/HsAllKeysyms.h
lib/${HS_PLATFORM}/${HS_PKGID}/include/HsXlib.h
lib/${HS_PLATFORM}/${HS_PKGID}/include/XlibExtras.h
lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}.a
lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}_p.a
lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so
share/doc/${HS_PLATFORM}/X11-${PKGVERSION}/LICENSE
share/doc/${HS_PLATFORM}/X11-${PKGVERSION}/html/Graphics-X11-ExtraTypes-AP.html
share/doc/${HS_PLATFORM}/X11-${PKGVERSION}/html/Graphics-X11-ExtraTypes-DEC.html
Expand Down
13 changes: 3 additions & 10 deletions x11/hs-X11/buildlink3.mk
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,14 @@
# $NetBSD: buildlink3.mk,v 1.10 2022/01/18 02:48:33 pho Exp $
# $NetBSD: buildlink3.mk,v 1.11 2022/02/11 15:53:34 pho Exp $

BUILDLINK_TREE+= hs-X11

.if !defined(HS_X11_BUILDLINK3_MK)
HS_X11_BUILDLINK3_MK:=

BUILDLINK_API_DEPENDS.hs-X11+= hs-X11>=1.9.2
BUILDLINK_ABI_DEPENDS.hs-X11+= hs-X11>=1.9.2nb2
BUILDLINK_API_DEPENDS.hs-X11+= hs-X11>=1.10.2
BUILDLINK_ABI_DEPENDS.hs-X11+= hs-X11>=1.10.2
BUILDLINK_PKGSRCDIR.hs-X11?= ../../x11/hs-X11

# Work around a Cabal bug. It ignores "ld-options" in X11.buildinfo
# while linking shared libraries:
# https://github.com/haskell/cabal/issues/4925
HASKELL_ENABLE_SHARED_LIBRARY= no
# Note to devs: when you remove this please also remove it from
# ../../x11/hs-X11/Makefile

.include "../../devel/hs-data-default/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXrandr/buildlink3.mk"
Expand Down
8 changes: 4 additions & 4 deletions x11/hs-X11/distinfo
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
$NetBSD: distinfo,v 1.6 2021/10/26 11:33:54 nia Exp $
$NetBSD: distinfo,v 1.7 2022/02/11 15:53:34 pho Exp $

BLAKE2s (X11-1.9.2.tar.gz) = 09c477b46de158974b90737ce2a6c30f9a58ff562d6073b534166753af49852e
SHA512 (X11-1.9.2.tar.gz) = e9658c33b6dcbb6a42f1cc4a8976365506af94ddc15c32f73205b453934ef3232f3b383f8365b6aa6e69b51acfda4a0f3a8038f3164523b33781139a80582a41
Size (X11-1.9.2.tar.gz) = 190757 bytes
BLAKE2s (X11-1.10.2.tar.gz) = 8aeba92956ff963b392fb5ba43f1b25154ea11fac7813cc58a438c3f62cec338
SHA512 (X11-1.10.2.tar.gz) = 5013dc359e081900193efd201c38c41ca73bc8dae3610e8e3b46e42aad7ae4a5917ecd3219d77e40141be7179963aaa2454032c820945e93ff4310ef359b2df4
Size (X11-1.10.2.tar.gz) = 192634 bytes
SHA1 (patch-Graphics_X11_Xlib_Event.hsc) = 271c3cc4c3106fa6eaacc36c336e5f3aa73508e4

0 comments on commit 95b74e4

Please sign in to comment.