diff --git a/dev-vcs/gitqlient/files/gitqlient-1.6.1_fix_commit_longLog.patch b/dev-vcs/gitqlient/files/gitqlient-1.6.1_fix_commit_longLog.patch
new file mode 100644
index 0000000000..b955ea2dcf
--- /dev/null
+++ b/dev-vcs/gitqlient/files/gitqlient-1.6.1_fix_commit_longLog.patch
@@ -0,0 +1,34 @@
+diff -Naur a/src/cache/CommitInfo.cpp b/src/cache/CommitInfo.cpp
+--- a/src/cache/CommitInfo.cpp
++++ b/src/cache/CommitInfo.cpp
+@@ -16,7 +16,7 @@
+    parseDiff(data, 1);
+ }
+ 
+-void CommitInfo::parseDiff(QByteArray &data, int startingField)
++void CommitInfo::parseDiff(QByteArray &data, qsizetype startingField)
+ {
+    if (data.isEmpty())
+       return;
+@@ -39,9 +39,9 @@
+       committer = fields.at(startingField++);
+       author = fields.at(startingField++);
+       dateSinceEpoch = std::chrono::seconds(fields.at(startingField++).toInt());
+-      shortLog = fields.at(startingField);
++      shortLog = fields.at(startingField++);
+ 
+-      for (auto i = 6; i < fields.count(); ++i)
++      for (auto i = startingField; i < fields.count(); ++i)
+          longLog += fields.at(i) + '\n';
+ 
+       longLog = longLog.trimmed();
+diff -Naur a/src/cache/CommitInfo.h b/src/cache/CommitInfo.h
+--- a/src/cache/CommitInfo.h
++++ b/src/cache/CommitInfo.h
+@@ -96,5 +96,5 @@
+ 
+    friend class GitCache;
+ 
+-   void parseDiff(QByteArray &data, int startingField);
++   void parseDiff(QByteArray &data, qsizetype startingField);
+ };
diff --git a/dev-vcs/gitqlient/gitqlient-1.6.1-r1.ebuild b/dev-vcs/gitqlient/gitqlient-1.6.1-r1.ebuild
index 64cdfd1bfd..3108b7dc01 100644
--- a/dev-vcs/gitqlient/gitqlient-1.6.1-r1.ebuild
+++ b/dev-vcs/gitqlient/gitqlient-1.6.1-r1.ebuild
@@ -28,7 +28,10 @@ RDEPEND="
 	dev-vcs/git
 "
 
-PATCHES=( "$FILESDIR/${P}_fix_tabs_style.patch" )
+PATCHES=(
+	"$FILESDIR/${P}_fix_tabs_style.patch"
+	"$FILESDIR/${P}_fix_commit_longLog.patch"
+)
 
 src_prepare() {
 	default