Github messages for voidlinux
 help / color / mirror / Atom feed
From: chexum <chexum@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] Jdupes 1200
Date: Mon, 19 Jul 2021 23:45:19 +0200	[thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-32048@inbox.vuxu.org> (raw)

[-- Attachment #1: Type: text/plain, Size: 1432 bytes --]

There is a new pull request by chexum against master on the void-packages repository

https://github.com/chexum/void-packages jdupes-1200
https://github.com/void-linux/void-packages/pull/32048

Jdupes 1200
<!-- Mark items with [x] where applicable -->

Despite the flag ENABLE_BTRFS is enabled for make, this seems to be mishandled by the way the Makefile builds the CFLAGS, so the functionality does not get included.

(It does not depend on any BTRFS headers, libraries, or ioctls, only if the appropriate flag is given on run)

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR


#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-glibc)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [x] aarch64-glibc
  - [x] armv7l
  - [ ] armv6l-musl


A patch file from https://github.com/void-linux/void-packages/pull/32048.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-jdupes-1200-32048.patch --]
[-- Type: text/x-diff, Size: 2092 bytes --]

From 715472f68d61960197284fa5598d8db771928ae1 Mon Sep 17 00:00:00 2001
From: J Farkas <chexum+git@gmail.com>
Date: Mon, 19 Jul 2021 21:26:12 +0000
Subject: [PATCH 1/2] jdupes: ensure dedup functionality is enabled

CFLAGS set from the command line overrides
the logic to enable the dedup functionality
---
 srcpkgs/jdupes/template | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/srcpkgs/jdupes/template b/srcpkgs/jdupes/template
index c17c92154840..8cf1948cd027 100644
--- a/srcpkgs/jdupes/template
+++ b/srcpkgs/jdupes/template
@@ -12,6 +12,15 @@ changelog="https://raw.githubusercontent.com/jbruchon/jdupes/master/CHANGES"
 distfiles="https://github.com/jbruchon/jdupes/archive/v${version}.tar.gz"
 checksum=bb7c53cd463ab5e21da85948c4662a3b7ac9b038ae993cc14ccf793d2472e2e9
 
+pre_build() {
+        sed -i 's/^CFLAGS +=/override CFLAGS +=/g' Makefile
+        sed -i 's/^LDFLAGS =/override LDFLAGS +=/g' Makefile
+}
+
 post_install() {
 	vlicense LICENSE
 }
+
+do_check () {
+	./jdupes -V|grep fsdedup
+}

From b7786ee70738de304c4642b34e9da0914cf1a693 Mon Sep 17 00:00:00 2001
From: J Farkas <chexum+git@gmail.com>
Date: Mon, 19 Jul 2021 21:27:49 +0000
Subject: [PATCH 2/2] jdupes: update to 1.20.0

---
 srcpkgs/jdupes/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/jdupes/template b/srcpkgs/jdupes/template
index 8cf1948cd027..7763cab19331 100644
--- a/srcpkgs/jdupes/template
+++ b/srcpkgs/jdupes/template
@@ -1,6 +1,6 @@
 # Template file for 'jdupes'
 pkgname=jdupes
-version=1.19.1
+version=1.20.0
 revision=1
 build_style=gnu-makefile
 make_build_args="ENABLE_BTRFS=1"
@@ -10,7 +10,7 @@ license="MIT"
 homepage="https://github.com/jbruchon/jdupes"
 changelog="https://raw.githubusercontent.com/jbruchon/jdupes/master/CHANGES"
 distfiles="https://github.com/jbruchon/jdupes/archive/v${version}.tar.gz"
-checksum=bb7c53cd463ab5e21da85948c4662a3b7ac9b038ae993cc14ccf793d2472e2e9
+checksum=c1f728961ad8aeb074e5767367639e6b418f0ca572f70f7635655da722f1827e
 
 pre_build() {
         sed -i 's/^CFLAGS +=/override CFLAGS +=/g' Makefile

             reply	other threads:[~2021-07-19 21:45 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-19 21:45 chexum [this message]
2021-07-19 21:49 ` [PR PATCH] [Updated] " chexum
2021-07-19 22:45 ` [PR PATCH] [Merged]: " leahneukirchen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-32048@inbox.vuxu.org \
    --to=chexum@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).