Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] jdupes: update to 1.22.0, adopt; New package: libjodycode-1.0
@ 2023-04-13 13:46 cinerea0
  2023-04-21  2:05 ` [PR PATCH] [Updated] " cinerea0
                   ` (13 more replies)
  0 siblings, 14 replies; 15+ messages in thread
From: cinerea0 @ 2023-04-13 13:46 UTC (permalink / raw)
  To: ml

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

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

https://github.com/cinerea0/void-packages jdupes
https://github.com/void-linux/void-packages/pull/43425

jdupes: update to 1.22.0, adopt; New package: libjodycode-1.0
#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**


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

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

From ac38d75cfe0f2444f4c7b9b4b5e11d03c07f37b4 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 13 Apr 2023 09:32:42 -0400
Subject: [PATCH 1/2] New package: libjodycode-1.0

---
 common/shlibs                                 |  1 +
 srcpkgs/libjodycode-devel                     |  1 +
 .../patches/fix-make-install.patch            | 75 +++++++++++++++++++
 .../remove-unneccessary-compiler-flags.patch  | 22 ++++++
 srcpkgs/libjodycode/patches/set-soname.patch  | 45 +++++++++++
 srcpkgs/libjodycode/template                  | 26 +++++++
 6 files changed, 170 insertions(+)
 create mode 120000 srcpkgs/libjodycode-devel
 create mode 100644 srcpkgs/libjodycode/patches/fix-make-install.patch
 create mode 100644 srcpkgs/libjodycode/patches/remove-unneccessary-compiler-flags.patch
 create mode 100644 srcpkgs/libjodycode/patches/set-soname.patch
 create mode 100644 srcpkgs/libjodycode/template

diff --git a/common/shlibs b/common/shlibs
index 605a8249c8e2..08bd66cead8d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4243,3 +4243,4 @@ libdate-tz.so.3 chrono-date-3.0.1_1
 libayatana-ido3-0.4.so.0 ayatana-ido-0.9.2_1
 libayatana-indicator3.so.7 libayatana-indicator-0.9.3_1
 libayatana-appindicator3.so.1 libayatana-appindicator-0.5.91_1
