6:4.11.1-1
- 4.11.1 - include SOLID_HAL_LEGACY hack (el6)
This commit is contained in:
Rex Dieter
parent
a5f92b79f1
commit
0509005e1e
|
|
@ -1,3 +1,2 @@
|
|||
/kdelibs-4.10.5.tar.xz
|
||||
/kdelibs-4.10.97.tar.xz
|
||||
/kdelibs-4.11.0.tar.xz
|
||||
/kdelibs-4.11.1.tar.xz
|
||||
|
|
|
|||
|
|
@ -1,27 +0,0 @@
|
|||
From 76b25271b84cdb0caffbbe9a5f8a17f51c96af4d Mon Sep 17 00:00:00 2001
|
||||
From: Jeremy Whiting <jpwhiting@kde.org>
|
||||
Date: Tue, 13 Aug 2013 13:14:20 -0600
|
||||
Subject: [PATCH 2/4] Fix detection of lzma and xz tar archives downloaded from
|
||||
kdelook.org Review: 111952
|
||||
|
||||
(cherry picked from commit 60bfd6a58a6ad890ed3fada1d4c8f34ec1ded198)
|
||||
---
|
||||
plasma/package.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/plasma/package.cpp b/plasma/package.cpp
|
||||
index cd3702c..6df4e4e 100644
|
||||
--- a/plasma/package.cpp
|
||||
+++ b/plasma/package.cpp
|
||||
@@ -502,7 +502,7 @@ bool Package::installPackage(const QString &package,
|
||||
archive = new KZip(package);
|
||||
} else if (mimetype->is("application/x-compressed-tar") ||
|
||||
mimetype->is("application/x-tar")|| mimetype->is("application/x-bzip-compressed-tar") ||
|
||||
- mimetype->is("application/x-xz") || mimetype->is("application/x-lzma")) {
|
||||
+ mimetype->is("application/x-xz-compressed-tar") || mimetype->is("application/x-lzma-compressed-tar")) {
|
||||
archive = new KTar(package);
|
||||
} else {
|
||||
kWarning() << "Could not open package file, unsupported archive format:" << package << mimetype->name();
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
From 87366731b96fd8cef3895b7d570d2b2b392566aa Mon Sep 17 00:00:00 2001
|
||||
From: Jeremy Whiting <jpwhiting@kde.org>
|
||||
Date: Tue, 13 Aug 2013 13:19:49 -0600
|
||||
Subject: [PATCH 3/4] Support xz and lzma compressed tars in PackageStructure
|
||||
class
|
||||
|
||||
(cherry picked from commit eb2cb854a164205fdbf58094a9b3bbcdff03258e)
|
||||
---
|
||||
plasma/packagestructure.cpp | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/plasma/packagestructure.cpp b/plasma/packagestructure.cpp
|
||||
index 2ba6525..71148e1 100644
|
||||
--- a/plasma/packagestructure.cpp
|
||||
+++ b/plasma/packagestructure.cpp
|
||||
@@ -627,6 +627,7 @@ PackageMetadata PackageStructure::metadata()
|
||||
if (mimetype->is("application/zip")) {
|
||||
archive = new KZip(d->path);
|
||||
} else if (mimetype->is("application/x-compressed-tar") || mimetype->is("application/x-gzip") ||
|
||||
+ mimetype->is("application/x-xz-compressed-tar") || mimetype->is("application/x-lzma-compressed-tar") ||
|
||||
mimetype->is("application/x-tar")|| mimetype->is("application/x-bzip-compressed-tar")) {
|
||||
archive = new KTar(d->path);
|
||||
} else {
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
|
|
@ -1,51 +0,0 @@
|
|||
From 59e88c777b92935cc95f28e52f84fe97563dec9d Mon Sep 17 00:00:00 2001
|
||||
From: Aaron Seigo <aseigo@kde.org>
|
||||
Date: Wed, 14 Aug 2013 12:52:52 +0200
|
||||
Subject: [PATCH 4/4] when the request theme does not exist, delete all old
|
||||
caches for it and don't crash
|
||||
|
||||
BUG:320855
|
||||
---
|
||||
plasma/theme.cpp | 21 ++++++++++++++-------
|
||||
1 file changed, 14 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/plasma/theme.cpp b/plasma/theme.cpp
|
||||
index 4554de7..cb44878 100644
|
||||
--- a/plasma/theme.cpp
|
||||
+++ b/plasma/theme.cpp
|
||||
@@ -222,18 +222,25 @@ bool ThemePrivate::useCache()
|
||||
{
|
||||
if (cacheTheme && !pixmapCache) {
|
||||
const bool isRegularTheme = themeName != systemColorsTheme;
|
||||
- QString cacheFile = "plasma_theme_" + themeName;
|
||||
+ const QString cacheFile = "plasma_theme_" + themeName;
|
||||
|
||||
if (isRegularTheme) {
|
||||
+ const QString cacheFileBase = cacheFile + "*.kcache";
|
||||
+
|
||||
const QString path = KStandardDirs::locate("data", "desktoptheme/" + themeName + "/metadata.desktop");
|
||||
- const KPluginInfo pluginInfo(path);
|
||||
+ // if the path is empty, then we haven't found the theme and so
|
||||
+ // we will leave currentCacheFileName empty, resulting in the deletion of
|
||||
+ // *all* matching cache files
|
||||
+ QString currentCacheFileName;
|
||||
+ if (!path.isEmpty()) {
|
||||
+ const KPluginInfo pluginInfo(path);
|
||||
+ currentCacheFileName = cacheFile + "_v" + pluginInfo.version() + ".kcache";
|
||||
+ }
|
||||
|
||||
- // now we check for, and remove if necessary, old caches
|
||||
- const QString cacheFileBase = cacheFile + "*.kcache";
|
||||
- cacheFile += "_v" + pluginInfo.version();
|
||||
- const QString currentCacheFileName = cacheFile + ".kcache";
|
||||
+ // now we check for (and remove) old caches
|
||||
foreach (const QString &file, KGlobal::dirs()->findAllResources("cache", cacheFileBase)) {
|
||||
- if (!file.endsWith(currentCacheFileName)) {
|
||||
+ if (currentCacheFileName.isEmpty() ||
|
||||
+ !file.endsWith(currentCacheFileName)) {
|
||||
QFile::remove(file);
|
||||
}
|
||||
}
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
|
||||
if [ -z "${SOLID_HAL_LEGACY}" ] ; then
|
||||
SOLID_HAL_LEGACY=1
|
||||
export SOLID_HAL_LEGACY
|
||||
fi
|
||||
|
||||
28
kdelibs.spec
28
kdelibs.spec
|
|
@ -20,6 +20,7 @@
|
|||
%endif
|
||||
%if 0%{?rhel} == 6
|
||||
%define hal 1
|
||||
Source10: SOLID_HAL_LEGACY.sh
|
||||
%define cmake_pkg cmake28
|
||||
%else
|
||||
%define cmake_pkg cmake
|
||||
|
|
@ -36,8 +37,8 @@
|
|||
%global _changelog_trimtime %(date +%s -d "1 year ago")
|
||||
|
||||
Summary: KDE Libraries
|
||||
Version: 4.11.0
|
||||
Release: 2%{?dist}
|
||||
Version: 4.11.1
|
||||
Release: 1%{?dist}
|
||||
|
||||
Name: kdelibs
|
||||
Epoch: 6
|
||||
|
|
@ -167,10 +168,6 @@ Patch092: return-application-icons-properly.patch
|
|||
# revert disabling of packagekit
|
||||
Patch093: turn-the-packagekit-support-feature-off-by-default.patch
|
||||
|
||||
Patch102: 0002-Fix-detection-of-lzma-and-xz-tar-archives-downloaded.patch
|
||||
Patch103: 0003-Support-xz-and-lzma-compressed-tars-in-PackageStruct.patch
|
||||
Patch104: 0004-when-the-request-theme-does-not-exist-delete-all-old.patch
|
||||
|
||||
## security fix
|
||||
|
||||
# rhel patches
|
||||
|
|
@ -364,10 +361,6 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
|
|||
%patch092 -p1 -R -b .return-application-icons-properly
|
||||
%patch093 -p1 -R -b .turn-the-packagekit-support-feature-off-by-default
|
||||
|
||||
%patch102 -p1 -b .0002
|
||||
%patch103 -p1 -b .0003
|
||||
%patch104 -p1 -b .0004
|
||||
|
||||
# security fixes
|
||||
|
||||
# rhel patches
|
||||
|
|
@ -468,6 +461,10 @@ done
|
|||
%endif
|
||||
%endif
|
||||
|
||||
%if 0%{?hal:1}
|
||||
install -p -m644 -D %{SOURCE10} /etc/kde/env/SOLID_HAL_LEGACY.sh
|
||||
%endif
|
||||
|
||||
|
||||
%post
|
||||
/sbin/ldconfig
|
||||
|
|
@ -490,6 +487,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
|
|||
%files
|
||||
%doc AUTHORS README TODO
|
||||
%doc COPYING.LIB
|
||||
%if 0%{?hal:1}
|
||||
/etc/kde/env/SOLID_HAL_LEGACY.sh
|
||||
%endif
|
||||
%{_kde4_bindir}/checkXML
|
||||
%{_kde4_bindir}/kbuildsycoca4
|
||||
%{_kde4_bindir}/kcookiejar4
|
||||
|
|
@ -609,10 +609,14 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
|
|||
|
||||
|
||||
%changelog
|
||||
* Wed Aug 14 2013 Rex Dieter <rdieter@fedoraproject.org> 4.11.0-2
|
||||
* Tue Sep 03 2013 Rex Dieter <rdieter@fedoraproject.org> - 6:4.11.1-1
|
||||
- 4.11.1
|
||||
- include SOLID_HAL_LEGACY hack (el6)
|
||||
|
||||
* Wed Aug 14 2013 Rex Dieter <rdieter@fedoraproject.org> 6:4.11.0-2
|
||||
- upstream patches, including plasma crasher fix (kde#320855)
|
||||
|
||||
* Thu Aug 08 2013 Than Ngo <than@redhat.com> - 4.11.0-1
|
||||
* Thu Aug 08 2013 Than Ngo <than@redhat.com> - 6:4.11.0-1
|
||||
- 4.11.0
|
||||
|
||||
* Thu Jul 25 2013 Rex Dieter <rdieter@fedoraproject.org> - 6:4.10.97-1
|
||||
|
|
|
|||
Loading…
Reference in New Issue