CVS commit: pkgsrc/x11/alacritty

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sun Jun 20 08:51:19 UTC 2021

Modified Files:
        pkgsrc/x11/alacritty: Makefile distinfo
Added Files:
        pkgsrc/x11/alacritty/patches: patch-vendor_x11-dl_src_link.rs

Log Message:
alacritty: work around XIM error on NetBSD with native X11

from Iku Iwasa


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/x11/alacritty/Makefile \
    pkgsrc/x11/alacritty/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/alacritty/patches/patch-vendor_x11-dl_src_link.rs

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/alacritty/Makefile
diff -u pkgsrc/x11/alacritty/Makefile:1.5 pkgsrc/x11/alacritty/Makefile:1.6
--- pkgsrc/x11/alacritty/Makefile:1.5   Tue May 25 16:18:27 2021
+++ pkgsrc/x11/alacritty/Makefile       Sun Jun 20 08:51:19 2021
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2021/05/25 16:18:27 pin Exp $
+# $NetBSD: Makefile,v 1.6 2021/06/20 08:51:19 tnn Exp $
 
 DISTNAME=      alacritty-0.8.0
+PKGREVISION=   1
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=alacritty/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
Index: pkgsrc/x11/alacritty/distinfo
diff -u pkgsrc/x11/alacritty/distinfo:1.5 pkgsrc/x11/alacritty/distinfo:1.6
--- pkgsrc/x11/alacritty/distinfo:1.5   Tue May 25 16:18:27 2021
+++ pkgsrc/x11/alacritty/distinfo       Sun Jun 20 08:51:19 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2021/05/25 16:18:27 pin Exp $
+$NetBSD: distinfo,v 1.6 2021/06/20 08:51:19 tnn Exp $
 
 SHA1 (ab_glyph_rasterizer-0.1.4.crate) = 0ef50d98583486c91fc4d40f2bc819ac2873b139
 RMD160 (ab_glyph_rasterizer-0.1.4.crate) = c3bfaccc51e6d20119128cac07d4a98474fca22f
@@ -764,3 +764,4 @@ SHA1 (yaml-rust-0.4.5.crate) = de9261ecb
 RMD160 (yaml-rust-0.4.5.crate) = 2148b0245a840e26646ae4b0c5f394fd8203ad5b
 SHA512 (yaml-rust-0.4.5.crate) = 7621dc8dfd5e7d4a7a8805b2a7e8319b63b852367655f2359d4e3e8fec6c4fad52d75c46ce1161e4c674eac0780b757ce9d34e664e304d8d2beec7afa0363ea0
 Size (yaml-rust-0.4.5.crate) = 47783 bytes
+SHA1 (patch-vendor_x11-dl_src_link.rs) = 773a9ad0ffdbc852a0fbc375475f1a6fa8101e73

Added files:

Index: pkgsrc/x11/alacritty/patches/patch-vendor_x11-dl_src_link.rs
diff -u /dev/null pkgsrc/x11/alacritty/patches/patch-vendor_x11-dl_src_link.rs:1.1
--- /dev/null   Sun Jun 20 08:51:19 2021
+++ pkgsrc/x11/alacritty/patches/patch-vendor_x11-dl_src_link.rs        Sun Jun 20 08:51:19 2021
@@ -0,0 +1,16 @@
+$NetBSD: patch-vendor_x11-dl_src_link.rs,v 1.1 2021/06/20 08:51:19 tnn Exp $
+
+Work around XIM error on NetBSD with native X11.
+https://mail-index.netbsd.org/tech-x11/2021/06/20/msg002210.html
+
+--- ../vendor/x11-dl-2.18.5/src/link.rs.orig   2020-01-26 08:06:45.000000000 +0000
++++ ../vendor/x11-dl-2.18.5/src/link.rs
+@@ -87,7 +87,7 @@ impl DynamicLibrary {
+         },
+       };
+ 
+-      let handle = libc::dlopen(cname.as_ptr(), libc::RTLD_LAZY);
++      let handle = libc::dlopen(cname.as_ptr(), libc::RTLD_LAZY | libc::RTLD_GLOBAL);
+ 
+       if handle.is_null() {
+         let msg = libc::dlerror();