+libjodycode.so.1 libjodycode-1.0_1
diff --git a/srcpkgs/libjodycode-devel b/srcpkgs/libjodycode-devel
new file mode 120000
index 000000000000..038ea779ae69
--- /dev/null
+++ b/srcpkgs/libjodycode-devel
@@ -0,0 +1 @@
+libjodycode
\ No newline at end of file
diff --git a/srcpkgs/libjodycode/patches/fix-make-install.patch b/srcpkgs/libjodycode/patches/fix-make-install.patch
new file mode 100644
index 000000000000..5110bb85f78c
--- /dev/null
+++ b/srcpkgs/libjodycode/patches/fix-make-install.patch
@@ -0,0 +1,75 @@
+From 1655163b273baac6e02f6b3404e4fcbb14ab763d Mon Sep 17 00:00:00 2001
+From: Jody Bruchon <jody@jodybruchon.com>
+Date: Mon, 10 Apr 2023 09:01:39 -0400
+Subject: [PATCH] Makefile: fix make install/uninstall
+
+This removes the Windows barriers. You're on your own on Windows.
+---
+ Makefile | 32 +++++++++++++++++---------------
+ 1 file changed, 17 insertions(+), 15 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index e15aba4..99f5726 100644
+--- a/Makefile
++++ b/Makefile
+@@ -23,8 +23,8 @@ COMPILER_OPTIONS += -Wshadow -Wfloat-equal -Waggregate-return -Wcast-qual -Wswit
+ COMPILER_OPTIONS += -std=gnu99 -D_FILE_OFFSET_BITS=64 -fstrict-aliasing -pipe -fPIC
+ 
+ UNAME_S=$(shell uname -s)
+-VERSION=$(shell grep '#define VER ' version.h | sed 's/[^"]*"//;s/".*//')
+-VERSION_MAJOR=$(shell grep '#define VER ' version.h | sed 's/[^"]*"//;s/\..*//')
++VERSION=$(shell grep '\#define VER ' version.h | sed 's/[^"]*"//;s/".*//')
++VERSION_MAJOR=$(shell grep '\#define VER ' version.h | sed 's/[^"]*"//;s/\..*//')
+ 
+ # Don't use unsupported compiler options on gcc 3/4 (Mac OS X 10.5.8 Xcode)
+ ifeq ($(UNAME_S), Darwin)
+@@ -96,33 +96,35 @@ $(PROGRAM_NAME): $(OBJS)
+ #	$(CC) $(CFLAGS) $(LDFLAGS) -o $(PROGRAM_NAME) $(OBJS)
+ 
+ installdirs:
+-	@[ "$(ON_WINDOWS)" = "1" ] && echo "Do not use install rules on Windows" && exit 1
+ 	test -e $(DESTDIR)$(LIB_DIR) || $(MKDIR) $(DESTDIR)$(LIB_DIR)
++	test -e $(DESTDIR)$(INC_DIR) || $(MKDIR) $(DESTDIR)$(INC_DIR)
+ 	test -e $(DESTDIR)$(MAN7_DIR) || $(MKDIR) $(DESTDIR)$(MAN7_DIR)
+ 
+-install: sharedlib staticlib installdirs
+-	@[ "$(ON_WINDOWS)" = "1" ] && echo "Do not use install rules on Windows" && exit 1
+-	$(INSTALL_DATA)	$(PROGRAM_NAME).so $(DESTDIR)$(LIB_DIR)/$(PROGRAM_NAME).so.$(VERSION)
++installfiles:
++	$(INSTALL_DATA)	$(PROGRAM_NAME).so            $(DESTDIR)$(LIB_DIR)/$(PROGRAM_NAME).so.$(VERSION)
+ 	$(LN)		$(PROGRAM_NAME).so.$(VERSION) $(DESTDIR)$(LIB_DIR)/$(PROGRAM_NAME).so.$(VERSION_MAJOR)
+ 	$(LN)		$(PROGRAM_NAME).so.$(VERSION) $(DESTDIR)$(LIB_DIR)/$(PROGRAM_NAME).so
+-	$(INSTALL_DATA)	$(PROGRAM_NAME).a $(DESTDIR)$(LIB_DIR)/$(PROGRAM_NAME).a
+-	$(INSTALL_DATA)	$(PROGRAM_NAME).h $(DESTDIR)$(INC_DIR)/$(PROGRAM_NAME).h
+-	$(INSTALL_DATA)	$(PROGRAM_NAME).7 $(DESTDIR)$(MAN7_DIR)/$(PROGRAM_NAME).7
++	$(INSTALL_DATA)	$(PROGRAM_NAME).a             $(DESTDIR)$(LIB_DIR)/$(PROGRAM_NAME).a
++	$(INSTALL_DATA)	$(PROGRAM_NAME).h             $(DESTDIR)$(INC_DIR)/$(PROGRAM_NAME).h
++	$(INSTALL_DATA)	$(PROGRAM_NAME).7             $(DESTDIR)$(MAN7_DIR)/$(PROGRAM_NAME).7
++
++install: sharedlib staticlib installdirs installfiles
+ 
+ uninstalldirs:
+-	@[ "$(ON_WINDOWS)" = "1" ] && echo "Do not use install rules on Windows" && exit 1
+-	-test -e $(DESTDIR)$(LIB_DIR) && $(RMDIR) $(DESTDIR)$(LIB_DIR)
+-	-test -e $(DESTDIR)$(INC_DIR) && $(RMDIR) $(DESTDIR)$(INC_DIR)
++	-test -e $(DESTDIR)$(LIB_DIR)  && $(RMDIR) $(DESTDIR)$(LIB_DIR)
++	-test -e $(DESTDIR)$(INC_DIR)  && $(RMDIR) $(DESTDIR)$(INC_DIR)
+ 	-test -e $(DESTDIR)$(MAN7_DIR) && $(RMDIR) $(DESTDIR)$(MAN7_DIR)
+ 
+-uninstall: uninstalldirs
+-	@[ "$(ON_WINDOWS)" = "1" ] && echo "Do not use install rules on Windows" && exit 1
++uninstallfiles:
+ 	$(RM)	$(DESTDIR)$(LIB_DIR)/$(PROGRAM_NAME).so.$(VERSION)
+ 	$(RM)	$(DESTDIR)$(LIB_DIR)/$(PROGRAM_NAME).so.$(VERSION_MAJOR)
+-	$(RM)	$(DESTDIR)$(INC_DIR)/$(PROGRAM_NAME).a
++	$(RM)	$(DESTDIR)$(LIB_DIR)/$(PROGRAM_NAME).so
++	$(RM)	$(DESTDIR)$(LIB_DIR)/$(PROGRAM_NAME).a
+ 	$(RM)	$(DESTDIR)$(INC_DIR)/$(PROGRAM_NAME).h
+ 	$(RM)	$(DESTDIR)$(MAN7_DIR)/$(PROGRAM_NAME).7
+ 
++uninstall: uninstallfiles uninstalldirs
++
+ test:
+ 	./test.sh
+ 
+
diff --git a/srcpkgs/libjodycode/patches/remove-unneccessary-compiler-flags.patch b/srcpkgs/libjodycode/patches/remove-unneccessary-compiler-flags.patch
new file mode 100644
index 000000000000..ce092cb586f7
--- /dev/null
+++ b/srcpkgs/libjodycode/patches/remove-unneccessary-compiler-flags.patch
@@ -0,0 +1,22 @@
+From 8676de946f535cf7de8980d0476ce706b1ff9a8c Mon Sep 17 00:00:00 2001
+From: Jody Bruchon <jody@jodybruchon.com>
+Date: Sun, 9 Apr 2023 21:21:22 -0400
+Subject: [PATCH] Makefile: remove unnecessary definitions
+
+---
+ Makefile | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 1910db6..e15aba4 100644
+--- a/Makefile
++++ b/Makefile
+@@ -21,7 +21,6 @@ SUFFIX = so
+ COMPILER_OPTIONS = -Wall -Wwrite-strings -Wcast-align -Wstrict-aliasing -Wstrict-prototypes -Wpointer-arith -Wundef
+ COMPILER_OPTIONS += -Wshadow -Wfloat-equal -Waggregate-return -Wcast-qual -Wswitch-default -Wswitch-enum -Wconversion -Wunreachable-code -Wformat=2
+ COMPILER_OPTIONS += -std=gnu99 -D_FILE_OFFSET_BITS=64 -fstrict-aliasing -pipe -fPIC
+-COMPILER_OPTIONS += -DSMA_MAX_FREE=11 -DNO_ATIME
+ 
+ UNAME_S=$(shell uname -s)
+ VERSION=$(shell grep '#define VER ' version.h | sed 's/[^"]*"//;s/".*//')
+
diff --git a/srcpkgs/libjodycode/patches/set-soname.patch b/srcpkgs/libjodycode/patches/set-soname.patch
new file mode 100644
index 000000000000..a53e544e7200
--- /dev/null
+++ b/srcpkgs/libjodycode/patches/set-soname.patch
@@ -0,0 +1,45 @@
+From 891a0bfebbe8ec98dea911588e3d7e739951c1f2 Mon Sep 17 00:00:00 2001
+From: Jody Bruchon <jody@jodybruchon.com>
+Date: Wed, 12 Apr 2023 23:43:30 -0400
+Subject: [PATCH] Add soname linker option (GitHub issue #2)
+
+---
+ Makefile | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 99f5726..1d8dc6c 100644
+--- a/Makefile
++++ b/Makefile
+@@ -16,11 +16,13 @@ MKDIR   = mkdir -p
+ INSTALL_PROGRAM = $(INSTALL) -m 0755
+ INSTALL_DATA    = $(INSTALL) -m 0644
+ SUFFIX = so
++API_VERSION = 1
+ 
+ # Make Configuration
+ COMPILER_OPTIONS = -Wall -Wwrite-strings -Wcast-align -Wstrict-aliasing -Wstrict-prototypes -Wpointer-arith -Wundef
+ COMPILER_OPTIONS += -Wshadow -Wfloat-equal -Waggregate-return -Wcast-qual -Wswitch-default -Wswitch-enum -Wconversion -Wunreachable-code -Wformat=2
+ COMPILER_OPTIONS += -std=gnu99 -D_FILE_OFFSET_BITS=64 -fstrict-aliasing -pipe -fPIC
++LINK_OPTIONS += -Wl,-soname,$(PROGRAM_NAME).$(SUFFIX).$(API_VERSION)
+ 
+ UNAME_S=$(shell uname -s)
+ VERSION=$(shell grep '\#define VER ' version.h | sed 's/[^"]*"//;s/".*//')
+@@ -69,6 +71,7 @@ ifdef ON_WINDOWS
+ endif
+ 
+ CFLAGS += $(COMPILER_OPTIONS) $(CFLAGS_EXTRA)
++LDFLAGS += $(LINK_OPTIONS)
+ 
+ # ADDITIONAL_OBJECTS - some platforms will need additional object files
+ # to support features not supplied by their vendor. Eg: GNU getopt()
+@@ -81,7 +84,7 @@ OBJS += $(ADDITIONAL_OBJECTS)
+ all: sharedlib staticlib
+ 
+ sharedlib: $(OBJS)
+-	$(CC) -shared -o $(PROGRAM_NAME).$(SUFFIX) $(OBJS)
++	$(CC) -shared -o $(PROGRAM_NAME).$(SUFFIX) $(OBJS) $(LDFLAGS)
+ 
+ staticlib: $(OBJS)
+ 	$(AR) rcs libjodycode.a $(OBJS)
+
diff --git a/srcpkgs/libjodycode/template b/srcpkgs/libjodycode/template
new file mode 100644
index 000000000000..2e1c60adde42
--- /dev/null
+++ b/srcpkgs/libjodycode/template
@@ -0,0 +1,26 @@
+# Template file for 'libjodycode'
+pkgname=libjodycode
+version=1.0
+revision=1
+build_style=gnu-makefile
+make_use_env=yes
+short_desc="Shared code used by several utilities written by Jody Bruchon"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
+license="MIT"
+homepage="https://github.com/jbruchon/libjodycode"
+changelog="https://raw.githubusercontent.com/jbruchon/libjodycode/master/CHANGES"
+distfiles="https://github.com/jbruchon/libjodycode/archive/refs/tags/v${version}.tar.gz"
+checksum=3849c7a76c46687eafcff8db37477ce31662ac7a0d88cbd7495755b0f9859280
+
+post_install() {
+	vlicense LICENSE
+}
+
+libjodycode-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+	}
+}

From e073115eb804c936912851b05616c8fb72c39e31 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 13 Apr 2023 09:34:05 -0400
Subject: [PATCH 2/2] jdupes: update to 1.22.0, adopt

---
 srcpkgs/jdupes/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/jdupes/template b/srcpkgs/jdupes/template
index 15a749997c40..ab64aa4cc1d6 100644
--- a/srcpkgs/jdupes/template
+++ b/srcpkgs/jdupes/template
@@ -1,18 +1,18 @@
 # Template file for 'jdupes'
 pkgname=jdupes
-version=1.21.3
+version=1.22.0
 revision=1
 build_style=gnu-makefile
-make_build_args="ENABLE_BTRFS=1"
+make_build_args="ENABLE_BTRFS=1 ENABLE_DEDUPE=1"
+make_use_env=yes
+makedepends="libjodycode-devel"
 short_desc="Powerful duplicate file finder and an enhanced fork of fdupes"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="MIT"
 homepage="https://github.com/jbruchon/jdupes"
 changelog="https://raw.githubusercontent.com/jbruchon/jdupes/master/CHANGES"
 distfiles="https://github.com/jbruchon/jdupes/archive/refs/tags/v${version}.tar.gz"
-checksum=8992d0ff1fe135c685063ce3c9d69d54f1f19f1b32845e84441f888218063cc0
-
-CFLAGS="-DENABLE_DEDUPE"
+checksum=945b69f1570d058b70c40d144c5dfa9d5769f43e9488e8ac4f47bbb9ac973df7
 
 post_install() {
 	vlicense LICENSE

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PR PATCH] [Updated] jdupes: update to 1.22.0, adopt; New package: libjodycode-1.0
  2023-04-13 13:46 [PR PATCH] jdupes: update to 1.22.0, adopt; New package: libjodycode-1.0 cinerea0
@ 2023-04-21  2:05 ` cinerea0
  2023-04-21  2:10 ` [PR PATCH] [Updated] jdupes: update to 1.22.0, adopt; New package: libjodycode-1.1 cinerea0
                   ` (12 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: cinerea0 @ 2023-04-21  2:05 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by cinerea0 against master on the void-packages repository

https://github.com/cinerea0/void-packages jdupes
https://github.com/void-linux/void-packages/pull/43425

jdupes: update to 1.22.0, adopt; New package: libjodycode-1.0
#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**


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

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

From edd85822d0cd0a93d4035f6dcbdd82aa56e61724 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 20 Apr 2023 22:04:07 -0400
Subject: [PATCH 1/2] New package: libjodycode-1.1

---
 common/shlibs                |  1 +
 srcpkgs/libjodycode/template | 26 ++++++++++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 srcpkgs/libjodycode/template

diff --git a/common/shlibs b/common/shlibs
index 0b05cd99d6b3..d23f0ef52005 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4244,3 +4244,4 @@ libdate-tz.so.3 chrono-date-3.0.1_1
 libayatana-ido3-0.4.so.0 ayatana-ido-0.9.2_1
 libayatana-indicator3.so.7 libayatana-indicator-0.9.3_1
 libayatana-appindicator3.so.1 libayatana-appindicator-0.5.91_1
+libjodycode.so.1 libjodycode-1.1_1
diff --git a/srcpkgs/libjodycode/template b/srcpkgs/libjodycode/template
new file mode 100644
index 000000000000..a2de08201de8
--- /dev/null
+++ b/srcpkgs/libjodycode/template
@@ -0,0 +1,26 @@
+# Template file for 'libjodycode'
+pkgname=libjodycode
+version=1.1
+revision=1
+build_style=gnu-makefile
+make_use_env=yes
+short_desc="Shared code used by several utilities written by Jody Bruchon"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
+license="MIT"
+homepage="https://github.com/jbruchon/libjodycode"
+changelog="https://raw.githubusercontent.com/jbruchon/libjodycode/master/CHANGES"
+distfiles="https://github.com/jbruchon/libjodycode/archive/refs/tags/v${version}.tar.gz"
+checksum=c4b5dbc20f39800bd774afb6b5d709ce90fe4482a44ea19ff24a2e27466729c8
+
+post_install() {
+	vlicense LICENSE
+}
+
+libjodycode-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+	}
+}

From 15ee1473749e72b803c056271152c90e5a3f94a5 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 20 Apr 2023 22:04:32 -0400
Subject: [PATCH 2/2] jdupes: update to 1.22.0, adopt

---
 srcpkgs/jdupes/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/jdupes/template b/srcpkgs/jdupes/template
index 15a749997c40..ab64aa4cc1d6 100644
--- a/srcpkgs/jdupes/template
+++ b/srcpkgs/jdupes/template
@@ -1,18 +1,18 @@
 # Template file for 'jdupes'
 pkgname=jdupes
-version=1.21.3
+version=1.22.0
 revision=1
 build_style=gnu-makefile
-make_build_args="ENABLE_BTRFS=1"
+make_build_args="ENABLE_BTRFS=1 ENABLE_DEDUPE=1"
+make_use_env=yes
+makedepends="libjodycode-devel"
 short_desc="Powerful duplicate file finder and an enhanced fork of fdupes"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="MIT"
 homepage="https://github.com/jbruchon/jdupes"
 changelog="https://raw.githubusercontent.com/jbruchon/jdupes/master/CHANGES"
 distfiles="https://github.com/jbruchon/jdupes/archive/refs/tags/v${version}.tar.gz"
-checksum=8992d0ff1fe135c685063ce3c9d69d54f1f19f1b32845e84441f888218063cc0
-
-CFLAGS="-DENABLE_DEDUPE"
+checksum=945b69f1570d058b70c40d144c5dfa9d5769f43e9488e8ac4f47bbb9ac973df7
 
 post_install() {
 	vlicense LICENSE

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PR PATCH] [Updated] jdupes: update to 1.22.0, adopt; New package: libjodycode-1.1
  2023-04-13 13:46 [PR PATCH] jdupes: update to 1.22.0, adopt; New package: libjodycode-1.0 cinerea0
  2023-04-21  2:05 ` [PR PATCH] [Updated] " cinerea0
@ 2023-04-21  2:10 ` cinerea0
  2023-04-25 14:48 ` cinerea0
                   ` (11 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: cinerea0 @ 2023-04-21  2:10 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by cinerea0 against master on the void-packages repository

https://github.com/cinerea0/void-packages jdupes
https://github.com/void-linux/void-packages/pull/43425

jdupes: update to 1.22.0, adopt; New package: libjodycode-1.1
#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**


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

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

From 94314cad256f1a62bb3502dfa78653d330b803eb Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 20 Apr 2023 22:09:36 -0400
Subject: [PATCH 1/2] New package: libjodycode-1.1

---
 common/shlibs                |  1 +
 srcpkgs/libjodycode-devel    |  1 +
 srcpkgs/libjodycode/template | 26 ++++++++++++++++++++++++++
 3 files changed, 28 insertions(+)
 create mode 120000 srcpkgs/libjodycode-devel
 create mode 100644 srcpkgs/libjodycode/template

diff --git a/common/shlibs b/common/shlibs
index 0b05cd99d6b3..d23f0ef52005 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4244,3 +4244,4 @@ libdate-tz.so.3 chrono-date-3.0.1_1
 libayatana-ido3-0.4.so.0 ayatana-ido-0.9.2_1
 libayatana-indicator3.so.7 libayatana-indicator-0.9.3_1
 libayatana-appindicator3.so.1 libayatana-appindicator-0.5.91_1
+libjodycode.so.1 libjodycode-1.1_1
diff --git a/srcpkgs/libjodycode-devel b/srcpkgs/libjodycode-devel
new file mode 120000
index 000000000000..038ea779ae69
--- /dev/null
+++ b/srcpkgs/libjodycode-devel
@@ -0,0 +1 @@
+libjodycode
\ No newline at end of file
diff --git a/srcpkgs/libjodycode/template b/srcpkgs/libjodycode/template
new file mode 100644
index 000000000000..a2de08201de8
--- /dev/null
+++ b/srcpkgs/libjodycode/template
@@ -0,0 +1,26 @@
+# Template file for 'libjodycode'
+pkgname=libjodycode
+version=1.1
+revision=1
+build_style=gnu-makefile
+make_use_env=yes
+short_desc="Shared code used by several utilities written by Jody Bruchon"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
+license="MIT"
+homepage="https://github.com/jbruchon/libjodycode"
+changelog="https://raw.githubusercontent.com/jbruchon/libjodycode/master/CHANGES"
+distfiles="https://github.com/jbruchon/libjodycode/archive/refs/tags/v${version}.tar.gz"
+checksum=c4b5dbc20f39800bd774afb6b5d709ce90fe4482a44ea19ff24a2e27466729c8
+
+post_install() {
+	vlicense LICENSE
+}
+
+libjodycode-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+	}
+}

From b46929b7dbffd6ef8bf881173d1fbb36b9f0537c Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 20 Apr 2023 22:09:55 -0400
Subject: [PATCH 2/2] jdupes: update to 1.22.0, adopt

---
 srcpkgs/jdupes/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/jdupes/template b/srcpkgs/jdupes/template
index 15a749997c40..ab64aa4cc1d6 100644
--- a/srcpkgs/jdupes/template
+++ b/srcpkgs/jdupes/template
@@ -1,18 +1,18 @@
 # Template file for 'jdupes'
 pkgname=jdupes
-version=1.21.3
+version=1.22.0
 revision=1
 build_style=gnu-makefile
-make_build_args="ENABLE_BTRFS=1"
+make_build_args="ENABLE_BTRFS=1 ENABLE_DEDUPE=1"
+make_use_env=yes
+makedepends="libjodycode-devel"
 short_desc="Powerful duplicate file finder and an enhanced fork of fdupes"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="MIT"
 homepage="https://github.com/jbruchon/jdupes"
 changelog="https://raw.githubusercontent.com/jbruchon/jdupes/master/CHANGES"
 distfiles="https://github.com/jbruchon/jdupes/archive/refs/tags/v${version}.tar.gz"
-checksum=8992d0ff1fe135c685063ce3c9d69d54f1f19f1b32845e84441f888218063cc0
-
-CFLAGS="-DENABLE_DEDUPE"
+checksum=945b69f1570d058b70c40d144c5dfa9d5769f43e9488e8ac4f47bbb9ac973df7
 
 post_install() {
 	vlicense LICENSE

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PR PATCH] [Updated] jdupes: update to 1.22.0, adopt; New package: libjodycode-1.1
  2023-04-13 13:46 [PR PATCH] jdupes: update to 1.22.0, adopt; New package: libjodycode-1.0 cinerea0
  2023-04-21  2:05 ` [PR PATCH] [Updated] " cinerea0
  2023-04-21  2:10 ` [PR PATCH] [Updated] jdupes: update to 1.22.0, adopt; New package: libjodycode-1.1 cinerea0
@ 2023-04-25 14:48 ` cinerea0
  2023-04-25 19:52 ` [PR PATCH] [Updated] jdupes: update to 1.22.0, adopt; New package: libjodycode-1.2 cinerea0
                   ` (10 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: cinerea0 @ 2023-04-25 14:48 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by cinerea0 against master on the void-packages repository

https://github.com/cinerea0/void-packages jdupes
https://github.com/void-linux/void-packages/pull/43425

jdupes: update to 1.22.0, adopt; New package: libjodycode-1.1
#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**


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

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

From 06350c38a7a2601d7b30eddfdb4b8588469a6a37 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 25 Apr 2023 10:48:19 -0400
Subject: [PATCH 1/2] New package: libjodycode-1.2

---
 common/shlibs                |  1 +
 srcpkgs/libjodycode/template | 26 ++++++++++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 srcpkgs/libjodycode/template

diff --git a/common/shlibs b/common/shlibs
index 3f37bcd7614e..a4d834b8b4ae 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4250,3 +4250,4 @@ libdate-tz.so.3 chrono-date-3.0.1_1
 libayatana-ido3-0.4.so.0 ayatana-ido-0.9.2_1
 libayatana-indicator3.so.7 libayatana-indicator-0.9.3_1
 libayatana-appindicator3.so.1 libayatana-appindicator-0.5.91_1
+libjodycode.so.1 libjodycode-1.2_1
diff --git a/srcpkgs/libjodycode/template b/srcpkgs/libjodycode/template
new file mode 100644
index 000000000000..68c1c6a4bc15
--- /dev/null
+++ b/srcpkgs/libjodycode/template
@@ -0,0 +1,26 @@
+# Template file for 'libjodycode'
+pkgname=libjodycode
+version=1.2
+revision=1
+build_style=gnu-makefile
+make_use_env=yes
+short_desc="Shared code used by several utilities written by Jody Bruchon"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
+license="MIT"
+homepage="https://github.com/jbruchon/libjodycode"
+changelog="https://raw.githubusercontent.com/jbruchon/libjodycode/master/CHANGES"
+distfiles="https://github.com/jbruchon/libjodycode/archive/refs/tags/v${version}.tar.gz"
+checksum=ca3a653bcde3bd845f350364264564f56c404adfb26d3672342fe90e199033e4
+
+post_install() {
+	vlicense LICENSE
+}
+
+libjodycode-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+	}
+}

From e117ba1ea618fe60b3c29ac90df8aeb0be49b0c7 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 25 Apr 2023 10:48:39 -0400
Subject: [PATCH 2/2] jdupes: update to 1.22.0, adopt

