guix_mirror_bot pushed a commit to branch master
in repository guix.
commit 5c4bd2dbdc3bf8ca2739284878831820528d85ab
Author: Sughosha <[email protected]>
AuthorDate: Mon Aug 18 07:49:13 2025 +0530
gnu: qgit: Update to 2.12.
* gnu/packages/version-control.scm (qgit): Update to 2.12.
[arguments]<#:qtbase>: Use qtbase.
[inputs]: Add qt5compat and qtwayland.
* gnu/packages/patches/qgit-2.12-fix-search-style.patch: New file.
* gnu/local.mk: Register it.
Change-Id: I13d8961005ad5ccd79a9df96e3c48347e11f5605
Signed-off-by: Zheng Junjie <[email protected]>
---
gnu/local.mk | 1 +
.../patches/qgit-2.12-fix-search-style.patch | 23 ++++++++++++++++++++++
gnu/packages/version-control.scm | 15 +++++++++++---
3 files changed, 36 insertions(+), 3 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 43caa2ce0b..86c7da1d51 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -2081,6 +2081,7 @@ dist_patch_DATA =
\
%D%/packages/patches/python-sphinx-prompt-docutils-0.19.patch \
%D%/packages/patches/python-zeroc-ice-3.6.5-python-3.11-support.patch
\
%D%/packages/patches/qcodeeditor-qt6.patch \
+ %D%/packages/patches/qgit-2.12-fix-search-style.patch \
%D%/packages/patches/qtdeclarative-5-disable-qmlcache.patch \
%D%/packages/patches/qtdeclarative-disable-qmlcache.patch \
%D%/packages/patches/qtlocation-5.15.8-mapboxgl-gcc13.patch \
diff --git a/gnu/packages/patches/qgit-2.12-fix-search-style.patch
b/gnu/packages/patches/qgit-2.12-fix-search-style.patch
new file mode 100644
index 0000000000..07d87dfeb2
--- /dev/null
+++ b/gnu/packages/patches/qgit-2.12-fix-search-style.patch
@@ -0,0 +1,23 @@
+From 757c0fc17b879f5a5719e6959c926c997ef5c4f2 Mon Sep 17 00:00:00 2001
+From: Cristian Tibirna <[email protected]>
+Date: Mon, 28 Jul 2025 20:21:11 -0400
+Subject: [PATCH] Fix issue #162: match partial strings as well as wildcards in
+ listview search
+
+---
+ src/listview.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/listview.cpp b/src/listview.cpp
+index 3223d61..8cd8f71 100644
+--- a/src/listview.cpp
++++ b/src/listview.cpp
+@@ -1321,7 +1321,7 @@ bool ListViewProxy::filterAcceptsRow(int source_row,
const QModelIndex&) const {
+ int ListViewProxy::setFilter(bool isOn, bool h, SCRef fl, int cn, ShaSet* s) {
+
+ #if QT_VERSION >= 0x060000
+- filter = QRegularExpression::fromWildcard(fl, Qt::CaseInsensitive);
++ filter = QRegularExpression::fromWildcard(fl, Qt::CaseInsensitive,
QRegularExpression::UnanchoredWildcardConversion);
+ #else
+ filter = QRegExp(fl, Qt::CaseInsensitive, QRegExp::Wildcard);
+ #endif
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index cb54059240..df0b75685d 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -172,6 +172,7 @@
#:use-module (gnu packages xml)
#:use-module (gnu packages emacs)
#:use-module (gnu packages compression)
+ #:use-module (gnu packages qt)
#:use-module (gnu packages sdl)
#:use-module (gnu packages swig)
#:use-module (gnu packages sync)
@@ -4609,7 +4610,7 @@ TkDiff is included for browsing and merging your
changes.")
(define-public qgit
(package
(name "qgit")
- (version "2.11")
+ (version "2.12")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -4618,12 +4619,20 @@ TkDiff is included for browsing and merging your
changes.")
(file-name (git-file-name name version))
(sha256
(base32
- "11948zzszi28js3pbxlss8r85jlb6fizxm8f5ljqk67m5qxk2v0f"))))
+ "16gy1xyn4xa3bjziphcdixbf6qv3bcs81z2k9j6biwpzs1ingkdb"))
+ ;; TODO: Remove this patch in the next update since it is fixed
+ ;; in the next commit.
+ (patches
+ (search-patches "qgit-2.12-fix-search-style.patch"))))
(build-system qt-build-system)
(arguments
- (list #:tests? #f)) ;no tests
+ (list #:qtbase qtbase
+ #:tests? #f)) ;no tests
(propagated-inputs
(list git))
+ (inputs
+ (list qt5compat
+ qtwayland))
(home-page "https://github.com/tibirna/qgit";)
(synopsis "Graphical front-end for git")
(description
