* [gentoo-commits] repo/proj/guru:master commit in: dev-vcs/gitqlient/, dev-vcs/gitqlient/files/
@ 2023-02-13 11:28 Andrew Ammerlaan
0 siblings, 0 replies; 2+ messages in thread
From: Andrew Ammerlaan @ 2023-02-13 11:28 UTC (permalink / raw
To: gentoo-commits
commit: 1f20f96c5592f63b083c5643e98e8630371cfa2b
Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Sun Feb 12 17:12:15 2023 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sun Feb 12 17:17:54 2023 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1f20f96c
dev-vcs/gitqlient: 1.6.1-r1 bump, fix tabs style
For KDE Plasma some QWidgets aren't filled with proper bg colour
resulting in grey fg fonts over white bg (for dark theme).
Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru>
.../files/gitqlient-1.6.1_fix_tabs_style.patch | 102 +++++++++++++++++++++
dev-vcs/gitqlient/gitqlient-1.6.1-r1.ebuild | 57 ++++++++++++
2 files changed, 159 insertions(+)
diff --git a/dev-vcs/gitqlient/files/gitqlient-1.6.1_fix_tabs_style.patch b/dev-vcs/gitqlient/files/gitqlient-1.6.1_fix_tabs_style.patch
new file mode 100644
index 000000000..34af553be
--- /dev/null
+++ b/dev-vcs/gitqlient/files/gitqlient-1.6.1_fix_tabs_style.patch
@@ -0,0 +1,102 @@
+diff -Naur a/src/aux_widgets/InitialRepoConfig.ui b/src/aux_widgets/InitialRepoConfig.ui
+--- a/src/aux_widgets/InitialRepoConfig.ui
++++ b/src/aux_widgets/InitialRepoConfig.ui
+@@ -7,7 +7,7 @@
+ <x>0</x>
+ <y>0</y>
+ <width>600</width>
+- <height>400</height>
++ <height>500</height>
+ </rect>
+ </property>
+ <property name="minimumSize">
+@@ -184,6 +184,12 @@
+ <property name="title">
+ <string>Credentials configuration</string>
+ </property>
++ <property name="autoFillBackground">
++ <bool>false</bool>
++ </property>
++ <property name="styleSheet">
++ <string notr="true">background: transparent;</string>
++ </property>
+ <layout class="QGridLayout" name="gridLayout_2">
+ <property name="leftMargin">
+ <number>0</number>
+diff -Naur a/src/big_widgets/ConfigWidget.ui b/src/big_widgets/ConfigWidget.ui
+--- a/src/big_widgets/ConfigWidget.ui
++++ b/src/big_widgets/ConfigWidget.ui
+@@ -678,7 +678,7 @@
+ <number>10</number>
+ </property>
+ <item row="0" column="0" colspan="2">
+- <widget class="QCheckBox" name="chbCredentials">
++ <widget class="CheckBox" name="chbCredentials">
+ <property name="text">
+ <string>Store credentials using GitQlient (Current session or in Storage)</string>
+ </property>
+@@ -1018,6 +1018,12 @@
+ <property name="title">
+ <string>Installed plugins</string>
+ </property>
++ <property name="autoFillBackground">
++ <bool>false</bool>
++ </property>
++ <property name="styleSheet">
++ <string notr="true">background: transparent;</string>
++ </property>
+ <layout class="QGridLayout" name="pluginsLayout">
+ <property name="leftMargin">
+ <number>10</number>
+@@ -1129,6 +1135,12 @@
+ <property name="title">
+ <string>Official GitQlient plugins</string>
+ </property>
++ <property name="autoFillBackground">
++ <bool>false</bool>
++ </property>
++ <property name="styleSheet">
++ <string notr="true">background: transparent;</string>
++ </property>
+ <layout class="QGridLayout" name="availablePluginsLayout">
+ <property name="leftMargin">
+ <number>10</number>
+@@ -1213,6 +1225,12 @@
+ <property name="title">
+ <string>Branches panel</string>
+ </property>
++ <property name="autoFillBackground">
++ <bool>false</bool>
++ </property>
++ <property name="styleSheet">
++ <string notr="true">background: transparent;</string>
++ </property>
+ <layout class="QGridLayout" name="gridLayout_8">
+ <item row="0" column="1">
+ <widget class="QLabel" name="label_62">
+@@ -1250,6 +1268,12 @@
+ <property name="title">
+ <string>GitQlient repo operations</string>
+ </property>
++ <property name="autoFillBackground">
++ <bool>false</bool>
++ </property>
++ <property name="styleSheet">
++ <string notr="true">background: transparent;</string>
++ </property>
+ <layout class="QGridLayout" name="gridLayout_9">
+ <item row="3" column="1">
+ <widget class="QLabel" name="label_45">
+@@ -1315,6 +1339,12 @@
+ <property name="title">
+ <string>GitQlient general</string>
+ </property>
++ <property name="autoFillBackground">
++ <bool>false</bool>
++ </property>
++ <property name="styleSheet">
++ <string notr="true">background: transparent;</string>
++ </property>
+ <layout class="QGridLayout" name="gridLayout_10">
+ <item row="3" column="1">
+ <widget class="QLabel" name="label_54">
diff --git a/dev-vcs/gitqlient/gitqlient-1.6.1-r1.ebuild b/dev-vcs/gitqlient/gitqlient-1.6.1-r1.ebuild
new file mode 100644
index 000000000..64cdfd1bf
--- /dev/null
+++ b/dev-vcs/gitqlient/gitqlient-1.6.1-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit optfeature qmake-utils xdg
+
+MY_PN="GitQlient"
+
+DESCRIPTION="Multi-platform Git client written with Qt"
+HOMEPAGE="https://github.com/francescmm/GitQlient"
+
+SRC_URI="https://github.com/francescmm/${MY_PN}/releases/download/v${PV}/${PN}_${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+S="${WORKDIR}/${PN}_${PV}"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+
+DEPEND="
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtwidgets:5
+"
+RDEPEND="
+ ${DEPEND}
+ dev-vcs/git
+"
+
+PATCHES=( "$FILESDIR/${P}_fix_tabs_style.patch" )
+
+src_prepare() {
+ default
+
+ # Drop 'fatal' warning on version detection via git command:
+ sed -i -e "/^GQ_SHA/d" \
+ -e "/VERSION =/s| \$\$system(git rev-parse --short HEAD)||" "${MY_PN}".pro || die
+
+ sed -i -e "s/Office/Development/" "${S}/src/resources/${PN}.desktop" || die
+}
+
+src_configure() {
+ eqmake5 PREFIX=/usr "${MY_PN}".pro
+}
+
+src_install() {
+ emake INSTALL_ROOT="${D}" install
+}
+
+pkg_postinst() {
+ optfeature "Terminal tab plugin support" x11-libs/qtermwidget
+ optfeature "GitServer plugin support" dev-vcs/gitqlient-gitserver-plugin
+ optfeature "Jenkins plugin support" dev-vcs/gitqlient-jenkins-plugin
+ elog "To use plugins set PluginFolder in GitQlient settings Plugin tab to /usr/$(get_libdir)"
+ xdg_pkg_postinst
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: dev-vcs/gitqlient/, dev-vcs/gitqlient/files/
@ 2023-02-13 11:28 Andrew Ammerlaan
0 siblings, 0 replies; 2+ messages in thread
From: Andrew Ammerlaan @ 2023-02-13 11:28 UTC (permalink / raw
To: gentoo-commits
commit: bc6949dd559ac386c743e1a4602121e6b8d008ef
Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Sun Feb 12 23:45:11 2023 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sun Feb 12 23:45:11 2023 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=bc6949dd
dev-vcs/gitqlient: 1.6.1-r1, add fix for Commit Description output
Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru>
.../files/gitqlient-1.6.1_fix_commit_longLog.patch | 34 ++++++++++++++++++++++
dev-vcs/gitqlient/gitqlient-1.6.1-r1.ebuild | 5 +++-
2 files changed, 38 insertions(+), 1 deletion(-)
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 000000000..b955ea2dc
--- /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 64cdfd1bf..3108b7dc0 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
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-02-13 11:28 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-02-13 11:28 [gentoo-commits] repo/proj/guru:master commit in: dev-vcs/gitqlient/, dev-vcs/gitqlient/files/ Andrew Ammerlaan
-- strict thread matches above, loose matches on Subject: below --
2023-02-13 11:28 Andrew Ammerlaan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox