public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kiconthemes/, kde-frameworks/kiconthemes/files/
@ 2018-10-22 18:32 Andreas Sturmlechner
  0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2018-10-22 18:32 UTC (permalink / raw
  To: gentoo-commits

commit:     d88b4e52c06a53e43aef10f6f06990eaef67ba28
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 22 18:23:43 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Oct 22 18:31:53 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d88b4e52

kde-frameworks/kiconthemes: Fix runtime crash

See also:
https://mail.kde.org/pipermail/release-team/2018-October/011116.html

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 .../files/kiconthemes-5.51.0-crashfix.patch        | 24 +++++++++++++++++
 .../kiconthemes/kiconthemes-5.51.0-r1.ebuild       | 31 ++++++++++++++++++++++
 2 files changed, 55 insertions(+)

diff --git a/kde-frameworks/kiconthemes/files/kiconthemes-5.51.0-crashfix.patch b/kde-frameworks/kiconthemes/files/kiconthemes-5.51.0-crashfix.patch
new file mode 100644
index 00000000000..2788c89aad8
--- /dev/null
+++ b/kde-frameworks/kiconthemes/files/kiconthemes-5.51.0-crashfix.patch
@@ -0,0 +1,24 @@
+From e0006451d5b03a9e15277ad9e7b1c8a74864b532 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ivan=20=C4=8Cuki=C4=87?= <ivan.cukic@kde.org>
+Date: Mon, 8 Oct 2018 23:12:34 +0200
+Subject: Fixing a copy-paste error
+
+---
+ src/kicondialog.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/kicondialog.cpp b/src/kicondialog.cpp
+index 1f4193e..12ccb4f 100644
+--- a/src/kicondialog.cpp
++++ b/src/kicondialog.cpp
+@@ -416,7 +416,7 @@ void KIconDialog::KIconDialogPrivate::_k_slotAcceptIcons()
+ static bool sortByFileName(const QString &path1, const QString &path2)
+ {
+     const QString fileName1 = path1.mid(path1.lastIndexOf(QLatin1Char('/')) + 1);
+-    const QString fileName2 = path2.mid(path1.lastIndexOf(QLatin1Char('/')) + 1);
++    const QString fileName2 = path2.mid(path2.lastIndexOf(QLatin1Char('/')) + 1);
+     return QString::compare(fileName1, fileName2, Qt::CaseInsensitive) < 0;
+ }
+ 
+-- 
+cgit v0.11.2

diff --git a/kde-frameworks/kiconthemes/kiconthemes-5.51.0-r1.ebuild b/kde-frameworks/kiconthemes/kiconthemes-5.51.0-r1.ebuild
new file mode 100644
index 00000000000..8b932fb7c06
--- /dev/null
+++ b/kde-frameworks/kiconthemes/kiconthemes-5.51.0-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework for icon theming and configuration"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+"
+DEPEND="${RDEPEND}"
+
+RESTRICT+=" test" # bug 574770
+
+PATCHES=( "${FILESDIR}/${P}-crashfix.patch" )


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kiconthemes/, kde-frameworks/kiconthemes/files/
@ 2023-03-22 23:01 Andreas Sturmlechner
  0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2023-03-22 23:01 UTC (permalink / raw
  To: gentoo-commits

commit:     d5a6c294636b49397dca0df21793b2d0ce295015
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 22 22:54:27 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Mar 22 23:01:03 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5a6c294

kde-frameworks/kiconthemes: Add missing comma between enum values

Upstream commit d5d04e3c3fa92fbfd95eced39c3e272b8980563d

See also:
https://mail.kde.org/pipermail/release-team/2023-March/012999.html

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../files/kiconthemes-5.104.0-fix-typo.patch       | 25 ++++++++++++++++
 .../kiconthemes/kiconthemes-5.104.0-r1.ebuild      | 35 ++++++++++++++++++++++
 2 files changed, 60 insertions(+)

diff --git a/kde-frameworks/kiconthemes/files/kiconthemes-5.104.0-fix-typo.patch b/kde-frameworks/kiconthemes/files/kiconthemes-5.104.0-fix-typo.patch
new file mode 100644
index 000000000000..b1f3c47bc5c2
--- /dev/null
+++ b/kde-frameworks/kiconthemes/files/kiconthemes-5.104.0-fix-typo.patch
@@ -0,0 +1,25 @@
+From d5d04e3c3fa92fbfd95eced39c3e272b8980563d Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Sun, 5 Mar 2023 00:13:23 +0100
+Subject: [PATCH] Add missing comma between enum values
+
+---
+ src/kiconloader.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/kiconloader.h b/src/kiconloader.h
+index f219f6e..f1a2998 100644
+--- a/src/kiconloader.h
++++ b/src/kiconloader.h
+@@ -139,7 +139,7 @@ public:
+         /// Panel (Plasma Taskbar) icons, @deprecated since 5.104, use another group or explicit size
+         Panel KICONTHEMES_ENUMERATOR_DEPRECATED_VERSION(5, 104, "Use another group or explicit size"),
+ #else
+-        Panel_DEPRECATED_DO_NOT_USE
++        Panel_DEPRECATED_DO_NOT_USE,
+ #endif
+         /// Icons for use in dialog titles, page lists, etc
+         Dialog,
+-- 
+GitLab
+

diff --git a/kde-frameworks/kiconthemes/kiconthemes-5.104.0-r1.ebuild b/kde-frameworks/kiconthemes/kiconthemes-5.104.0-r1.ebuild
new file mode 100644
index 000000000000..7989f7647d4a
--- /dev/null
+++ b/kde-frameworks/kiconthemes/kiconthemes-5.104.0-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_DESIGNERPLUGIN="true"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.5
+VIRTUALX_REQUIRED="test"
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework for icon theming and configuration"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RESTRICT="test" # bug 574770
+
+RDEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/karchive-${PVCUT}*:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+"
+DEPEND="${RDEPEND}
+	test? ( >=dev-qt/qtdeclarative-${QTMIN}:5 )
+"
+
+PATCHES=( "${FILESDIR}/${P}-fix-typo.patch" )


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kiconthemes/, kde-frameworks/kiconthemes/files/
@ 2023-06-22 21:16 Andreas Sturmlechner
  0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2023-06-22 21:16 UTC (permalink / raw
  To: gentoo-commits

commit:     5e33ee70ec389612d68d1e2602e21e7cf18985d1
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 22 20:42:00 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jun 22 21:16:04 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e33ee70

kde-frameworks/kiconthemes: drop 5.104.0-r1

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-frameworks/kiconthemes/Manifest                |  1 -
 .../files/kiconthemes-5.104.0-fix-typo.patch       | 25 ----------------
 .../kiconthemes/kiconthemes-5.104.0-r1.ebuild      | 35 ----------------------
 3 files changed, 61 deletions(-)

diff --git a/kde-frameworks/kiconthemes/Manifest b/kde-frameworks/kiconthemes/Manifest
index b82f34a7230d..448c1dc55fa5 100644
--- a/kde-frameworks/kiconthemes/Manifest
+++ b/kde-frameworks/kiconthemes/Manifest
@@ -1,3 +1,2 @@
-DIST kiconthemes-5.104.0.tar.xz 1311912 BLAKE2B fe18dfa63d3383536bf666f466d69cd842ef238c231a6f0e3ed53bd060232c7fcc008532a6ff90d3272a89ad122af0e8422606537e7451d63f7968db4936b1a0 SHA512 407a26990967eca94f604d54032be458cef1f4b7f78239b128a9c45b42358d3e591d3acd7c127e49e0df9077b6f5ac6a5821c164775ccdbedac74e6f2a6593f8
 DIST kiconthemes-5.106.0.tar.xz 1312048 BLAKE2B 08dcc13559c4d21b8c3b2f3eaa7b4841fda253fb2bc07f4f98629463282eb601c27cf7d4579eb77748f5b6e14354a152bd8e3dd9f065f8682a0ec29445e1a1f1 SHA512 efcb0983af25d0fe0488f69ab2152a79ece0fd5f4643381770a95b4297b159a4606deab4c8ead7dd8a5f9f5805b5f116853e24f1d7295dd7eca9e292fe1a150d
 DIST kiconthemes-5.107.0.tar.xz 1312156 BLAKE2B fa914c57acdc8fceffef5d307b668e6b4d4047a780e2d02cbad6d3efba054931f78c6705d99a539fc5d20c258f04a2cfc04871405e7950efd6b5ddf2608eaffc SHA512 f7d030a701ea47def5ddbda4f41570940e5e03a21e27dd16cc8e2a046b76bc82ed65cd700e97f35e3ba1788fe003a57f65808c6285969dd244fd80c05b543083

diff --git a/kde-frameworks/kiconthemes/files/kiconthemes-5.104.0-fix-typo.patch b/kde-frameworks/kiconthemes/files/kiconthemes-5.104.0-fix-typo.patch
deleted file mode 100644
index b1f3c47bc5c2..000000000000
--- a/kde-frameworks/kiconthemes/files/kiconthemes-5.104.0-fix-typo.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From d5d04e3c3fa92fbfd95eced39c3e272b8980563d Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Sun, 5 Mar 2023 00:13:23 +0100
-Subject: [PATCH] Add missing comma between enum values
-
----
- src/kiconloader.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/kiconloader.h b/src/kiconloader.h
-index f219f6e..f1a2998 100644
---- a/src/kiconloader.h
-+++ b/src/kiconloader.h
-@@ -139,7 +139,7 @@ public:
-         /// Panel (Plasma Taskbar) icons, @deprecated since 5.104, use another group or explicit size
-         Panel KICONTHEMES_ENUMERATOR_DEPRECATED_VERSION(5, 104, "Use another group or explicit size"),
- #else
--        Panel_DEPRECATED_DO_NOT_USE
-+        Panel_DEPRECATED_DO_NOT_USE,
- #endif
-         /// Icons for use in dialog titles, page lists, etc
-         Dialog,
--- 
-GitLab
-

diff --git a/kde-frameworks/kiconthemes/kiconthemes-5.104.0-r1.ebuild b/kde-frameworks/kiconthemes/kiconthemes-5.104.0-r1.ebuild
deleted file mode 100644
index ec75a3b0bc24..000000000000
--- a/kde-frameworks/kiconthemes/kiconthemes-5.104.0-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_DESIGNERPLUGIN="true"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.5
-VIRTUALX_REQUIRED="test"
-inherit ecm frameworks.kde.org
-
-DESCRIPTION="Framework for icon theming and configuration"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-IUSE=""
-
-RESTRICT="test" # bug 574770
-
-RDEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	=kde-frameworks/karchive-${PVCUT}*:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-"
-DEPEND="${RDEPEND}
-	test? ( >=dev-qt/qtdeclarative-${QTMIN}:5 )
-"
-
-PATCHES=( "${FILESDIR}/${P}-fix-typo.patch" )


^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2023-06-22 21:16 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-06-22 21:16 [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kiconthemes/, kde-frameworks/kiconthemes/files/ Andreas Sturmlechner
  -- strict thread matches above, loose matches on Subject: below --
2023-03-22 23:01 Andreas Sturmlechner
2018-10-22 18:32 Andreas Sturmlechner

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox