[-- Attachment #1: Type: text/plain, Size: 485 bytes --] There is a new pull request by Logarithmus against master on the void-packages repository https://github.com/Logarithmus/void-packages meli https://github.com/void-linux/void-packages/pull/26551 New package: meli-0.6.2 BSD/Linux terminal email client with support for multiple accounts and Maildir / mbox / notmuch / IMAP / JMAP. See https://github.com/void-linux/void-packages/issues/26132 A patch file from https://github.com/void-linux/void-packages/pull/26551.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-meli-26551.patch --] [-- Type: text/x-diff, Size: 1069 bytes --] From 8f82aa588bdf31ae16b6305caf3831aa71e496de Mon Sep 17 00:00:00 2001 From: Artur Sinila <opensource@logarithmus.dev> Date: Sat, 21 Nov 2020 08:27:54 +0300 Subject: [PATCH] New package: meli-0.6.2 --- srcpkgs/meli/template | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 srcpkgs/meli/template diff --git a/srcpkgs/meli/template b/srcpkgs/meli/template new file mode 100644 index 00000000000..39f2bb739ab --- /dev/null +++ b/srcpkgs/meli/template @@ -0,0 +1,15 @@ +# Template file for 'meli' +pkgname=meli +version=0.6.2 +revision=1 +wrksrc=meli +build_style=cargo +configure_args="--features \"cli-docs\"" +hostmakedepends="mdocml" +makedepends="gpgme-devel dbus-devel sqlite-devel libnotmuch-devel" +short_desc="BSD/Linux terminal email client inspired by mutt" +maintainer="Artur Sinila <opensource@logarithmus.dev>" +license="GPL-3.0-or-later" +homepage="https://meli.delivery/" +distfiles="https://git.meli.delivery/meli/meli/archive/alpha-${version}.tar.gz" +checksum=ae6651d11c5edd449e1a57729c792f5dc425fbc153fa180f9a6a6131d23a19fa
[-- Attachment #1: Type: text/plain, Size: 490 bytes --] There is an updated pull request by Logarithmus against master on the void-packages repository https://github.com/Logarithmus/void-packages meli https://github.com/void-linux/void-packages/pull/26551 New package: meli-0.6.2 BSD/Linux terminal email client with support for multiple accounts and Maildir / mbox / notmuch / IMAP / JMAP. See https://github.com/void-linux/void-packages/issues/26132 A patch file from https://github.com/void-linux/void-packages/pull/26551.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-meli-26551.patch --] [-- Type: text/x-diff, Size: 1065 bytes --] From 7a5fc80595d0afcc6db3cfa3cd3cd56e9164e638 Mon Sep 17 00:00:00 2001 From: Artur Sinila <opensource@logarithmus.dev> Date: Sat, 21 Nov 2020 08:27:54 +0300 Subject: [PATCH] New package: meli-0.6.2 --- srcpkgs/meli/template | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 srcpkgs/meli/template diff --git a/srcpkgs/meli/template b/srcpkgs/meli/template new file mode 100644 index 00000000000..2a102311c8c --- /dev/null +++ b/srcpkgs/meli/template @@ -0,0 +1,15 @@ +# Template file for 'meli' +pkgname=meli +version=0.6.2 +revision=1 +wrksrc=meli +build_style=cargo +configure_args="--features=cli-docs" +hostmakedepends="mdocml" +makedepends="gpgme-devel dbus-devel sqlite-devel libnotmuch-devel" +short_desc="BSD/Linux terminal email client inspired by mutt" +maintainer="Artur Sinila <opensource@logarithmus.dev>" +license="GPL-3.0-or-later" +homepage="https://meli.delivery/" +distfiles="https://git.meli.delivery/meli/meli/archive/alpha-${version}.tar.gz" +checksum=ae6651d11c5edd449e1a57729c792f5dc425fbc153fa180f9a6a6131d23a19fa
[-- Attachment #1: Type: text/plain, Size: 490 bytes --] There is an updated pull request by Logarithmus against master on the void-packages repository https://github.com/Logarithmus/void-packages meli https://github.com/void-linux/void-packages/pull/26551 New package: meli-0.6.2 BSD/Linux terminal email client with support for multiple accounts and Maildir / mbox / notmuch / IMAP / JMAP. See https://github.com/void-linux/void-packages/issues/26132 A patch file from https://github.com/void-linux/void-packages/pull/26551.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-meli-26551.patch --] [-- Type: text/x-diff, Size: 1076 bytes --] From d99079a6f337131525c31476f59cae2278013ead Mon Sep 17 00:00:00 2001 From: Artur Sinila <opensource@logarithmus.dev> Date: Sat, 21 Nov 2020 08:27:54 +0300 Subject: [PATCH] New package: meli-0.6.2 --- srcpkgs/meli/template | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 srcpkgs/meli/template diff --git a/srcpkgs/meli/template b/srcpkgs/meli/template new file mode 100644 index 00000000000..21f889d1e98 --- /dev/null +++ b/srcpkgs/meli/template @@ -0,0 +1,15 @@ +# Template file for 'meli' +pkgname=meli +version=0.6.2 +revision=1 +wrksrc=meli +build_style=cargo +configure_args="--features=cli-docs" +hostmakedepends="pkg-config mdocml" +makedepends="gpgme-devel dbus-devel sqlite-devel libnotmuch-devel" +short_desc="BSD/Linux terminal email client inspired by mutt" +maintainer="Artur Sinila <opensource@logarithmus.dev>" +license="GPL-3.0-or-later" +homepage="https://meli.delivery/" +distfiles="https://git.meli.delivery/meli/meli/archive/alpha-${version}.tar.gz" +checksum=ae6651d11c5edd449e1a57729c792f5dc425fbc153fa180f9a6a6131d23a19fa
[-- Attachment #1: Type: text/plain, Size: 490 bytes --] There is an updated pull request by Logarithmus against master on the void-packages repository https://github.com/Logarithmus/void-packages meli https://github.com/void-linux/void-packages/pull/26551 New package: meli-0.6.2 BSD/Linux terminal email client with support for multiple accounts and Maildir / mbox / notmuch / IMAP / JMAP. See https://github.com/void-linux/void-packages/issues/26132 A patch file from https://github.com/void-linux/void-packages/pull/26551.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-meli-26551.patch --] [-- Type: text/x-diff, Size: 1103 bytes --] From 052e43315eee41ab6f416d68e7564cefe6cf821d Mon Sep 17 00:00:00 2001 From: Artur Sinila <opensource@logarithmus.dev> Date: Sat, 21 Nov 2020 08:27:54 +0300 Subject: [PATCH] New package: meli-0.6.2 --- srcpkgs/meli/template | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 srcpkgs/meli/template diff --git a/srcpkgs/meli/template b/srcpkgs/meli/template new file mode 100644 index 00000000000..8a59fffa3ef --- /dev/null +++ b/srcpkgs/meli/template @@ -0,0 +1,15 @@ +# Template file for 'meli' +pkgname=meli +version=0.6.2 +revision=1 +wrksrc=meli +build_style=cargo +configure_args="--features=cli-docs" +hostmakedepends="pkg-config mdocml" +makedepends="gpgme-devel dbus-devel sqlite-devel libnotmuch-devel libressl-devel pcre2-devel" +short_desc="BSD/Linux terminal email client inspired by mutt" +maintainer="Artur Sinila <opensource@logarithmus.dev>" +license="GPL-3.0-or-later" +homepage="https://meli.delivery/" +distfiles="https://git.meli.delivery/meli/meli/archive/alpha-${version}.tar.gz" +checksum=ae6651d11c5edd449e1a57729c792f5dc425fbc153fa180f9a6a6131d23a19fa
[-- Attachment #1: Type: text/plain, Size: 490 bytes --] There is an updated pull request by Logarithmus against master on the void-packages repository https://github.com/Logarithmus/void-packages meli https://github.com/void-linux/void-packages/pull/26551 New package: meli-0.6.2 BSD/Linux terminal email client with support for multiple accounts and Maildir / mbox / notmuch / IMAP / JMAP. See https://github.com/void-linux/void-packages/issues/26132 A patch file from https://github.com/void-linux/void-packages/pull/26551.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-meli-26551.patch --] [-- Type: text/x-diff, Size: 1956 bytes --] From ed533052689cf4d874e0bce8389177a8bb231037 Mon Sep 17 00:00:00 2001 From: Artur Sinila <opensource@logarithmus.dev> Date: Sat, 21 Nov 2020 08:27:54 +0300 Subject: [PATCH] New package: meli-0.6.2 --- srcpkgs/meli/patches/fix-for-32bit-systems.patch | 11 +++++++++++ srcpkgs/meli/template | 15 +++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 srcpkgs/meli/patches/fix-for-32bit-systems.patch create mode 100644 srcpkgs/meli/template diff --git a/srcpkgs/meli/patches/fix-for-32bit-systems.patch b/srcpkgs/meli/patches/fix-for-32bit-systems.patch new file mode 100644 index 00000000000..d9e723b937a --- /dev/null +++ b/srcpkgs/meli/patches/fix-for-32bit-systems.patch @@ -0,0 +1,11 @@ +--- melib/src/lib.rs ++++ melib/src/lib.rs +@@ -239,7 +239,7 @@ pub mod shellexpand { + let mut buf: Vec<u8> = Vec::with_capacity(BUF_SIZE); + let mut entries = SmallVec::new(); + loop { +- let n: i64 = unsafe { ++ let n: isize = unsafe { + ::libc::syscall( + ::libc::SYS_getdents64, + dir.as_raw_fd(), diff --git a/srcpkgs/meli/template b/srcpkgs/meli/template new file mode 100644 index 00000000000..8a59fffa3ef --- /dev/null +++ b/srcpkgs/meli/template @@ -0,0 +1,15 @@ +# Template file for 'meli' +pkgname=meli +version=0.6.2 +revision=1 +wrksrc=meli +build_style=cargo +configure_args="--features=cli-docs" +hostmakedepends="pkg-config mdocml" +makedepends="gpgme-devel dbus-devel sqlite-devel libnotmuch-devel libressl-devel pcre2-devel" +short_desc="BSD/Linux terminal email client inspired by mutt" +maintainer="Artur Sinila <opensource@logarithmus.dev>" +license="GPL-3.0-or-later" +homepage="https://meli.delivery/" +distfiles="https://git.meli.delivery/meli/meli/archive/alpha-${version}.tar.gz" +checksum=ae6651d11c5edd449e1a57729c792f5dc425fbc153fa180f9a6a6131d23a19fa
[-- Attachment #1: Type: text/plain, Size: 490 bytes --] There is an updated pull request by Logarithmus against master on the void-packages repository https://github.com/Logarithmus/void-packages meli https://github.com/void-linux/void-packages/pull/26551 New package: meli-0.6.2 BSD/Linux terminal email client with support for multiple accounts and Maildir / mbox / notmuch / IMAP / JMAP. See https://github.com/void-linux/void-packages/issues/26132 A patch file from https://github.com/void-linux/void-packages/pull/26551.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-meli-26551.patch --] [-- Type: text/x-diff, Size: 2189 bytes --] From 5770515e465e84fb147acb37b6e7a30a7cf69134 Mon Sep 17 00:00:00 2001 From: Artur Sinila <opensource@logarithmus.dev> Date: Sat, 21 Nov 2020 08:27:54 +0300 Subject: [PATCH] New package: meli-0.6.2 --- .../meli/patches/fix-for-32bit-systems.patch | 18 ++++++++++++++++++ srcpkgs/meli/template | 15 +++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 srcpkgs/meli/patches/fix-for-32bit-systems.patch create mode 100644 srcpkgs/meli/template diff --git a/srcpkgs/meli/patches/fix-for-32bit-systems.patch b/srcpkgs/meli/patches/fix-for-32bit-systems.patch new file mode 100644 index 00000000000..39087f1e6a2 --- /dev/null +++ b/srcpkgs/meli/patches/fix-for-32bit-systems.patch @@ -0,0 +1,18 @@ +--- melib/src/lib.rs ++++ melib/src/lib.rs +@@ -239,13 +239,13 @@ pub mod shellexpand { + let mut buf: Vec<u8> = Vec::with_capacity(BUF_SIZE); + let mut entries = SmallVec::new(); + loop { +- let n: i64 = unsafe { ++ let n = unsafe { + ::libc::syscall( + ::libc::SYS_getdents64, + dir.as_raw_fd(), + buf.as_ptr(), + BUF_SIZE - 256, +- ) ++ ) as isize + }; + if n < 0 { + return SmallVec::new(); diff --git a/srcpkgs/meli/template b/srcpkgs/meli/template new file mode 100644 index 00000000000..8a59fffa3ef --- /dev/null +++ b/srcpkgs/meli/template @@ -0,0 +1,15 @@ +# Template file for 'meli' +pkgname=meli +version=0.6.2 +revision=1 +wrksrc=meli +build_style=cargo +configure_args="--features=cli-docs" +hostmakedepends="pkg-config mdocml" +makedepends="gpgme-devel dbus-devel sqlite-devel libnotmuch-devel libressl-devel pcre2-devel" +short_desc="BSD/Linux terminal email client inspired by mutt" +maintainer="Artur Sinila <opensource@logarithmus.dev>" +license="GPL-3.0-or-later" +homepage="https://meli.delivery/" +distfiles="https://git.meli.delivery/meli/meli/archive/alpha-${version}.tar.gz" +checksum=ae6651d11c5edd449e1a57729c792f5dc425fbc153fa180f9a6a6131d23a19fa
[-- Attachment #1: Type: text/plain, Size: 490 bytes --] There is an updated pull request by Logarithmus against master on the void-packages repository https://github.com/Logarithmus/void-packages meli https://github.com/void-linux/void-packages/pull/26551 New package: meli-0.6.2 BSD/Linux terminal email client with support for multiple accounts and Maildir / mbox / notmuch / IMAP / JMAP. See https://github.com/void-linux/void-packages/issues/26132 A patch file from https://github.com/void-linux/void-packages/pull/26551.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-meli-26551.patch --] [-- Type: text/x-diff, Size: 3568 bytes --] From 1b1d82856c645265bf5655cee7a368c94759e107 Mon Sep 17 00:00:00 2001 From: Artur Sinila <opensource@logarithmus.dev> Date: Sat, 21 Nov 2020 08:27:54 +0300 Subject: [PATCH] New package: meli-0.6.2 --- srcpkgs/meli/patches/disable-lto.patch | 12 ++++++ .../patches/fixes-for-32bit-systems.patch | 41 +++++++++++++++++++ srcpkgs/meli/template | 15 +++++++ 3 files changed, 68 insertions(+) create mode 100644 srcpkgs/meli/patches/disable-lto.patch create mode 100644 srcpkgs/meli/patches/fixes-for-32bit-systems.patch create mode 100644 srcpkgs/meli/template diff --git a/srcpkgs/meli/patches/disable-lto.patch b/srcpkgs/meli/patches/disable-lto.patch new file mode 100644 index 00000000000..ec9c7870232 --- /dev/null +++ b/srcpkgs/meli/patches/disable-lto.patch @@ -0,0 +1,12 @@ +--- Cargo.toml ++++ Cargo.toml +@@ -64,9 +64,7 @@ quote = "^1.0" + proc-macro2 = "1.0.18" + + [profile.release] +-lto = "fat" + opt-level = "z" +-debug = false + + [workspace] + members = ["melib", "tools", ] diff --git a/srcpkgs/meli/patches/fixes-for-32bit-systems.patch b/srcpkgs/meli/patches/fixes-for-32bit-systems.patch new file mode 100644 index 00000000000..7396ce4cfae --- /dev/null +++ b/srcpkgs/meli/patches/fixes-for-32bit-systems.patch @@ -0,0 +1,41 @@ +--- melib/src/backends/notmuch.rs ++++ melib/src/backends/notmuch.rs +@@ -81,7 +81,7 @@ impl DbConnection { + call!(self.lib, notmuch_database_get_revision)( + *self.inner.read().unwrap(), + std::ptr::null_mut(), +- ) ++ ) as u64 + } + } + +--- melib/src/datetime.rs ++++ melib/src/datetime.rs +@@ -69,8 +69,7 @@ extern "C" { + pub fn timestamp_to_string(timestamp: UnixTimestamp, fmt: Option<&str>) -> String { + let mut new_tm: ::libc::tm = unsafe { std::mem::zeroed() }; + unsafe { +- let i: i64 = timestamp.try_into().unwrap_or(0); +- localtime_r(&i as *const i64, &mut new_tm as *mut ::libc::tm); ++ localtime_r(&(timestamp as ::libc::time_t), &mut new_tm); + } + let fmt = fmt + .map(CString::new) +--- melib/src/lib.rs ++++ melib/src/lib.rs +@@ -239,13 +239,13 @@ pub mod shellexpand { + let mut buf: Vec<u8> = Vec::with_capacity(BUF_SIZE); + let mut entries = SmallVec::new(); + loop { +- let n: i64 = unsafe { ++ let n = unsafe { + ::libc::syscall( + ::libc::SYS_getdents64, + dir.as_raw_fd(), + buf.as_ptr(), + BUF_SIZE - 256, +- ) ++ ) as isize + }; + if n < 0 { + return SmallVec::new(); diff --git a/srcpkgs/meli/template b/srcpkgs/meli/template new file mode 100644 index 00000000000..8a59fffa3ef --- /dev/null +++ b/srcpkgs/meli/template @@ -0,0 +1,15 @@ +# Template file for 'meli' +pkgname=meli +version=0.6.2 +revision=1 +wrksrc=meli +build_style=cargo +configure_args="--features=cli-docs" +hostmakedepends="pkg-config mdocml" +makedepends="gpgme-devel dbus-devel sqlite-devel libnotmuch-devel libressl-devel pcre2-devel" +short_desc="BSD/Linux terminal email client inspired by mutt" +maintainer="Artur Sinila <opensource@logarithmus.dev>" +license="GPL-3.0-or-later" +homepage="https://meli.delivery/" +distfiles="https://git.meli.delivery/meli/meli/archive/alpha-${version}.tar.gz" +checksum=ae6651d11c5edd449e1a57729c792f5dc425fbc153fa180f9a6a6131d23a19fa
[-- Attachment #1: Type: text/plain, Size: 474 bytes --] New comment by Logarithmus on void-packages repository https://github.com/void-linux/void-packages/pull/26551#issuecomment-731659061 Comment: Finally, after some dirty patching (the source code is such a mess, why would anyone use Linux syscalls directly in a mail client?!), CI check has been passed. Currently I have no time to test this package, so feel free to check out this branch, build it with usual `./xbps-src -C pkg meli | tee meli.log` and report the results.
[-- Attachment #1: Type: text/plain, Size: 174 bytes --] New review comment by ericonr on void-packages repository https://github.com/void-linux/void-packages/pull/26551#discussion_r528265667 Comment: Have these been upstreamed?
[-- Attachment #1: Type: text/plain, Size: 362 bytes --] New comment by ericonr on void-packages repository https://github.com/void-linux/void-packages/pull/26551#issuecomment-731662154 Comment: > Finally, after some dirty patching (the source code is such a mess, why would anyone use Linux syscalls directly in a mail client?!) I'm not sure this makes me entirely optimistic about adding it as a new package :/
[-- Attachment #1: Type: text/plain, Size: 234 bytes --] New review comment by Logarithmus on void-packages repository https://github.com/void-linux/void-packages/pull/26551#discussion_r528265903 Comment: Not yet. It seems that the author doesn't know about the existence of 32-bit archs.
[-- Attachment #1: Type: text/plain, Size: 370 bytes --] New comment by ericonr on void-packages repository https://github.com/void-linux/void-packages/pull/26551#issuecomment-763946603 Comment: This is being closed on account of upstream doing sketchy things (which then require dirty patches on our side). @Logarithmus, the patches should still be upstreamable, and someone can use this locally if they so wish. Thanks!
[-- Attachment #1: Type: text/plain, Size: 329 bytes --] There's a closed pull request on the void-packages repository New package: meli-0.6.2 https://github.com/void-linux/void-packages/pull/26551 Description: BSD/Linux terminal email client with support for multiple accounts and Maildir / mbox / notmuch / IMAP / JMAP. See https://github.com/void-linux/void-packages/issues/26132