CVS commit: pkgsrc/x11/alacritty

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

Module Name:    pkgsrc
Committed By:   tnn
Date:           Fri Dec 29 14:50:04 UTC 2023

Modified Files:
        pkgsrc/x11/alacritty: distinfo
Added Files:
        pkgsrc/x11/alacritty/patches:
            patch-.._vendor_x11rb-0.13.0_src_xcb__ffi_raw__ffi_ffi.rs

Log Message:
alacritty: remove hardcoded path and major version for libxcb.so


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/x11/alacritty/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/alacritty/patches/patch-.._vendor_x11rb-0.13.0_src_xcb__ffi_raw__ffi_ffi.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/distinfo
diff -u pkgsrc/x11/alacritty/distinfo:1.18 pkgsrc/x11/alacritty/distinfo:1.19
--- pkgsrc/x11/alacritty/distinfo:1.18  Thu Dec 28 20:40:34 2023
+++ pkgsrc/x11/alacritty/distinfo       Fri Dec 29 14:50:03 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18 2023/12/28 20:40:34 pin Exp $
+$NetBSD: distinfo,v 1.19 2023/12/29 14:50:03 tnn Exp $
 
 BLAKE2s (adler-1.0.2.crate) = f263779d752af886455fc0f42c997893fb1a09edcf1bd2980605251c2e3602aa
 SHA512 (adler-1.0.2.crate) = 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1
@@ -765,3 +765,4 @@ Size (zerocopy-0.7.32.crate) = 151096 by
 BLAKE2s (zerocopy-derive-0.7.32.crate) = a5052917736e441532252adebab250b240e1b3ce644f26e0838a2041827ca08a
 SHA512 (zerocopy-derive-0.7.32.crate) = 3ce8528871fd18d6abe92b98503927451d25791c9c4af0ba39a3b6ba2006030bdc137084d080e9b1ac8b5ddf5f2121e0a3ef34bb2033a040f2c72c8149a9fc0d
 Size (zerocopy-derive-0.7.32.crate) = 37623 bytes
+SHA1 (patch-.._vendor_x11rb-0.13.0_src_xcb__ffi_raw__ffi_ffi.rs) = 0775cd32981e746eb9d39bd245398fb11dd65bae

Added files:

Index: pkgsrc/x11/alacritty/patches/patch-.._vendor_x11rb-0.13.0_src_xcb__ffi_raw__ffi_ffi.rs
diff -u /dev/null pkgsrc/x11/alacritty/patches/patch-.._vendor_x11rb-0.13.0_src_xcb__ffi_raw__ffi_ffi.rs:1.1
--- /dev/null   Fri Dec 29 14:50:04 2023
+++ pkgsrc/x11/alacritty/patches/patch-.._vendor_x11rb-0.13.0_src_xcb__ffi_raw__ffi_ffi.rs      Fri Dec 29 14:50:04 2023
@@ -0,0 +1,27 @@
+NetBSD$
+
+Remove hard-coded libxcb.so paths. pkgsrc links with the correct rpath.
+Needed for X11_TYPE=modular.
+
+--- ../vendor/x11rb-0.13.0/src/xcb_ffi/raw_ffi/ffi.rs.orig     2023-12-29 14:35:22.503901115 +0000
++++ ../vendor/x11rb-0.13.0/src/xcb_ffi/raw_ffi/ffi.rs
+@@ -35,18 +35,7 @@ pub(crate) mod libxcb_library {
+             #[cfg(not(unix))]
+             compile_error!("dl-libxcb feature is not supported on non-unix");
+ 
+-            #[cfg(all(unix, target_os = "linux"))]
+-            const LIB_NAME: &str = "libxcb.so.1";
+-
+-            // libtool turns -version-info differently into SONAMES on NetBSD.
+-            // Also, the library is apparently not in the default search path, hence use a full path.
+-            #[cfg(all(unix, target_os = "netbsd"))]
+-            const LIB_NAME: &str = "/usr/X11R7/lib/libxcb.so.2";
+-
+-            // If we do not know anything, just assume libxcb.so and hope for the best.
+-            // This is actually the right thing to do on OpenBSD since the dynamic linker then does
+-            // some magic to find the right SONAME.
+-            #[cfg(all(unix, not(any(target_os = "linux", target_os = "netbsd"))))]
++            #[cfg(unix)]
+             const LIB_NAME: &str = "libxcb.so";
+ 
+             let library = libloading::Library::new(LIB_NAME)