dev-vcs/gitqlient: drop 1.6.1-r1 in favor of 1.6.2_pre20230519

Signed-off-by: Sergey Torokhov <torokhov-s-a@yandex.ru>
2026-07-10 07:33:19 -04:00 · 2023-06-02 23:54:49 +03:00
parent 12ace9e099
commit 123377962d
3 changed files with 0 additions and 196 deletions
--- 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
@@ -1,34 +0,0 @@
-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);
- };
--- 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
@@ -1,102 +0,0 @@
-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">
--- a/dev-vcs/gitqlient/gitqlient-1.6.1-r1.ebuild
+++ b/dev-vcs/gitqlient/gitqlient-1.6.1-r1.ebuild
@@ -1,60 +0,0 @@
-# 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"
-	"$FILESDIR/${P}_fix_commit_longLog.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
-}