Fri Dec 29 14:50:04 2023 UTC (146d)
alacritty: remove hardcoded path and major version for libxcb.so


(tnn)
diff -r1.18 -r1.19 pkgsrc/x11/alacritty/distinfo
diff -r0 -r1.1 pkgsrc/x11/alacritty/patches/patch-.._vendor_x11rb-0.13.0_src_xcb__ffi_raw__ffi_ffi.rs
cvs diff -r1.18 -r1.19 pkgsrc/x11/alacritty/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/alacritty/distinfo 2023/12/28 20:40:34 1.18
+++ pkgsrc/x11/alacritty/distinfo 2023/12/29 14:50:03 1.19
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.18 2023/12/28 20:40:34 pin Exp $ 1$NetBSD: distinfo,v 1.19 2023/12/29 14:50:03 tnn Exp $
2 2
3BLAKE2s (adler-1.0.2.crate) = f263779d752af886455fc0f42c997893fb1a09edcf1bd2980605251c2e3602aa 3BLAKE2s (adler-1.0.2.crate) = f263779d752af886455fc0f42c997893fb1a09edcf1bd2980605251c2e3602aa
4SHA512 (adler-1.0.2.crate) = 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1 4SHA512 (adler-1.0.2.crate) = 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1
5Size (adler-1.0.2.crate) = 12778 bytes 5Size (adler-1.0.2.crate) = 12778 bytes
6BLAKE2s (ahash-0.8.6.crate) = c7ecdf122e7a34429eb48e7855ae47923b0f263167ab871b542c96fa43097698 6BLAKE2s (ahash-0.8.6.crate) = c7ecdf122e7a34429eb48e7855ae47923b0f263167ab871b542c96fa43097698
7SHA512 (ahash-0.8.6.crate) = 46428b27e96be1f30058b9383a94988beeb5064dfb4df04d6959b451d0c77ef69fc51f07fdf9511ab9728295eb6beee7783c31a2297f9e473fc537883e722b73 7SHA512 (ahash-0.8.6.crate) = 46428b27e96be1f30058b9383a94988beeb5064dfb4df04d6959b451d0c77ef69fc51f07fdf9511ab9728295eb6beee7783c31a2297f9e473fc537883e722b73
8Size (ahash-0.8.6.crate) = 42780 bytes 8Size (ahash-0.8.6.crate) = 42780 bytes
9BLAKE2s (aho-corasick-1.1.2.crate) = 340a895627e98ae84ce5dcbeb7f441ea2705511ebf01c2fee3ac71c34f1573cd 9BLAKE2s (aho-corasick-1.1.2.crate) = 340a895627e98ae84ce5dcbeb7f441ea2705511ebf01c2fee3ac71c34f1573cd
10SHA512 (aho-corasick-1.1.2.crate) = 61ef5092673ab5a60bec4e92df28a91fe6171ba59d5829ffe41fc55aff3bfb755533a4ad53dc7bf827a0b789fcce593b17e69d1fcfb3694f06ed3b1bd535d40c 10SHA512 (aho-corasick-1.1.2.crate) = 61ef5092673ab5a60bec4e92df28a91fe6171ba59d5829ffe41fc55aff3bfb755533a4ad53dc7bf827a0b789fcce593b17e69d1fcfb3694f06ed3b1bd535d40c
11Size (aho-corasick-1.1.2.crate) = 183136 bytes 11Size (aho-corasick-1.1.2.crate) = 183136 bytes
12BLAKE2s (alacritty-0.13.0.tar.gz) = af65c54c5c259dd2fd583010dee2017b902f52dd477b33ae8a297c02641bb247 12BLAKE2s (alacritty-0.13.0.tar.gz) = af65c54c5c259dd2fd583010dee2017b902f52dd477b33ae8a297c02641bb247
13SHA512 (alacritty-0.13.0.tar.gz) = 135d78f699c2496f4aafe4eee14832ffc7835a88fb0a7740769fad6323dab475e2dfd78f583b0febbbe28aea714d5da98b661c6ddeaa4519dc169c90e6863855 13SHA512 (alacritty-0.13.0.tar.gz) = 135d78f699c2496f4aafe4eee14832ffc7835a88fb0a7740769fad6323dab475e2dfd78f583b0febbbe28aea714d5da98b661c6ddeaa4519dc169c90e6863855
14Size (alacritty-0.13.0.tar.gz) = 1628187 bytes 14Size (alacritty-0.13.0.tar.gz) = 1628187 bytes
@@ -755,13 +755,14 @@ SHA512 (xkbcommon-dl-0.4.1.crate) = 3666 @@ -755,13 +755,14 @@ SHA512 (xkbcommon-dl-0.4.1.crate) = 3666
755Size (xkbcommon-dl-0.4.1.crate) = 5832 bytes 755Size (xkbcommon-dl-0.4.1.crate) = 5832 bytes
756BLAKE2s (xkeysym-0.2.0.crate) = 0a00258bfc5fca524969f65894651f2ef3ecde090401e06e20ccef281dd650c6 756BLAKE2s (xkeysym-0.2.0.crate) = 0a00258bfc5fca524969f65894651f2ef3ecde090401e06e20ccef281dd650c6
757SHA512 (xkeysym-0.2.0.crate) = 7dc5893f91aacafacce66f14ec27a6c792e7bf82c116e6d2221d2ed5ba3ef2889243f4af3f407d0370b46db6ac27568708b431d59b82c5d056f89d11e42ae44f 757SHA512 (xkeysym-0.2.0.crate) = 7dc5893f91aacafacce66f14ec27a6c792e7bf82c116e6d2221d2ed5ba3ef2889243f4af3f407d0370b46db6ac27568708b431d59b82c5d056f89d11e42ae44f
758Size (xkeysym-0.2.0.crate) = 101431 bytes 758Size (xkeysym-0.2.0.crate) = 101431 bytes
759BLAKE2s (xml-rs-0.8.19.crate) = 0c6b0326618e912691efd062c15a4a32daa26bda50c6050c945ec1f6c333e0b9 759BLAKE2s (xml-rs-0.8.19.crate) = 0c6b0326618e912691efd062c15a4a32daa26bda50c6050c945ec1f6c333e0b9
760SHA512 (xml-rs-0.8.19.crate) = a46796ed542a7396e760ee327ec191e96d61b3fd8b78cef2ab2da75c5290433f422a34cabef20267e8a6a162e0a48fc8f81cd66a5dcf997ddd539e55d9130199 760SHA512 (xml-rs-0.8.19.crate) = a46796ed542a7396e760ee327ec191e96d61b3fd8b78cef2ab2da75c5290433f422a34cabef20267e8a6a162e0a48fc8f81cd66a5dcf997ddd539e55d9130199
761Size (xml-rs-0.8.19.crate) = 54051 bytes 761Size (xml-rs-0.8.19.crate) = 54051 bytes
762BLAKE2s (zerocopy-0.7.32.crate) = 131adc1fd951dbb8510ee4f740a36ec85edc090c820c9a456685686eb60d78b7 762BLAKE2s (zerocopy-0.7.32.crate) = 131adc1fd951dbb8510ee4f740a36ec85edc090c820c9a456685686eb60d78b7
763SHA512 (zerocopy-0.7.32.crate) = 6729b05eb88029555b88c75feff4f8bc28ad9675edb02b07486381f775c8650c95e2e59612906bd9c34c5e390fd339857ca91573ee9f9ca7948572cff4171c82 763SHA512 (zerocopy-0.7.32.crate) = 6729b05eb88029555b88c75feff4f8bc28ad9675edb02b07486381f775c8650c95e2e59612906bd9c34c5e390fd339857ca91573ee9f9ca7948572cff4171c82
764Size (zerocopy-0.7.32.crate) = 151096 bytes 764Size (zerocopy-0.7.32.crate) = 151096 bytes
765BLAKE2s (zerocopy-derive-0.7.32.crate) = a5052917736e441532252adebab250b240e1b3ce644f26e0838a2041827ca08a 765BLAKE2s (zerocopy-derive-0.7.32.crate) = a5052917736e441532252adebab250b240e1b3ce644f26e0838a2041827ca08a
766SHA512 (zerocopy-derive-0.7.32.crate) = 3ce8528871fd18d6abe92b98503927451d25791c9c4af0ba39a3b6ba2006030bdc137084d080e9b1ac8b5ddf5f2121e0a3ef34bb2033a040f2c72c8149a9fc0d 766SHA512 (zerocopy-derive-0.7.32.crate) = 3ce8528871fd18d6abe92b98503927451d25791c9c4af0ba39a3b6ba2006030bdc137084d080e9b1ac8b5ddf5f2121e0a3ef34bb2033a040f2c72c8149a9fc0d
767Size (zerocopy-derive-0.7.32.crate) = 37623 bytes 767Size (zerocopy-derive-0.7.32.crate) = 37623 bytes
 768SHA1 (patch-.._vendor_x11rb-0.13.0_src_xcb__ffi_raw__ffi_ffi.rs) = 0775cd32981e746eb9d39bd245398fb11dd65bae
File Added: pkgsrc/x11/alacritty/patches/patch-.._vendor_x11rb-0.13.0_src_xcb__ffi_raw__ffi_ffi.rs
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)