diff options
| -rw-r--r-- | kde-base/ark/ChangeLog | 8 | ||||
| -rw-r--r-- | kde-base/ark/Manifest | 25 | ||||
| -rw-r--r-- | kde-base/ark/ark-4.14.3-r1.ebuild | 43 | ||||
| -rw-r--r-- | kde-base/ark/files/ark-4.14.3-crash.patch | 81 |
4 files changed, 155 insertions, 2 deletions
diff --git a/kde-base/ark/ChangeLog b/kde-base/ark/ChangeLog index 2185200dff35..1c72968e0d3d 100644 --- a/kde-base/ark/ChangeLog +++ b/kde-base/ark/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for kde-base/ark # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/ark/ChangeLog,v 1.344 2014/12/11 15:44:58 mrueg Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/ark/ChangeLog,v 1.345 2014/12/26 15:19:04 kensington Exp $ + +*ark-4.14.3-r1 (26 Dec 2014) + + 26 Dec 2014; Michael Palimaka <kensington@gentoo.org> +ark-4.14.3-r1.ebuild, + +files/ark-4.14.3-crash.patch: + Backport patch from upstream solving a crash wrt bug #533612. 11 Dec 2014; Manuel Rüger <mrueg@gentoo.org> -ark-4.14.2.ebuild: Remove KDE SC 4.14.2 diff --git a/kde-base/ark/Manifest b/kde-base/ark/Manifest index 036e04d6c773..f9e8be955469 100644 --- a/kde-base/ark/Manifest +++ b/kde-base/ark/Manifest @@ -1,6 +1,29 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +AUX ark-4.14.3-crash.patch 2403 SHA256 a23ce442ad4a68dd941a260239310013ef41ba4051ab8581a6cce90f508ad1e1 SHA512 aa967046a5677c43f947e2bf39da97a6170e3f1cb2926f14b2e1da8ba9b38327a0ec0de3141420291ad895b4871b71ca5d500db1a88a90cbcf935f18094f88ca WHIRLPOOL 90e2fa1098773d46b668759ffbcd09f9150351def180f7d080c153507df01c84e519d8f8b461ed53a0b474073b872b10ed075497d782fbf52477c573114a6bd5 DIST ark-4.12.5.tar.xz 229996 SHA256 188d4a3950d334971b65eda83453cd14f54242f379fe433d39d72a1cabe7ec89 SHA512 366ca0a58faeb73dd537052694ea231d2ea4e34a63b46cba75cf55976ae9aa3e97a7a1524b972f3c2d2c7997cb9c8b54f6dfb66ec1ed605ffab5225756166264 WHIRLPOOL a97ffc591b08072f300752108d32dd11877780b9f69355ee05c5c9a1ac93c9e39a5455998b9003a675d99f5b5afdaaffaa4c3511bbeacfc2656ca6879cc081bb DIST ark-4.14.3.tar.xz 236116 SHA256 cb2ef7ea9bbfccf3b16a1242681b33c1e6c17a7458f50f0703e87678a249b8dc SHA512 86cc44d26ac145797b3727f9b6195b6059f7163cf8abcd39313f9ee06fd86770a2e09c15bee9605968ebad07346dc116dd82b22b713db361a90c53c51dd325f7 WHIRLPOOL 7815d6f3f9af78e6a3327c8ab0f58b8bcd6253ffa794b114a8a7665d47758aed2991b59a1cd257b47fb8edea97ccac250c0b0ccac7289e554f08b20864030805 EBUILD ark-4.12.5.ebuild 979 SHA256 971d85b8337de9e59dda35a1ee4101549a0f7e0c3722a50f96b9d5bcb41490d5 SHA512 9d3eb84c7a300c6003f1d6640a35a7db6b433fb986acd151cbcf12dbe382617510393d1aa3cf84d20b42237e24d57151efee76d0043f3a06d7ed064a0b7475f5 WHIRLPOOL 40fea0de44116b06f3ee8fae42e44d9791e6e97b4d5a94edc2b11fec22ae058cb2e05c7177ce0dd00b586912bf9e3ba4b1243d584818ad8bc13c4a5be0979e2c +EBUILD ark-4.14.3-r1.ebuild 1043 SHA256 61bfa8b9ec806fa053e02ede4c08037f69806ed8767bee279eae77b741ec1f48 SHA512 ccf511819ddfc7af6cada7b9663b84c556dd83b0f1dd89f681cf85ca8457b81975fd33475b1d74057bc72bfaafec3afa6bccfed12c280325191e8bc8507b4acd WHIRLPOOL 4ac86f674ac7718aae0723f3c6a4fd05263414bb0b6b6d5cddd16dd0ffbde43834a4fa47f11597a528b43f4cd52bf106593ce8d5ea17f0d5cd8efd271b61cc81 EBUILD ark-4.14.3.ebuild 992 SHA256 1e1d266879518ff5163d9c9a88aa7725b2fd205a52a8cd7ef53d48975fc149b3 SHA512 589525f95d3ba90bfd2da05e46fbdf424b251547977b4e9d44002db46ebe72419cd4a968a1c8d2b78455f3b5095e50e4761ed9f6b49e086b63f9d5c780442839 WHIRLPOOL 0b0535dd2bff2de1a31043a098feba936834ecbd26594175eeabe05a8413ffb69cbff4672fac6eec35a416e8d4a268ad8ce472e97a187c26874c46cce90c81af -MISC ChangeLog 39091 SHA256 64a94013cc2f5bcd0552fad83d42ef1c99d068d68c5474a226f92f3a781b2c43 SHA512 bf799a5cddbfe8814a38efbbc77f6aafac6f097795eaf84caae9f09399c869b864602bccfe6b906dabdd5146c912ecd6e0dd07fd4c3bf7c31b6937bb3414d73c WHIRLPOOL 5839585175441d114f0be397cb39be7b126277e21572291449e251b4022b98382e2a0fbe254fc11b0eb5c87c02de3773a15e5e1add3538668d7965e05b0641b1 +MISC ChangeLog 39303 SHA256 5fd1695981a5ab6d9f949a6eed6dc8d483c71bf5af163e506231e208b2ede6c5 SHA512 24ff095632e62e0d525b914a4f55875cdd7876bd7c6c76a394329fed663f58cdd15662fc39c44711a56eafdb09f7d550b2c9aeec130985c24780c59945cb6e74 WHIRLPOOL 23749e604077fc6a6f93d8cde930def0e0331bb2602366c578ca4659a435e059866e87c81d2505dd4bc6979de87dad01ff0d8cc99d08236ddc949adb0e191f19 MISC metadata.xml 265 SHA256 3a6bd8f72e476b5ceea3aa7d397b9f72307a5fea2a381dc1816c21889fd8248f SHA512 70bf54070303525f1c0ed3377baf035e392705fae3cfcb8f8b968dafd09abc5ca054897d3dc67ec8ded7ece066e33ccbc00db001a95df9c1b7be1665a7a00bfe WHIRLPOOL cb52680ca967d391e155210c60149391487cfb00572cea9bbded9fa4da67e38062c28ddbaf05632df2deacc001d712b724dd63882af9233a391e3d0099983c90 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0 + +iQJiBAEBCABMBQJUnXx5RRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5 +MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh +7C9qD/9xzeweJ3IRjqxA6K+XtCKzMcUHzPfFP/EN6ybJkJV01fTtL9msrw8TsKPU +dXavZY6CpZuXG9VlL89+qyaFSxcA6P40uerM7hmcweOkdtfBxMrJlePimfp+B1rK +QI7W+zLeLSz2WxMz2WeRKP5GwU8mslLV65MYbi+LI9rAOGFfZwOk7qiUNPW8KYp9 +tVyB8iF+S6LhIqSpm0b4y0ndw2/vr6BUky+2HDWvIg28QXCuyFV3yFXX7Zr44CIC +I04VRgFSP/JcspuDu7kb0ILsEQhewJBvUtQqBpooKKask/F4+kHJr442KjhxpNup +MTT6MlOR8Ej42hF9Y+QghsOy7xtwizExkMS9Kq9WBLZwIlNSFAb///8ncP+W7HxY +mk2oua0c64m2TL5iNpTKmSN63fVgiOTluTArM5rJ3ladmPzmrBeve4NmREqh27Mw +wIPSNFX0JdeC1ybWdMaEvVTIlo4fheU00tOhs+HMOSUklEoTvRNGehvTdHub+8ko +ftfOpSshXKagVGpL1f+o7eeUAy//2BNHaAsfpB9V3PXsh7Q2Ogcu8uL/vMa6O1N2 +5+TolGqHOrf4F1P+hqjWdNW6Pq8ure3BJzeIPXA0C1zTSNCmCUffVyijz2BwLVPO +oeL5o4K15ql71aT/3oaP9jHhJazkHKp/fUHWTpRsx79942sfgw== +=CDwK +-----END PGP SIGNATURE----- diff --git a/kde-base/ark/ark-4.14.3-r1.ebuild b/kde-base/ark/ark-4.14.3-r1.ebuild new file mode 100644 index 000000000000..f850a52e396c --- /dev/null +++ b/kde-base/ark/ark-4.14.3-r1.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/ark/ark-4.14.3-r1.ebuild,v 1.1 2014/12/26 15:19:04 kensington Exp $ + +EAPI=5 + +KDE_HANDBOOK="optional" +inherit kde4-base + +DESCRIPTION="KDE Archiving tool" +HOMEPAGE="http://www.kde.org/applications/utilities/ark +http://utils.kde.org/projects/ark" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +IUSE="+archive +bzip2 debug lzma" + +DEPEND=" + $(add_kdebase_dep libkonq) + sys-libs/zlib + archive? ( >=app-arch/libarchive-2.6.1:=[bzip2?,lzma?,zlib] ) +" +RDEPEND="${DEPEND}" + +RESTRICT="test" +# dbus problem + +PATCHES=( "${FILESDIR}/${P}-crash.patch" ) + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_with archive LibArchive) + $(cmake-utils_use_with bzip2 BZip2) + $(cmake-utils_use_with lzma LibLZMA) + ) + kde4-base_src_configure +} + +pkg_postinst() { + kde4-base_pkg_postinst + + if ! has_version app-arch/rar ; then + elog "For creating rar archives, install app-arch/rar" + fi +} diff --git a/kde-base/ark/files/ark-4.14.3-crash.patch b/kde-base/ark/files/ark-4.14.3-crash.patch new file mode 100644 index 000000000000..5eccf82062fd --- /dev/null +++ b/kde-base/ark/files/ark-4.14.3-crash.patch @@ -0,0 +1,81 @@ +From cd8ad2761d41d1ec0a18cff7f4d166b53c899fc2 Mon Sep 17 00:00:00 2001 +From: Raphael Kubo da Costa <rakuco@FreeBSD.org> +Date: Mon, 24 Nov 2014 01:37:06 +0200 +Subject: [PATCH] Stop crashing on exit when being used solely as a KPart. + +This change fixes a crash introduced by commit 3b981ca ("Remove Part +from KXMLGUIFactory on exit"). + +Part::~Part() is the wrong place to call KXMLGUIFactory::removeClient(), +as it assumes addClient() had been called in the first place. + +This is only true if Ark is called as a standalone program, since that +is done in MainWindow::loadPart()'s call to KXMLGuiWindow::createGUI(). + +Conversely, if the Ark KPart is being used as an embedded viewer in, +say, Konqueror or to preview an archive inside an archive (ie. Ark +inside Ark) that does not hold true and we try to access a +KXMLGUIFactory that does not exist. + +Instead, call KXMLGuiWindow::removeClient() in MainWindow's destructor, +since in this case we are certain that addClient() was been called +before. + +CCBUG: 341187 + +(cherry picked from commit 9c30f30b38c36a31e6fcb3aa047a0247ac5a22fb) +This was committed for completeness, as there will be no additional +releases from the KDE/4.14 branch. + +Conflicts: + part/part.cpp +--- + app/mainwindow.cpp | 3 +++ + part/part.cpp | 3 --- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/app/mainwindow.cpp b/app/mainwindow.cpp +index aee8231..181fe76 100644 +--- a/app/mainwindow.cpp ++++ b/app/mainwindow.cpp +@@ -38,6 +38,7 @@ + #include <KDebug> + #include <KEditToolBar> + #include <KShortcutsDialog> ++#include <KXMLGUIFactory> + + #include <QDragEnterEvent> + #include <QDragMoveEvent> +@@ -69,6 +70,8 @@ MainWindow::~MainWindow() + if (m_recentFilesAction) { + m_recentFilesAction->saveEntries(KGlobal::config()->group("Recent Files")); + } ++ ++ guiFactory()->removeClient(m_part); + delete m_part; + m_part = 0; + } +diff --git a/part/part.cpp b/part/part.cpp +index bae4882..09fe1cb 100644 +--- a/part/part.cpp ++++ b/part/part.cpp +@@ -53,7 +53,6 @@ + #include <KStandardGuiItem> + #include <KTempDir> + #include <KToggleAction> +-#include <KXMLGUIFactory> + + #include <QAction> + #include <QCursor> +@@ -138,8 +137,6 @@ Part::Part(QWidget *parentWidget, QObject *parent, const QVariantList& args) + + Part::~Part() + { +- factory()->removeClient(this); +- + saveSplitterSizes(); + + m_extractFilesAction->menu()->deleteLater(); +-- +2.0.5 + |