Subject: bug#75937: closed (Re: [bug#75937] [PATCH v2 0/2] Fix and update git-filter-repo)

From: [email-masked] (GNU bug Tracking System)
Date: Thu, 30 Jan 2025 12:31:04 +0000

Your bug report

#75937: [PATCH] gnu: git-filter-repo: Update to 2.47.0.

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
75937: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=75937
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: [bug#75937] [PATCH v2 0/2] Fix and update git-filter-repo
From: Hilton Chain <[email-masked]>
To: Nicolas Graves <[email-masked]>
Cc: [email-masked]
Date: Thu, 30 Jan 2025 20:22:21 +0800
List-Id: <debbugs-submit.debbugs.gnu.org>

On Thu, 30 Jan 2025 17:04:22 +0800,
Nicolas Graves via Guix-patches via wrote:
>
> This is a fixup to the previously sent patch series.
> Changes:
>  - cleanly separated the fix build and the update part.
>  - downgraded update from 2.47.0 to 2.45.0 because 2.47.0 breaks b4 package test suite. See https://github.com/newren/git-filter-repo/issues/638
>
> Nicolas Graves (2):
>   gnu: git-filter-repo: Fix build.
>   gnu: git-filter-repo: Update to 2.45.0.
>
>  .../git-filter-repo-generate-doc.patch        | 20 +++++++++----------
>  gnu/packages/version-control.scm              | 11 +++++++---
>  2 files changed, 17 insertions(+), 14 deletions(-)
>
> --
> 2.48.1

Applied as
a400f3d754c gnu: git-filter-repo: Update to 2.45.0.
c5a4937f0e1 gnu: git-filter-repo: Fix build.

Thanks!

Subject: [PATCH] gnu: git-filter-repo: Update to 2.47.0.
From: Nicolas Graves <[email-masked]>
To: [email-masked]
Date: Thu, 30 Jan 2025 01:45:10 +0100
List-Id: <debbugs-submit.debbugs.gnu.org>

* gnu/packages/version-control.scm (git-filter-repo): Update to
2.47.0.
[arguments]<#:phases>: Adapt phase 'unpack-git-source to handle the
asciidoc.conf renamed to asciidoc.conf.in in upstream git.
* gnu/packages/patches/git-filter-repo-generate-doc.patch: Refresh
patch.
---
 .../git-filter-repo-generate-doc.patch        | 20 +++++++++----------
 gnu/packages/version-control.scm              | 11 +++++++---
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/gnu/packages/patches/git-filter-repo-generate-doc.patch b/gnu/packages/patches/git-filter-repo-generate-doc.patch
index 4535ae5bc4..baf6fd4f8f 100644
--- a/gnu/packages/patches/git-filter-repo-generate-doc.patch
+++ b/gnu/packages/patches/git-filter-repo-generate-doc.patch
@@ -1,4 +1,4 @@
-From 56e6857e71d2b2a2236625f3c8b112bd40a8b164 Mon Sep 17 00:00:00 2001
+From d44e90189f3dfc47b86a457cb3493478207fa14d Mon Sep 17 00:00:00 2001
 From: Josselin Poiret <[email-masked]>
 Date: Fri, 16 Feb 2024 00:21:06 +0800
 Subject: [PATCH] Add documentation generation.
@@ -53,13 +53,13 @@ index 0000000..d81ffbe
 +man: man1/git-filter-repo.1
 +html: html/git-filter-repo.html
 diff --git a/Makefile b/Makefile
-index a443450..d965ae5 100644
+index 3330a1d..801da8f 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -20,21 +20,10 @@ test:
+@@ -21,21 +21,10 @@ test:
  fixup_locale:
  	sed -ie s%@@LOCALEDIR@@%$(localedir)% git-filter-repo
-
+ 
 -# People installing from tarball will already have man1/git-filter-repo.1 and
 -# html/git-filter-repo.html.  But let's support people installing from a git
 -# clone too; for them, just cheat and snag a copy of the built docs that I
@@ -67,7 +67,7 @@ index a443450..d965ae5 100644
 -snag_docs: Documentation/man1/git-filter-repo.1 Documentation/html/git-filter-repo.html
 +doc:
 +	$(MAKE) -C Documentation man html
-
+ 
 -Documentation/man1/git-filter-repo.1:
 -	mkdir -p Documentation/man1
 -	git show origin/docs:man1/git-filter-repo.1 >Documentation/man1/git-filter-repo.1
@@ -78,11 +78,9 @@ index a443450..d965ae5 100644
 -
 -install: snag_docs #fixup_locale
 +install: doc #fixup_locale
- 	install -Dm0755 git-filter-repo "$(DESTDIR)/$(bindir)/git-filter-repo"
- 	install -dm0755 "$(DESTDIR)/$(pythondir)"
+ 	$(INSTALL) -Dm0755 git-filter-repo "$(DESTDIR)/$(bindir)/git-filter-repo"
+ 	$(INSTALL) -dm0755 "$(DESTDIR)/$(pythondir)"
  	ln -sf "$(bindir)/git-filter-repo" "$(DESTDIR)/$(pythondir)/git_filter_repo.py"
-
-base-commit: cbc6535694380d3a3bf3e5c96410d4ce7e8de94f
---
-2.41.0
+-- 
+2.47.1
 
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 636509d6c5..523ce00333 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -4392,7 +4392,7 @@ (define-public qgit
 (define-public git-filter-repo
   (package
     (name "git-filter-repo")
-    (version "2.38.0")
+    (version "2.47.0")
     (source
      (origin
        (method git-fetch)
@@ -4402,7 +4402,7 @@ (define-public git-filter-repo
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "1al43zpw1mdfy9i05w4xw178abypjwnkk52lqvmbl19lr1l47r4i"))
+         "15gwl1gax7rxwjd7q4az25xc1wmmxd1f5q63wkv4n9dab6i4ighx"))
        ;; Modified from <https://github.com/newren/git-filter-repo/pull/477>.
        ;; Used with 'unpack-git-source phase.
        (patches (search-patches "git-filter-repo-generate-doc.patch"))))
@@ -4434,7 +4434,12 @@ (define-public git-filter-repo
                  #:source #+(package-source git))
                 (for-each
                  (cut install-file <> doc-source)
-                 (find-files "." "asciidoc\\.conf$|manpage.*\\.xsl$"))
+                 (find-files "." "asciidoc\\.conf\\.in$|manpage.*\\.xsl$"))
+                ;; This attributes are not needed.
+                (with-directory-excursion doc-source
+                  (substitute* "asciidoc.conf.in"
+                    (("@GIT_(VERSION|DATE)@") ""))
+                  (rename-file "asciidoc.conf.in" "asciidoc.conf"))
                 (chdir old-path)
                 (delete-file-recursively "git-source"))))
           (add-before 'build 'set-pythondir
-- 
2.47.1

-- 
Best regards,
Nicolas Graves