openbsd
/
ports
mirror of https://github.com/openbsd/ports.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

devel/czkawka: actually remove patch (rm is not enough...), switch to 

MODCARGO_WANTLIB, drop dependency on devel/pango, which is pulled in
via gtk+4 and sync WANTLIB for -gui.

No bump since the patch left behind broke the build
This commit is contained in:
tb 2023-06-11 10:13:36 +00:00
parent 470a07bf05
commit cf66f8d8c7
2 changed files with 2 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sysutils/czkawka/Makefile
View File

@ -22,12 +22,11 @@ MODULES = devel/cargo
CONFIGURE_STYLE = cargo
SEPARATE_BUILD = Yes
WANTLIB-main += c c++abi m pthread
WANTLIB-main += ${MODCARGO_WANTLIB} m
WANTLIB-gui += ${WANTLIB-main} gdk_pixbuf-2.0 gio-2.0 glib-2.0
WANTLIB-gui += gobject-2.0 gtk-4 pango-1.0
WANTLIB-gui += gobject-2.0 gtk-4
LIB_DEPENDS-gui = devel/glib2 \
devel/pango \
graphics/gdk-pixbuf2 \
x11/gtk+4

32
sysutils/czkawka/patches/patch-modcargo-crates_libc-0_2_132_src_unix_bsd_netbsdlike_openbsd_mod_rs
View File

@ -1,32 +0,0 @@
Provide getmntinfo and MNT_* flags needed by trash >= 2.0.0
Needed until https://github.com/rust-lang/libc/pull/2907 lands
in a libc release.
Index: modcargo-crates/libc-0.2.132/src/unix/bsd/netbsdlike/openbsd/mod.rs
--- modcargo-crates/libc-0.2.132/src/unix/bsd/netbsdlike/openbsd/mod.rs.orig
+++ modcargo-crates/libc-0.2.132/src/unix/bsd/netbsdlike/openbsd/mod.rs
@@ -1612,6 +1612,15 @@ pub const PTRACE_FORK: ::c_int = 0x0002;
pub const WCONTINUED: ::c_int = 8;
+// https://github.com/openbsd/src/blob/master/sys/sys/mount.h#L416
+
+/// Synchronously wait for I/O to complete.
+pub const MNT_WAIT: ::c_int = 1;
+/// Start all I/O, but do not wait for it.
+pub const MNT_NOWAIT: ::c_int = 2;
+/// Push data not written by filesystem syncer.
+pub const MNT_LAZY: ::c_int = 3;
+
// search.h
pub const FIND: ::ACTION = 0;
pub const ENTER: ::ACTION = 1;
@@ -1870,6 +1879,7 @@ cfg_if! {
// these functions use statfs which uses the union mount_info:
pub fn statfs(path: *const ::c_char, buf: *mut statfs) -> ::c_int;
pub fn fstatfs(fd: ::c_int, buf: *mut statfs) -> ::c_int;
+ pub fn getmntinfo(mntbufp: *mut *mut ::statfs, mode: ::c_int) -> ::c_int;
}
}
}