---
 srcpkgs/jdupes/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/jdupes/template b/srcpkgs/jdupes/template
index 15a749997c40..ab64aa4cc1d6 100644
--- a/srcpkgs/jdupes/template
+++ b/srcpkgs/jdupes/template
@@ -1,18 +1,18 @@
 # Template file for 'jdupes'
 pkgname=jdupes
-version=1.21.3
+version=1.22.0
 revision=1
 build_style=gnu-makefile
-make_build_args="ENABLE_BTRFS=1"
+make_build_args="ENABLE_BTRFS=1 ENABLE_DEDUPE=1"
+make_use_env=yes
+makedepends="libjodycode-devel"
 short_desc="Powerful duplicate file finder and an enhanced fork of fdupes"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="MIT"
 homepage="https://github.com/jbruchon/jdupes"
 changelog="https://raw.githubusercontent.com/jbruchon/jdupes/master/CHANGES"
 distfiles="https://github.com/jbruchon/jdupes/archive/refs/tags/v${version}.tar.gz"
-checksum=8992d0ff1fe135c685063ce3c9d69d54f1f19f1b32845e84441f888218063cc0
-
-CFLAGS="-DENABLE_DEDUPE"
+checksum=945b69f1570d058b70c40d144c5dfa9d5769f43e9488e8ac4f47bbb9ac973df7
 
 post_install() {
 	vlicense LICENSE

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PR PATCH] [Updated] jdupes: update to 1.22.0, adopt; New package: libjodycode-1.2
  2023-04-13 13:46 [PR PATCH] jdupes: update to 1.22.0, adopt; New package: libjodycode-1.0 cinerea0
                   ` (2 preceding siblings ...)
  2023-04-25 14:48 ` cinerea0
@ 2023-04-25 19:52 ` cinerea0
  2023-04-26 15:01 ` cinerea0
                   ` (9 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: cinerea0 @ 2023-04-25 19:52 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by cinerea0 against master on the void-packages repository

https://github.com/cinerea0/void-packages jdupes
https://github.com/void-linux/void-packages/pull/43425

jdupes: update to 1.22.0, adopt; New package: libjodycode-1.2
#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**


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

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

From 83de57883fdd3d183b1cc190d605a8e731d23dde Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 25 Apr 2023 15:51:36 -0400
Subject: [PATCH 1/2] New package: libjodycode-1.2

---
 common/shlibs                |  1 +
 srcpkgs/libjodycode-devel    |  1 +
 srcpkgs/libjodycode/template | 26 ++++++++++++++++++++++++++
 3 files changed, 28 insertions(+)
 create mode 120000 srcpkgs/libjodycode-devel
 create mode 100644 srcpkgs/libjodycode/template

diff --git a/common/shlibs b/common/shlibs
index 3f37bcd7614e..a4d834b8b4ae 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4250,3 +4250,4 @@ libdate-tz.so.3 chrono-date-3.0.1_1
 libayatana-ido3-0.4.so.0 ayatana-ido-0.9.2_1
 libayatana-indicator3.so.7 libayatana-indicator-0.9.3_1
 libayatana-appindicator3.so.1 libayatana-appindicator-0.5.91_1
+libjodycode.so.1 libjodycode-1.2_1
diff --git a/srcpkgs/libjodycode-devel b/srcpkgs/libjodycode-devel
new file mode 120000
index 000000000000..038ea779ae69
--- /dev/null
+++ b/srcpkgs/libjodycode-devel
@@ -0,0 +1 @@
+libjodycode
\ No newline at end of file
diff --git a/srcpkgs/libjodycode/template b/srcpkgs/libjodycode/template
new file mode 100644
index 000000000000..68c1c6a4bc15
--- /dev/null
+++ b/srcpkgs/libjodycode/template
@@ -0,0 +1,26 @@
+# Template file for 'libjodycode'
+pkgname=libjodycode
+version=1.2
+revision=1
+build_style=gnu-makefile
+make_use_env=yes
+short_desc="Shared code used by several utilities written by Jody Bruchon"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
+license="MIT"
+homepage="https://github.com/jbruchon/libjodycode"
+changelog="https://raw.githubusercontent.com/jbruchon/libjodycode/master/CHANGES"
+distfiles="https://github.com/jbruchon/libjodycode/archive/refs/tags/v${version}.tar.gz"
+checksum=ca3a653bcde3bd845f350364264564f56c404adfb26d3672342fe90e199033e4
+
+post_install() {
+	vlicense LICENSE
+}
+
+libjodycode-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+	}
+}

From d99d66e7aba0978ddfabf21f77a7eb0d25a87303 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 25 Apr 2023 15:51:59 -0400
Subject: [PATCH 2/2] jdupes: update to 1.22.0, adopt

---
 srcpkgs/jdupes/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/jdupes/template b/srcpkgs/jdupes/template
index 15a749997c40..ab64aa4cc1d6 100644
--- a/srcpkgs/jdupes/template
+++ b/srcpkgs/jdupes/template
@@ -1,18 +1,18 @@
 # Template file for 'jdupes'
 pkgname=jdupes
-version=1.21.3
+version=1.22.0
 revision=1
 build_style=gnu-makefile
-make_build_args="ENABLE_BTRFS=1"
+make_build_args="ENABLE_BTRFS=1 ENABLE_DEDUPE=1"
+make_use_env=yes
+makedepends="libjodycode-devel"
 short_desc="Powerful duplicate file finder and an enhanced fork of fdupes"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="MIT"
 homepage="https://github.com/jbruchon/jdupes"
 changelog="https://raw.githubusercontent.com/jbruchon/jdupes/master/CHANGES"
 distfiles="https://github.com/jbruchon/jdupes/archive/refs/tags/v${version}.tar.gz"
-checksum=8992d0ff1fe135c685063ce3c9d69d54f1f19f1b32845e84441f888218063cc0
-
-CFLAGS="-DENABLE_DEDUPE"
+checksum=945b69f1570d058b70c40d144c5dfa9d5769f43e9488e8ac4f47bbb9ac973df7
 
 post_install() {
 	vlicense LICENSE

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PR PATCH] [Updated] jdupes: update to 1.22.0, adopt; New package: libjodycode-1.2
  2023-04-13 13:46 [PR PATCH] jdupes: update to 1.22.0, adopt; New package: libjodycode-1.0 cinerea0
                   ` (3 preceding siblings ...)
  2023-04-25 19:52 ` [PR PATCH] [Updated] jdupes: update to 1.22.0, adopt; New package: libjodycode-1.2 cinerea0
@ 2023-04-26 15:01 ` cinerea0
  2023-05-10  2:13 ` cinerea0
                   ` (8 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: cinerea0 @ 2023-04-26 15:01 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by cinerea0 against master on the void-packages repository

https://github.com/cinerea0/void-packages jdupes
https://github.com/void-linux/void-packages/pull/43425

jdupes: update to 1.22.0, adopt; New package: libjodycode-1.2
#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**


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

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

From 9df81b65d941d549d4fab43c5c7ac56785e24875 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Wed, 26 Apr 2023 11:00:49 -0400
Subject: [PATCH 1/2] New package: libjodycode-1.2

---
 common/shlibs                |  1 +
 srcpkgs/libjodycode-devel    |  1 +
 srcpkgs/libjodycode/template | 26 ++++++++++++++++++++++++++
 3 files changed, 28 insertions(+)
 create mode 120000 srcpkgs/libjodycode-devel
 create mode 100644 srcpkgs/libjodycode/template

diff --git a/common/shlibs b/common/shlibs
index 3f37bcd7614e..a4d834b8b4ae 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4250,3 +4250,4 @@ libdate-tz.so.3 chrono-date-3.0.1_1
 libayatana-ido3-0.4.so.0 ayatana-ido-0.9.2_1
 libayatana-indicator3.so.7 libayatana-indicator-0.9.3_1
 libayatana-appindicator3.so.1 libayatana-appindicator-0.5.91_1
+libjodycode.so.1 libjodycode-1.2_1
diff --git a/srcpkgs/libjodycode-devel b/srcpkgs/libjodycode-devel
new file mode 120000
index 000000000000..038ea779ae69
--- /dev/null
+++ b/srcpkgs/libjodycode-devel
@@ -0,0 +1 @@
+libjodycode
\ No newline at end of file
diff --git a/srcpkgs/libjodycode/template b/srcpkgs/libjodycode/template
new file mode 100644
index 000000000000..68c1c6a4bc15
--- /dev/null
+++ b/srcpkgs/libjodycode/template
@@ -0,0 +1,26 @@
+# Template file for 'libjodycode'
+pkgname=libjodycode
+version=1.2
+revision=1
+build_style=gnu-makefile
+make_use_env=yes
+short_desc="Shared code used by several utilities written by Jody Bruchon"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
+license="MIT"
+homepage="https://github.com/jbruchon/libjodycode"
+changelog="https://raw.githubusercontent.com/jbruchon/libjodycode/master/CHANGES"
+distfiles="https://github.com/jbruchon/libjodycode/archive/refs/tags/v${version}.tar.gz"
+checksum=ca3a653bcde3bd845f350364264564f56c404adfb26d3672342fe90e199033e4
+
+post_install() {
+	vlicense LICENSE
+}
+
+libjodycode-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+	}
+}

