Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package qgit for openSUSE:Factory checked in
at 2025-07-15 16:43:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qgit (Old)
and /work/SRC/openSUSE:Factory/.qgit.new.7373 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qgit"
Tue Jul 15 16:43:53 2025 rev:27 rq:1293107 version:2.11
Changes:
--------
--- /work/SRC/openSUSE:Factory/qgit/qgit.changes 2022-02-05
23:23:41.711714580 +0100
+++ /work/SRC/openSUSE:Factory/.qgit.new.7373/qgit.changes 2025-07-15
16:45:04.110676881 +0200
@@ -1,0 +2,6 @@
+Sat Jul 5 08:55:41 UTC 2025 - Andreas Stieger <andreas.stie...@gmx.de>
+
+- update to 2.11:
+ * Fix annotate when working on the Linux kernel git tree
+
+-------------------------------------------------------------------
Old:
----
qgit-2.10.tar.gz
New:
----
qgit-2.11.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qgit.spec ++++++
--- /var/tmp/diff_new_pack.jMlnNM/_old 2025-07-15 16:45:04.854707946 +0200
+++ /var/tmp/diff_new_pack.jMlnNM/_new 2025-07-15 16:45:04.854707946 +0200
@@ -2,6 +2,7 @@
# spec file for package qgit
#
# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2025 Andreas Stieger <andreas.stie...@gmx.de>
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +18,7 @@
Name: qgit
-Version: 2.10
+Version: 2.11
Release: 0
Summary: Graphical Git Repository Viewer
License: GPL-2.0-or-later
@@ -56,7 +57,7 @@
picking single modified files.
%prep
-%setup -q -n qgit-qgit-%{version}
+%autosetup -p1 -n qgit-qgit-%{version}
%build
%cmake
@@ -65,6 +66,9 @@
%install
%cmake_install
+%check
+%ctest
+
%files
%license COPYING.rtf
%doc README.adoc
++++++ qgit-2.10.tar.gz -> qgit-2.11.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qgit-qgit-2.10/.github/workflows/build.yaml
new/qgit-qgit-2.11/.github/workflows/build.yaml
--- old/qgit-qgit-2.10/.github/workflows/build.yaml 2022-01-11
01:33:53.000000000 +0100
+++ new/qgit-qgit-2.11/.github/workflows/build.yaml 2025-04-26
23:07:21.000000000 +0200
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-name: Build (Linux, Ubuntu 20.04 LTS)
+name: Build (Linux, Ubuntu 22.04 LTS)
on:
- pull_request
@@ -22,8 +22,8 @@
jobs:
build:
- name: Build (Linux, Ubuntu 20.04 LTS)
- runs-on: ubuntu-20.04
+ name: Build (Linux, Ubuntu 22.04 LTS)
+ runs-on: ubuntu-22.04
steps:
- name: 'Install build dependencies'
run: |-
@@ -32,7 +32,6 @@
sudo apt-get install --yes --no-install-recommends \
build-essential \
cmake \
- qt5-default \
qtbase5-dev
- name: 'Checkout Git branch'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qgit-qgit-2.10/README.adoc
new/qgit-qgit-2.11/README.adoc
--- old/qgit-qgit-2.10/README.adoc 2022-01-11 01:33:53.000000000 +0100
+++ new/qgit-qgit-2.11/README.adoc 2025-04-26 23:07:21.000000000 +0200
@@ -57,8 +57,8 @@
also create a a desktop icon linked to 'start_qgit.bat' and double
click on it.
-Installation directory is $HOME/bin under Linux and the directory of git
-exe files under Windows.
+Installation directory is `~/bin` under MacOS, `QT_INSTALL_BINS` (location of
+Qt binaries) under Linux and the directory of git exe files under Windows.
You need to run 'qmake qgit.pro' only the first time to generate Makefile
files, then you simply call 'make' and 'make install'. You may need to
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qgit-qgit-2.10/qgit.appdata.xml
new/qgit-qgit-2.11/qgit.appdata.xml
--- old/qgit-qgit-2.10/qgit.appdata.xml 2022-01-11 01:33:53.000000000 +0100
+++ new/qgit-qgit-2.11/qgit.appdata.xml 2025-04-26 23:07:21.000000000 +0200
@@ -14,12 +14,33 @@
<li>Quick access to git operations</li>
</ul>
</description>
+ <developer id="org.tibirna">
+ <name>Marco Costalba, Cristian Tibirna and the QGit developers</name>
+ </developer>
<screenshots>
- <screenshot type="default"/>
+ <screenshot type="default">
+ <caption>Show repository log</caption>
+
<image>https://raw.githubusercontent.com/tibirna/qgit/refs/heads/master/screenshots/qgit_main_view.png</image>
+ </screenshot>
+ <screenshot>
+ <caption>Show diff for a commit</caption>
+
<image>https://raw.githubusercontent.com/tibirna/qgit/refs/heads/master/screenshots/qgit_diff_view.png</image>
+ </screenshot>
+ <screenshot>
+ <caption>Show repository tree</caption>
+
<image>https://raw.githubusercontent.com/tibirna/qgit/refs/heads/master/screenshots/qgit_tree_view.png</image>
+ </screenshot>
</screenshots>
<url type="homepage">https://github.com/tibirna/qgit</url>
<url type="bugtracker">https://github.com/tibirna/qgit/issues</url>
+ <launchable type="desktop-id">qgit.desktop</launchable>
<provides>
<binary>qgit</binary>
</provides>
+ <releases>
+ <release version="2.11" date="2025-04-26"/>
+ <release version="2.10" date="2022-01-09"/>
+ <release version="2.9" date="2019-08-24"/>
+ </releases>
+ <content_rating type="oars-1.1" />
</component>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qgit-qgit-2.10/qgit_inno_setup.iss
new/qgit-qgit-2.11/qgit_inno_setup.iss
--- old/qgit-qgit-2.10/qgit_inno_setup.iss 2022-01-11 01:33:53.000000000
+0100
+++ new/qgit-qgit-2.11/qgit_inno_setup.iss 2025-04-26 23:07:21.000000000
+0200
@@ -7,7 +7,7 @@
[Setup]
AppName=QGit
-AppVerName=QGit version 2.10
+AppVerName=QGit version 2.11
DefaultDirName={pf}\QGit
DefaultGroupName=QGit
UninstallDisplayIcon={app}\qgit.exe
Binary files old/qgit-qgit-2.10/screenshots/qgit_diff_view.png and
new/qgit-qgit-2.11/screenshots/qgit_diff_view.png differ
Binary files old/qgit-qgit-2.10/screenshots/qgit_main_view.png and
new/qgit-qgit-2.11/screenshots/qgit_main_view.png differ
Binary files old/qgit-qgit-2.10/screenshots/qgit_tree_view.png and
new/qgit-qgit-2.11/screenshots/qgit_tree_view.png differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qgit-qgit-2.10/src/common.h
new/qgit-qgit-2.11/src/common.h
--- old/qgit-qgit-2.10/src/common.h 2022-01-11 01:33:53.000000000 +0100
+++ new/qgit-qgit-2.11/src/common.h 2025-04-26 23:07:21.000000000 +0200
@@ -163,8 +163,6 @@
extern const QColor DARK_GREEN;
// initialized at startup according to system wide settings
- extern QColor ODD_LINE_COL;
- extern QColor EVEN_LINE_COL;
extern QFont STD_FONT;
extern QFont TYPE_WRITER_FONT;
extern QString GIT_DIR;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qgit-qgit-2.10/src/config.h
new/qgit-qgit-2.11/src/config.h
--- old/qgit-qgit-2.10/src/config.h 2022-01-11 01:33:53.000000000 +0100
+++ new/qgit-qgit-2.11/src/config.h 2025-04-26 23:07:21.000000000 +0200
@@ -17,7 +17,7 @@
#define PACKAGE_TARNAME "qgit"
/* Define to the version of this package. */
-#define PACKAGE_VERSION "2.10"
+#define PACKAGE_VERSION "2.11"
/* Version number of package */
-#define VERSION "2.10"
+#define VERSION "2.11"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qgit-qgit-2.10/src/domain.cpp
new/qgit-qgit-2.11/src/domain.cpp
--- old/qgit-qgit-2.10/src/domain.cpp 2022-01-11 01:33:53.000000000 +0100
+++ new/qgit-qgit-2.11/src/domain.cpp 2025-04-26 23:07:21.000000000 +0200
@@ -48,6 +48,13 @@
isLocked = false;
}
+StateInfo::StateInfo(const StateInfo& otherState) :
+ curS(otherState.curS),
+ prevS(otherState.prevS),
+ nextS(otherState.nextS),
+ isLocked(otherState.isLocked)
+{}
+
StateInfo& StateInfo::operator=(const StateInfo& newState) {
if (&newState != this) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qgit-qgit-2.10/src/domain.h
new/qgit-qgit-2.11/src/domain.h
--- old/qgit-qgit-2.10/src/domain.h 2022-01-11 01:33:53.000000000 +0100
+++ new/qgit-qgit-2.11/src/domain.h 2025-04-26 23:07:21.000000000 +0200
@@ -34,6 +34,7 @@
class StateInfo {
public:
StateInfo() { clear(); }
+ StateInfo(const StateInfo& otherState);
StateInfo& operator=(const StateInfo& newState);
bool operator==(const StateInfo& newState) const;
bool operator!=(const StateInfo& newState) const;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qgit-qgit-2.10/src/git.cpp
new/qgit-qgit-2.11/src/git.cpp
--- old/qgit-qgit-2.10/src/git.cpp 2022-01-11 01:33:53.000000000 +0100
+++ new/qgit-qgit-2.11/src/git.cpp 2025-04-26 23:07:21.000000000 +0200
@@ -2170,7 +2170,7 @@
bool Git::startRevList(SCList args, FileHistory* fh) {
- QString baseCmd("git log --topo-order --no-color "
+ QString baseCmd("git -c log.diffMerges=separate log --topo-order
--no-color "
#ifndef Q_OS_WIN32
"--log-size " // FIXME broken on Windows
@@ -2191,7 +2191,7 @@
then, with this option, file history is truncated to
the file deletion revision.
*/
- initCmd << QString("-r -m -p --full-index").split(' ');
+ initCmd << QString("-r -m -p --full-index
--simplify-merges").split(' ');
} else
{} // initCmd << QString("--early-output"); currently disabled
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qgit-qgit-2.10/src/inputdialog.cpp
new/qgit-qgit-2.11/src/inputdialog.cpp
--- old/qgit-qgit-2.10/src/inputdialog.cpp 2022-01-11 01:33:53.000000000
+0100
+++ new/qgit-qgit-2.11/src/inputdialog.cpp 2025-04-26 23:07:21.000000000
+0200
@@ -192,11 +192,15 @@
QString InputDialog::replace(const VariableMap &variables) const
{
QString result = cmd;
+ int shift = 0, start = 0, len = 0; // will keep track of position
shifts during replacements
for (WidgetMap::const_iterator it = widgets.begin(), end =
widgets.end(); it != end; ++it) {
QString token = "%" + it.key() + "%";
WidgetItemPtr item = it.value();
+ start = item->start - shift;
+ len = item->end - item->start;
QString value =
item->widget->property(item->prop_name).toString();
- result.replace(item->start, item->end - item->start, value); //
replace main token
+ result.replace(start, len, value); // replace main token
+ shift += len - value.length();
result.replace(token, value); // replace all other occurences
of %name%
}
for (VariableMap::const_iterator it=variables.begin(),
end=variables.end(); it != end; ++it) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qgit-qgit-2.10/src/listview.cpp
new/qgit-qgit-2.11/src/listview.cpp
--- old/qgit-qgit-2.10/src/listview.cpp 2022-01-11 01:33:53.000000000 +0100
+++ new/qgit-qgit-2.11/src/listview.cpp 2025-04-26 23:07:21.000000000 +0200
@@ -93,11 +93,6 @@
void ListView::setupGeometry() {
- QPalette pl = palette();
- pl.setColor(QPalette::Base, ODD_LINE_COL);
- pl.setColor(QPalette::AlternateBase, EVEN_LINE_COL);
- setPalette(pl); // does not seem to inherit application paletteAnnotate
-
QHeaderView* hv = header();
hv->setStretchLastSection(true);
hv->setSectionResizeMode(LOG_COL, QHeaderView::Interactive);
@@ -829,8 +824,7 @@
#define CENTER_DL x2, 0 , 45
#define R_CENTER m - r, h - r, d, d
- static QColor const & lanePenColor =
QPalette().color(QPalette::WindowText);
- static QPen lanePen(lanePenColor, 2); // fast path here
+ static QPen lanePen(QPalette().color(QPalette::WindowText), 2); // fast
path here
// arc
switch (type) {
@@ -991,10 +985,13 @@
void ListViewDelegate::paintGraph(QPainter* p, const QStyleOptionViewItem& opt,
const QModelIndex& i) const {
- static const QColor & baseColor =
QPalette().color(QPalette::WindowText);
- static const QColor colors[COLORS_NUM] = { baseColor, Qt::red,
DARK_GREEN,
- Qt::blue, Qt::darkGray,
BROWN,
- Qt::magenta, ORANGE };
+ // static const QColor & baseColor =
QPalette().color(QPalette::WindowText);
+ static const QColor colors[COLORS_NUM] = {
+ QPalette().color(QPalette::WindowText),
+ Qt::red, DARK_GREEN,
+ Qt::blue, Qt::darkGray, BROWN,
+ Qt::magenta, ORANGE
+ };
if (opt.state & QStyle::State_Selected)
p->fillRect(opt.rect, opt.palette.highlight());
else if (i.row() & 1)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qgit-qgit-2.10/src/mainimpl.cpp
new/qgit-qgit-2.11/src/mainimpl.cpp
--- old/qgit-qgit-2.10/src/mainimpl.cpp 2022-01-11 01:33:53.000000000 +0100
+++ new/qgit-qgit-2.11/src/mainimpl.cpp 2025-04-26 23:07:21.000000000 +0200
@@ -65,10 +65,6 @@
connect(lineEditSHA, SIGNAL(returnPressed()), this,
SLOT(lineEditSHA_returnPressed()));
connect(lineEditFilter, SIGNAL(returnPressed()), this,
SLOT(lineEditFilter_returnPressed()));
- // create light and dark colors for alternate background
- ODD_LINE_COL = palette().color(QPalette::Base);
- EVEN_LINE_COL = ODD_LINE_COL.darker(103);
-
// our interface to git world
git = new Git(this);
setupShortcuts();
@@ -2143,6 +2139,22 @@
if (!ok || str.isEmpty())
return;
+ // Highlight all occurrences.
+ const QTextCursor origCursor = te->textCursor();
+ te->moveCursor(QTextCursor::Start);
+
+ QList<QTextEdit::ExtraSelection> extras;
+ while(te->find(str)) {
+ QTextEdit::ExtraSelection extra;
+ extra.format.setBackground(Qt::yellow);
+ extra.cursor = te->textCursor();
+ extras.append(extra);
+ }
+ te->setExtraSelections(extras);
+
+ te->setTextCursor(origCursor);
+
+ // Do the normal find().
textToFind = str; // update with valid data only
ActFindNext_activated();
}
@@ -2170,7 +2182,7 @@
static const char* aboutMsg =
"<p><b>QGit version " PACKAGE_VERSION "</b></p>"
"<p>Copyright (c) 2005-2008 Marco Costalba<br>"
- "Copyright (c) 2011-2022 <a href='mailto:tibi...@kde.org'>Cristian
Tibirna</a></p>"
+ "Copyright (c) 2011-2025 <a href='mailto:tibi...@kde.org'>Cristian
Tibirna</a></p>"
"<p>Use and redistribute under the terms of the<br>"
"<a href=\"http://www.gnu.org/licenses/old-licenses/gpl-2.0.html\";>GNU
General Public License Version 2</a></p>"
"<p>Contributors:<br>"
@@ -2202,7 +2214,7 @@
"<nobr>2018 <a href='mailto:ast...@gentoo.org'>Andreas
Sturmlechner</a>,</nobr> "
"<nobr>2018 <a href='mailto:k...@davidedmundson.co.uk'>David
Edmundson</a>,</nobr> "
"<nobr>2016-2018 <a
href='mailto:rhasc...@techfak.uni-bielefeld.de'>Robert Haschke</a>,</nobr> "
- "<nobr>2018-2022 <a href='mailto:filipe.rina...@gmail.com'>Filipe
Rinaldi</a>,</nobr> "
+ "<nobr>2018-2024 <a href='mailto:filipe.rina...@gmail.com'>Filipe
Rinaldi</a>,</nobr> "
"<nobr>2018 <a href='mailto:balb...@gmail.com'>Mateusz
Balbus</a>,</nobr> "
"<nobr>2019-2022 <a href='mailto:sebast...@pipping.org'>Sebastian
Pipping</a>,</nobr> "
"<nobr>2019-2020 <a href='mailto:m...@gmx.eu'>Matthias von
Faber</a>,</nobr> "
@@ -2213,6 +2225,10 @@
"<nobr>2020 <a href='mailto:yyc1...@gmail.com'>Yichao Yu</a>,</nobr> "
"<nobr>2021 <a href='mailto:wickedsm...@users.sourceforge.net'>Karl
Robillard</a></nobr> "
"<nobr>2021 <a href='mailto:vch...@gmail.com'>Vitaly Chesnokov</a></nobr> "
+ "<nobr>2022 <a href='mailto:bits_n_by...@gmx.de'>Frank Dietrich</a></nobr>
"
+ "<nobr>2023 <a href='mailto:urba...@gmail.com'>Danilo
Treffiletti</a></nobr> "
+ "<nobr>2023 <a href='mailto:urba...@gmail.com'>Magnus Holmgren</a></nobr> "
+ "<nobr>2025 <a href='mailto:t...@siosm.fr'>Thimothée Ravier</a></nobr> "
"</p>"
"<p>This version was compiled against Qt " QT_VERSION_STR "</p>";
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qgit-qgit-2.10/src/namespace_def.cpp
new/qgit-qgit-2.11/src/namespace_def.cpp
--- old/qgit-qgit-2.10/src/namespace_def.cpp 2022-01-11 01:33:53.000000000
+0100
+++ new/qgit-qgit-2.11/src/namespace_def.cpp 2025-04-26 23:07:21.000000000
+0200
@@ -136,8 +136,6 @@
const QColor QGit::DARK_GREEN = QColor(0, 205, 0);
// initialized at startup according to system wide settings
-QColor QGit::ODD_LINE_COL;
-QColor QGit::EVEN_LINE_COL;
QString QGit::GIT_DIR;
/*
Binary files old/qgit-qgit-2.10/src/resources/qgit.icns and
new/qgit-qgit-2.11/src/resources/qgit.icns differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qgit-qgit-2.10/src/settings.ui
new/qgit-qgit-2.11/src/settings.ui
--- old/qgit-qgit-2.10/src/settings.ui 2022-01-11 01:33:53.000000000 +0100
+++ new/qgit-qgit-2.11/src/settings.ui 2025-04-26 23:07:21.000000000 +0200
@@ -164,7 +164,7 @@
<number>0</number>
</property>
<item>
- <widget class="QLabel" name="textLabelCodecs">
+ <widget class="QLabel" name="textLabelDoubleClick">
<property name="toolTip">
<string>Select action on file double click</string>
</property>