From 3ecb6e8f5fa87f1010dff40132a797e57de68ec8 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Wed, 26 Apr 2023 11:01:05 -0400
Subject: [PATCH 2/2] jdupes: update to 1.22.0, adopt

---
 srcpkgs/jdupes/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/jdupes/template b/srcpkgs/jdupes/template
index 15a749997c40..ab64aa4cc1d6 100644
--- a/srcpkgs/jdupes/template
+++ b/srcpkgs/jdupes/template
@@ -1,18 +1,18 @@
 # Template file for 'jdupes'
 pkgname=jdupes
-version=1.21.3
+version=1.22.0
 revision=1
 build_style=gnu-makefile
-make_build_args="ENABLE_BTRFS=1"
+make_build_args="ENABLE_BTRFS=1 ENABLE_DEDUPE=1"
+make_use_env=yes
+makedepends="libjodycode-devel"
 short_desc="Powerful duplicate file finder and an enhanced fork of fdupes"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="MIT"
 homepage="https://github.com/jbruchon/jdupes"
 changelog="https://raw.githubusercontent.com/jbruchon/jdupes/master/CHANGES"
 distfiles="https://github.com/jbruchon/jdupes/archive/refs/tags/v${version}.tar.gz"
-checksum=8992d0ff1fe135c685063ce3c9d69d54f1f19f1b32845e84441f888218063cc0
-
-CFLAGS="-DENABLE_DEDUPE"
+checksum=945b69f1570d058b70c40d144c5dfa9d5769f43e9488e8ac4f47bbb9ac973df7
 
 post_install() {
 	vlicense LICENSE

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PR PATCH] [Updated] jdupes: update to 1.22.0, adopt; New package: libjodycode-1.2
  2023-04-13 13:46 [PR PATCH] jdupes: update to 1.22.0, adopt; New package: libjodycode-1.0 cinerea0
                   ` (4 preceding siblings ...)
  2023-04-26 15:01 ` cinerea0
@ 2023-05-10  2:13 ` cinerea0
  2023-05-10  3:32 ` jdupes: update to 1.23.0, adopt; New package: libjodycode-2.0 jbruchon
                   ` (7 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: cinerea0 @ 2023-05-10  2:13 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by cinerea0 against master on the void-packages repository

https://github.com/cinerea0/void-packages jdupes
https://github.com/void-linux/void-packages/pull/43425

jdupes: update to 1.22.0, adopt; New package: libjodycode-1.2
#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**


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

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

From 93f477a1c4e8a80a1c66cb3067d4a64da184b30a Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 9 May 2023 22:13:02 -0400
Subject: [PATCH 1/2] New package: libjodycode-2.0

---
 common/shlibs                |  1 +
 srcpkgs/libjodycode-devel    |  1 +
 srcpkgs/libjodycode/template | 26 ++++++++++++++++++++++++++
 3 files changed, 28 insertions(+)
 create mode 120000 srcpkgs/libjodycode-devel
 create mode 100644 srcpkgs/libjodycode/template

diff --git a/common/shlibs b/common/shlibs
index 89f7e53081f8..951aa86b32d4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4254,3 +4254,4 @@ libayatana-indicator3.so.7 libayatana-indicator-0.9.3_1
 libayatana-appindicator3.so.1 libayatana-appindicator-0.5.91_1
 libplayerctl.so.2 playerctl-2.4.1_1
 libwireplumber-0.4.so.0 wireplumber-0.4.14_1
+libjodycode.so.2 libjodycode-2.0_1
diff --git a/srcpkgs/libjodycode-devel b/srcpkgs/libjodycode-devel
new file mode 120000
index 000000000000..038ea779ae69
--- /dev/null
+++ b/srcpkgs/libjodycode-devel
@@ -0,0 +1 @@
+libjodycode
\ No newline at end of file
diff --git a/srcpkgs/libjodycode/template b/srcpkgs/libjodycode/template
new file mode 100644
index 000000000000..889694e98170
--- /dev/null
+++ b/srcpkgs/libjodycode/template
@@ -0,0 +1,26 @@
+# Template file for 'libjodycode'
+pkgname=libjodycode
+version=2.0
+revision=1
+build_style=gnu-makefile
+make_use_env=yes
+short_desc="Shared code used by several utilities written by Jody Bruchon"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
+license="MIT"
+homepage="https://github.com/jbruchon/libjodycode"
+changelog="https://raw.githubusercontent.com/jbruchon/libjodycode/master/CHANGES"
+distfiles="https://github.com/jbruchon/libjodycode/archive/refs/tags/v${version}.tar.gz"
+checksum=3339e1ed2cfc71bcc459606d283a20a918f35c1ae9966c845c7d76faba93f120
+
+post_install() {
+	vlicense LICENSE
+}
+
+libjodycode-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+	}
+}

From df2e7eca7e68ca1f282a09782f5b9bf6a1e6b1a3 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 9 May 2023 22:13:27 -0400
Subject: [PATCH 2/2] jdupes: update to 1.23.0, adopt

---
 srcpkgs/jdupes/template | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/jdupes/template b/srcpkgs/jdupes/template
index 15a749997c40..df162703bb76 100644
--- a/srcpkgs/jdupes/template
+++ b/srcpkgs/jdupes/template
@@ -1,23 +1,23 @@
 # Template file for 'jdupes'
 pkgname=jdupes
-version=1.21.3
+version=1.23.0
 revision=1
 build_style=gnu-makefile
-make_build_args="ENABLE_BTRFS=1"
+make_build_args="ENABLE_BTRFS=1 ENABLE_DEDUPE=1"
+make_use_env=yes
+makedepends="libjodycode-devel"
 short_desc="Powerful duplicate file finder and an enhanced fork of fdupes"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="MIT"
 homepage="https://github.com/jbruchon/jdupes"
 changelog="https://raw.githubusercontent.com/jbruchon/jdupes/master/CHANGES"
 distfiles="https://github.com/jbruchon/jdupes/archive/refs/tags/v${version}.tar.gz"
-checksum=8992d0ff1fe135c685063ce3c9d69d54f1f19f1b32845e84441f888218063cc0
-
-CFLAGS="-DENABLE_DEDUPE"
+checksum=5fdf7646518a26fefc322d7c9a5953c61db72d96626120ffa7f18197b59153d1
 
 post_install() {
 	vlicense LICENSE
 }
 
 do_check() {
-	./jdupes -v | grep 'Compile-time extensions:.*fsdedup'
+	./jdupes -v | grep 'Compile-time feature flags:.*dedup'
 }

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: jdupes: update to 1.23.0, adopt; New package: libjodycode-2.0
  2023-04-13 13:46 [PR PATCH] jdupes: update to 1.22.0, adopt; New package: libjodycode-1.0 cinerea0
                   ` (5 preceding siblings ...)
  2023-05-10  2:13 ` cinerea0
@ 2023-05-10  3:32 ` jbruchon
  2023-05-10 13:47 ` leahneukirchen
                   ` (6 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: jbruchon @ 2023-05-10  3:32 UTC (permalink / raw)
  To: ml

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

New comment by jbruchon on void-packages repository

https://github.com/void-linux/void-packages/pull/43425#issuecomment-1541298986

Comment:
Hey! I'm actually a Void user and noticed the repo was behind and discovered this. In libjodycode I changed the Makefile to fix this: https://github.com/jbruchon/libjodycode/commit/0a99bf3442fd509e77d7ea52e08efc9e202e44b0 - Thanks for finding this problem!

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: jdupes: update to 1.23.0, adopt; New package: libjodycode-2.0
  2023-04-13 13:46 [PR PATCH] jdupes: update to 1.22.0, adopt; New package: libjodycode-1.0 cinerea0
                   ` (6 preceding siblings ...)
  2023-05-10  3:32 ` jdupes: update to 1.23.0, adopt; New package: libjodycode-2.0 jbruchon
@ 2023-05-10 13:47 ` leahneukirchen
  2023-05-10 15:01 ` jbruchon
                   ` (5 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: leahneukirchen @ 2023-05-10 13:47 UTC (permalink / raw)
  To: ml

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

New comment by leahneukirchen on void-packages repository

https://github.com/void-linux/void-packages/pull/43425#issuecomment-1542249019

Comment:
That fix is not sufficient for cross-compiling.

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: jdupes: update to 1.23.0, adopt; New package: libjodycode-2.0
  2023-04-13 13:46 [PR PATCH] jdupes: update to 1.22.0, adopt; New package: libjodycode-1.0 cinerea0
                   ` (7 preceding siblings ...)
  2023-05-10 13:47 ` leahneukirchen
@ 2023-05-10 15:01 ` jbruchon
  2023-05-10 15:48 ` leahneukirchen
                   ` (4 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: jbruchon @ 2023-05-10 15:01 UTC (permalink / raw)
  To: ml

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

New comment by jbruchon on void-packages repository

https://github.com/void-linux/void-packages/pull/43425#issuecomment-1542366929

Comment:
@leahneukirchen Then how about https://github.com/jbruchon/libjodycode/commit/672c012fd2a51de9fc1f9327d3be501a22aa7949

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: jdupes: update to 1.23.0, adopt; New package: libjodycode-2.0
  2023-04-13 13:46 [PR PATCH] jdupes: update to 1.22.0, adopt; New package: libjodycode-1.0 cinerea0
                   ` (8 preceding siblings ...)
  2023-05-10 15:01 ` jbruchon
@ 2023-05-10 15:48 ` leahneukirchen
  2023-05-10 15:56 ` jbruchon
                   ` (3 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: leahneukirchen @ 2023-05-10 15:48 UTC (permalink / raw)
  To: ml

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

New comment by leahneukirchen on void-packages repository

https://github.com/void-linux/void-packages/pull/43425#issuecomment-1542435320

Comment:
Doesn't work with clang e.g.

What about this?

```
true | $CC -dM -E - |grep __x86_64
```

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: jdupes: update to 1.23.0, adopt; New package: libjodycode-2.0
  2023-04-13 13:46 [PR PATCH] jdupes: update to 1.22.0, adopt; New package: libjodycode-1.0 cinerea0
                   ` (9 preceding siblings ...)
  2023-05-10 15:48 ` leahneukirchen
@ 2023-05-10 15:56 ` jbruchon
  2023-05-10 15:56 ` jbruchon
                   ` (2 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: jbruchon @ 2023-05-10 15:56 UTC (permalink / raw)
  To: ml

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

New comment by jbruchon on void-packages repository

https://github.com/void-linux/void-packages/pull/43425#issuecomment-1542446044

Comment:
@leahneukirchen I don't have Clang here to test with but I applied your suggestion and it's also working.

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: jdupes: update to 1.23.0, adopt; New package: libjodycode-2.0
  2023-04-13 13:46 [PR PATCH] jdupes: update to 1.22.0, adopt; New package: libjodycode-1.0 cinerea0
                   ` (10 preceding siblings ...)
  2023-05-10 15:56 ` jbruchon
@ 2023-05-10 15:56 ` jbruchon
  2023-05-17  3:30 ` [PR PATCH] [Updated] " cinerea0
  2023-05-17 11:34 ` [PR PATCH] [Merged]: jdupes: update to 1.23.0, adopt; New package: libjodycode-2.0.1 leahneukirchen
  13 siblings, 0 replies; 15+ messages in thread
From: jbruchon @ 2023-05-10 15:56 UTC (permalink / raw)
  To: ml

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

New comment by jbruchon on void-packages repository

https://github.com/void-linux/void-packages/pull/43425#issuecomment-1542446044

Comment:
@leahneukirchen I don't have Clang here to test with but I applied your suggestion and it's also working. https://github.com/jbruchon/libjodycode/commit/e832964dc2d733576379806a016b24880207f883

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PR PATCH] [Updated] jdupes: update to 1.23.0, adopt; New package: libjodycode-2.0
  2023-04-13 13:46 [PR PATCH] jdupes: update to 1.22.0, adopt; New package: libjodycode-1.0 cinerea0
                   ` (11 preceding siblings ...)
  2023-05-10 15:56 ` jbruchon
@ 2023-05-17  3:30 ` cinerea0
  2023-05-17 11:34 ` [PR PATCH] [Merged]: jdupes: update to 1.23.0, adopt; New package: libjodycode-2.0.1 leahneukirchen
  13 siblings, 0 replies; 15+ messages in thread
From: cinerea0 @ 2023-05-17  3:30 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by cinerea0 against master on the void-packages repository

https://github.com/cinerea0/void-packages jdupes
https://github.com/void-linux/void-packages/pull/43425

jdupes: update to 1.23.0, adopt; New package: libjodycode-2.0
#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**


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

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

From fa185fac691360473fe270a505ebc85718a5df9e Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 16 May 2023 23:29:24 -0400
Subject: [PATCH 1/2] New package: libjodycode-2.0.1

---
 common/shlibs                |  1 +
 srcpkgs/libjodycode-devel    |  1 +
 srcpkgs/libjodycode/template | 26 ++++++++++++++++++++++++++
 3 files changed, 28 insertions(+)
 create mode 120000 srcpkgs/libjodycode-devel
 create mode 100644 srcpkgs/libjodycode/template

diff --git a/common/shlibs b/common/shlibs
index da8b12690cb6..512268d5030f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4245,3 +4245,4 @@ libayatana-indicator3.so.7 libayatana-indicator-0.9.3_1
 libayatana-appindicator3.so.1 libayatana-appindicator-0.5.91_1
 libplayerctl.so.2 playerctl-2.4.1_1
 libwireplumber-0.4.so.0 wireplumber-0.4.14_1
+libjodycode.so.2 libjodycode-2.0.1_1
diff --git a/srcpkgs/libjodycode-devel b/srcpkgs/libjodycode-devel
new file mode 120000
index 000000000000..038ea779ae69
--- /dev/null
+++ b/srcpkgs/libjodycode-devel
@@ -0,0 +1 @@
+libjodycode
\ No newline at end of file
diff --git a/srcpkgs/libjodycode/template b/srcpkgs/libjodycode/template
new file mode 100644
index 000000000000..645266101089
--- /dev/null
+++ b/srcpkgs/libjodycode/template
@@ -0,0 +1,26 @@
+# Template file for 'libjodycode'
+pkgname=libjodycode
+version=2.0.1
+revision=1
+build_style=gnu-makefile
+make_use_env=yes
+short_desc="Shared code used by several utilities written by Jody Bruchon"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
+license="MIT"
+homepage="https://github.com/jbruchon/libjodycode"
+changelog="https://raw.githubusercontent.com/jbruchon/libjodycode/master/CHANGES"
+distfiles="https://github.com/jbruchon/libjodycode/archive/refs/tags/v${version}.tar.gz"
+checksum=1fdd106ab4d90aa1c0a2546299144f62d18b90acada2d6ee25370c4907048927
+
+post_install() {
+	vlicense LICENSE
+}
+
+libjodycode-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+	}
+}

From 0b89148906837d9ac6e5205804893496c5797851 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 16 May 2023 23:29:50 -0400
Subject: [PATCH 2/2] jdupes: update to 1.23.0, adopt

---
 srcpkgs/jdupes/template | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/jdupes/template b/srcpkgs/jdupes/template
index 15a749997c40..df162703bb76 100644
--- a/srcpkgs/jdupes/template
+++ b/srcpkgs/jdupes/template
@@ -1,23 +1,23 @@
 # Template file for 'jdupes'
 pkgname=jdupes
-version=1.21.3
+version=1.23.0
 revision=1
 build_style=gnu-makefile
-make_build_args="ENABLE_BTRFS=1"
+make_build_args="ENABLE_BTRFS=1 ENABLE_DEDUPE=1"
+make_use_env=yes
+makedepends="libjodycode-devel"
 short_desc="Powerful duplicate file finder and an enhanced fork of fdupes"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="MIT"
 homepage="https://github.com/jbruchon/jdupes"
 changelog="https://raw.githubusercontent.com/jbruchon/jdupes/master/CHANGES"
 distfiles="https://github.com/jbruchon/jdupes/archive/refs/tags/v${version}.tar.gz"
-checksum=8992d0ff1fe135c685063ce3c9d69d54f1f19f1b32845e84441f888218063cc0
-
-CFLAGS="-DENABLE_DEDUPE"
+checksum=5fdf7646518a26fefc322d7c9a5953c61db72d96626120ffa7f18197b59153d1
 
 post_install() {
 	vlicense LICENSE
 }
 
 do_check() {
-	./jdupes -v | grep 'Compile-time extensions:.*fsdedup'
+	./jdupes -v | grep 'Compile-time feature flags:.*dedup'
 }

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PR PATCH] [Merged]: jdupes: update to 1.23.0, adopt; New package: libjodycode-2.0.1
  2023-04-13 13:46 [PR PATCH] jdupes: update to 1.22.0, adopt; New package: libjodycode-1.0 cinerea0
                   ` (12 preceding siblings ...)
  2023-05-17  3:30 ` [PR PATCH] [Updated] " cinerea0
@ 2023-05-17 11:34 ` leahneukirchen
  13 siblings, 0 replies; 15+ messages in thread
From: leahneukirchen @ 2023-05-17 11:34 UTC (permalink / raw)
  To: ml

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

There's a merged pull request on the void-packages repository

jdupes: update to 1.23.0, adopt; New package: libjodycode-2.0.1
https://github.com/void-linux/void-packages/pull/43425

Description:
#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**


^ permalink raw reply	[flat|nested] 15+ messages in thread

end of thread, other threads:[~2023-05-17 11:34 UTC | newest]

Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-04-13 13:46 [PR PATCH] jdupes: update to 1.22.0, adopt; New package: libjodycode-1.0 cinerea0
2023-04-21  2:05 ` [PR PATCH] [Updated] " cinerea0
2023-04-21  2:10 ` [PR PATCH] [Updated] jdupes: update to 1.22.0, adopt; New package: libjodycode-1.1 cinerea0
2023-04-25 14:48 ` cinerea0
2023-04-25 19:52 ` [PR PATCH] [Updated] jdupes: update to 1.22.0, adopt; New package: libjodycode-1.2 cinerea0
2023-04-26 15:01 ` cinerea0
2023-05-10  2:13 ` cinerea0
2023-05-10  3:32 ` jdupes: update to 1.23.0, adopt; New package: libjodycode-2.0 jbruchon
2023-05-10 13:47 ` leahneukirchen
2023-05-10 15:01 ` jbruchon
2023-05-10 15:48 ` leahneukirchen
2023-05-10 15:56 ` jbruchon
2023-05-10 15:56 ` jbruchon
2023-05-17  3:30 ` [PR PATCH] [Updated] " cinerea0
2023-05-17 11:34 ` [PR PATCH] [Merged]: jdupes: update to 1.23.0, adopt; New package: libjodycode-2.0.1 leahneukirchen

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).