Date: Wednesday, December 5, 2012 @ 18:08:19
Author: andrea
Revision: 172781
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
kdelibs/repos/testing-i686/0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch
(from rev 172780,
kdelibs/trunk/0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch)
kdelibs/repos/testing-i686/PKGBUILD
(from rev 172780, kdelibs/trunk/PKGBUILD)
kdelibs/repos/testing-i686/archlinux-menu.patch
(from rev 172780, kdelibs/trunk/archlinux-menu.patch)
kdelibs/repos/testing-i686/kde-applications-menu.patch
(from rev 172780, kdelibs/trunk/kde-applications-menu.patch)
kdelibs/repos/testing-i686/kdelibs.install
(from rev 172780, kdelibs/trunk/kdelibs.install)
kdelibs/repos/testing-x86_64/0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch
(from rev 172780,
kdelibs/trunk/0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch)
kdelibs/repos/testing-x86_64/PKGBUILD
(from rev 172780, kdelibs/trunk/PKGBUILD)
kdelibs/repos/testing-x86_64/archlinux-menu.patch
(from rev 172780, kdelibs/trunk/archlinux-menu.patch)
kdelibs/repos/testing-x86_64/kde-applications-menu.patch
(from rev 172780, kdelibs/trunk/kde-applications-menu.patch)
kdelibs/repos/testing-x86_64/kdelibs.install
(from rev 172780, kdelibs/trunk/kdelibs.install)
Modified:
kdelibs/kde-unstable/PKGBUILD
kdelibs/kde-unstable/udisks2-fixes.patch
Deleted:
kdelibs/repos/testing-i686/PKGBUILD
kdelibs/repos/testing-i686/archlinux-menu.patch
kdelibs/repos/testing-i686/kde-applications-menu.patch
kdelibs/repos/testing-i686/kdelibs.install
kdelibs/repos/testing-x86_64/PKGBUILD
kdelibs/repos/testing-x86_64/archlinux-menu.patch
kdelibs/repos/testing-x86_64/kde-applications-menu.patch
kdelibs/repos/testing-x86_64/kdelibs.install
--------------------------------------------------------------------------------------+
kde-unstable/PKGBUILD
| 2
kde-unstable/udisks2-fixes.patch
| 10
repos/testing-i686/0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch
| 53 ++++
repos/testing-i686/PKGBUILD
| 118 +++++-----
repos/testing-i686/archlinux-menu.patch
| 44 +--
repos/testing-i686/kde-applications-menu.patch
| 44 +--
repos/testing-i686/kdelibs.install
| 26 +-
repos/testing-x86_64/0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch
| 53 ++++
repos/testing-x86_64/PKGBUILD
| 118 +++++-----
repos/testing-x86_64/archlinux-menu.patch
| 44 +--
repos/testing-x86_64/kde-applications-menu.patch
| 44 +--
repos/testing-x86_64/kdelibs.install
| 26 +-
12 files changed, 353 insertions(+), 229 deletions(-)
Modified: kde-unstable/PKGBUILD
===================================================================
--- kde-unstable/PKGBUILD 2012-12-05 23:07:31 UTC (rev 172780)
+++ kde-unstable/PKGBUILD 2012-12-05 23:08:19 UTC (rev 172781)
@@ -22,7 +22,7 @@
sha1sums=('57a75fe32a76dc36877283d90fbb35529e54a69c'
'86ee8c8660f19de8141ac99cd6943964d97a1ed7'
'63a850ab4196b9d06934f2b4a13acd9f7739bc67'
- 'c270bc3c9248fc5921cbc9e38dbfb141b49c8a4c')
+ '0e7259aa37e399abe0353b8c1a0068f75ef5eebe')
build() {
cd "${srcdir}"/${pkgname}-${pkgver}
Modified: kde-unstable/udisks2-fixes.patch
===================================================================
--- kde-unstable/udisks2-fixes.patch 2012-12-05 23:07:31 UTC (rev 172780)
+++ kde-unstable/udisks2-fixes.patch 2012-12-05 23:08:19 UTC (rev 172781)
@@ -1,5 +1,15 @@
diff --git a/solid/solid/backends/udisks2/udisksblock.cpp
b/solid/solid/backends/udisks2/udisksblock.cpp
index 027ea03..f3cd1e8 100644
+--- a/solid/solid/CMakeLists.txt
++++ b/solid/solid/CMakeLists.txt
+@@ -272,6 +272,7 @@
+ set(solid_LIB_SRCS ${solid_LIB_SRCS}
+ backends/udisks2/udisksmanager.cpp
+ backends/udisks2/udisksdevice.cpp
++ backends/udisks2/udisksdevicebackend.cpp
+ backends/udisks2/udisksblock.cpp
+ backends/udisks2/udisksstoragevolume.cpp
+ backends/udisks2/udisksdeviceinterface.cpp
--- a/solid/solid/backends/udisks2/udisksblock.cpp
+++ b/solid/solid/backends/udisks2/udisksblock.cpp
@@ -30,8 +30,7 @@
Copied:
kdelibs/repos/testing-i686/0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch
(from rev 172780,
kdelibs/trunk/0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch)
===================================================================
---
repos/testing-i686/0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch
(rev 0)
+++
repos/testing-i686/0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch
2012-12-05 23:08:19 UTC (rev 172781)
@@ -0,0 +1,53 @@
+From 73283f1332e90fbb6fe0caa39a038cb16b83a54c Mon Sep 17 00:00:00 2001
+From: David Faure <[email protected]>
+Date: Wed, 5 Dec 2012 22:42:25 +0100
+Subject: [PATCH] Revert "Also check parent mimetypes in
+ protocolForArchiveMimetype()."
+
+This reverts commit 4f296cfbced2c4ad54beec8f500ed2d3fc04ee05.
+It breaks opening odt and other zip-based files in external apps.
+That's what I get for delegating the testing :-)
+BUG: 311214
+---
+ kio/kio/kprotocolmanager.cpp | 19 +------------------
+ 1 files changed, 1 insertions(+), 18 deletions(-)
+
+diff --git a/kio/kio/kprotocolmanager.cpp b/kio/kio/kprotocolmanager.cpp
+index 3f1cadd..502a3e6 100644
+--- a/kio/kio/kprotocolmanager.cpp
++++ b/kio/kio/kprotocolmanager.cpp
+@@ -47,7 +47,6 @@
+ #include <ksharedconfig.h>
+ #include <kstandarddirs.h>
+ #include <kurl.h>
+-#include <kmimetype.h>
+ #include <kmimetypetrader.h>
+ #include <kprotocolinfofactory.h>
+
+@@ -1190,23 +1189,7 @@ QString KProtocolManager::protocolForArchiveMimetype(
const QString& mimeType )
+ }
+ }
+ }
+- const QString prot = d->protocolForArchiveMimetypes.value(mimeType);
+- if (!prot.isEmpty())
+- return prot;
+-
+- // Check parent mimetypes
+- KMimeType::Ptr mime = KMimeType::mimeType(mimeType);
+- if (mime) {
+- const QStringList parentMimeTypes = mime->allParentMimeTypes();
+- Q_FOREACH(const QString& parentMimeType, parentMimeTypes) {
+- const QString res =
d->protocolForArchiveMimetypes.value(parentMimeType);
+- if (!res.isEmpty()) {
+- return res;
+- }
+- }
+- }
+-
+- return QString();
++ return d->protocolForArchiveMimetypes.value(mimeType);
+ }
+
+ #undef PRIVATE_DATA
+--
+1.7.7
Deleted: repos/testing-i686/PKGBUILD
===================================================================
--- repos/testing-i686/PKGBUILD 2012-12-05 23:07:31 UTC (rev 172780)
+++ repos/testing-i686/PKGBUILD 2012-12-05 23:08:19 UTC (rev 172781)
@@ -1,57 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <[email protected]
-# Contributor: Pierre Schmitz <[email protected]>
-
-pkgname=kdelibs
-pkgver=4.9.4
-pkgrel=1
-pkgdesc="KDE Core Libraries"
-arch=('i686' 'x86_64')
-url='https://projects.kde.org/projects/kde/kdelibs'
-license=('GPL' 'LGPL' 'FDL')
-depends=('strigi' 'attica' 'libxss' 'soprano' 'krb5' 'grantlee'
- 'shared-desktop-ontologies' 'qca' 'libdbusmenu-qt' 'polkit-qt'
- 'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr'
- 'docbook-xsl' 'upower' 'udisks' 'libxcursor' 'phonon' 'qtwebkit'
- 'media-player-info' 'libxtst')
-makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell' 'mesa')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz";
- 'kde-applications-menu.patch' 'archlinux-menu.patch')
-sha1sums=('b2fe70261207a96a26b5d8789379f134e3e070be'
- '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
- '63a850ab4196b9d06934f2b4a13acd9f7739bc67')
-
-build() {
- cd "${srcdir}"/${pkgname}-${pkgver}
-
- # avoid file conflict with gnome-menus
- patch -p1 -i "${srcdir}"/kde-applications-menu.patch
- # add Archlinux menu entry
- patch -p1 -i "${srcdir}"/archlinux-menu.patch
-
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
- -DKDE_DISTRIBUTION_TEXT='Arch Linux' \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DSYSCONF_INSTALL_DIR=/etc \
- -DHTML_INSTALL_DIR=/usr/share/doc/kde/html \
- -DKDE_DEFAULT_HOME='.kde4' \
- -DWITH_FAM=OFF \
- -DWITH_HUpnp=OFF
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-
- # cert bundle seems to be hardcoded
- # link it to the one from ca-certificates
- rm -f "${pkgdir}"/usr/share/apps/kssl/ca-bundle.crt
- ln -sf /etc/ssl/certs/ca-certificates.crt
"${pkgdir}"/usr/share/apps/kssl/ca-bundle.crt
-}
Copied: kdelibs/repos/testing-i686/PKGBUILD (from rev 172780,
kdelibs/trunk/PKGBUILD)
===================================================================
--- repos/testing-i686/PKGBUILD (rev 0)
+++ repos/testing-i686/PKGBUILD 2012-12-05 23:08:19 UTC (rev 172781)
@@ -0,0 +1,61 @@
+# $Id$
+# Maintainer: Andrea Scarpino <[email protected]
+# Contributor: Pierre Schmitz <[email protected]>
+
+pkgname=kdelibs
+pkgver=4.9.4
+pkgrel=2
+pkgdesc="KDE Core Libraries"
+arch=('i686' 'x86_64')
+url='https://projects.kde.org/projects/kde/kdelibs'
+license=('GPL' 'LGPL' 'FDL')
+depends=('strigi' 'attica' 'libxss' 'soprano' 'krb5' 'grantlee'
+ 'shared-desktop-ontologies' 'qca' 'libdbusmenu-qt' 'polkit-qt'
+ 'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr'
+ 'docbook-xsl' 'upower' 'udisks' 'libxcursor' 'phonon' 'qtwebkit'
+ 'media-player-info' 'libxtst')
+makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell' 'mesa')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz";
+ 'kde-applications-menu.patch' 'archlinux-menu.patch'
+ '0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch')
+sha1sums=('b2fe70261207a96a26b5d8789379f134e3e070be'
+ '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
+ '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
+ 'f5d203932f67ab6d87c794e9cb78a3b1a22ef747')
+
+build() {
+ cd "${srcdir}"/${pkgname}-${pkgver}
+
+ # avoid file conflict with gnome-menus
+ patch -p1 -i "${srcdir}"/kde-applications-menu.patch
+ # add Archlinux menu entry
+ patch -p1 -i "${srcdir}"/archlinux-menu.patch
+
+ patch -p1 -i
"${srcdir}"/0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch
+
+ cd "${srcdir}"
+ mkdir build
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_SKIP_RPATH=ON \
+ -DKDE_DISTRIBUTION_TEXT='Arch Linux' \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DSYSCONF_INSTALL_DIR=/etc \
+ -DHTML_INSTALL_DIR=/usr/share/doc/kde/html \
+ -DKDE_DEFAULT_HOME='.kde4' \
+ -DWITH_FAM=OFF \
+ -DWITH_HUpnp=OFF
+ make
+}
+
+package() {
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
+
+ # cert bundle seems to be hardcoded
+ # link it to the one from ca-certificates
+ rm -f "${pkgdir}"/usr/share/apps/kssl/ca-bundle.crt
+ ln -sf /etc/ssl/certs/ca-certificates.crt
"${pkgdir}"/usr/share/apps/kssl/ca-bundle.crt
+}
Deleted: repos/testing-i686/archlinux-menu.patch
===================================================================
--- repos/testing-i686/archlinux-menu.patch 2012-12-05 23:07:31 UTC (rev
172780)
+++ repos/testing-i686/archlinux-menu.patch 2012-12-05 23:08:19 UTC (rev
172781)
@@ -1,22 +0,0 @@
---- kdelibs-4.3.98/kded/applications.menu 2010-01-31 19:28:11.000000000
+0000
-+++ kdelibs-4.3.98/kded/applications.menu 2010-01-31 22:25:53.556043077
+0000
-@@ -16,11 +16,19 @@
- </DefaultLayout>
- <Layout>
- <Merge type="menus"/>
-+ <Menuname>Arch Linux</Menuname>
- <Menuname>Applications</Menuname>
- <Merge type="files"/>
- </Layout>
-
- <Menu>
-+ <Name>Arch Linux</Name>
-+ <Directory>Archlinux.directory</Directory>
-+ <Include>
-+ <Category>Archlinux</Category>
-+ </Include>
-+ </Menu>
-+ <Menu>
- <Name>Applications</Name>
- <Directory>kde-unknown.directory</Directory>
- <OnlyUnallocated/>
Copied: kdelibs/repos/testing-i686/archlinux-menu.patch (from rev 172780,
kdelibs/trunk/archlinux-menu.patch)
===================================================================
--- repos/testing-i686/archlinux-menu.patch (rev 0)
+++ repos/testing-i686/archlinux-menu.patch 2012-12-05 23:08:19 UTC (rev
172781)
@@ -0,0 +1,22 @@
+--- kdelibs-4.3.98/kded/applications.menu 2010-01-31 19:28:11.000000000
+0000
++++ kdelibs-4.3.98/kded/applications.menu 2010-01-31 22:25:53.556043077
+0000
+@@ -16,11 +16,19 @@
+ </DefaultLayout>
+ <Layout>
+ <Merge type="menus"/>
++ <Menuname>Arch Linux</Menuname>
+ <Menuname>Applications</Menuname>
+ <Merge type="files"/>
+ </Layout>
+
+ <Menu>
++ <Name>Arch Linux</Name>
++ <Directory>Archlinux.directory</Directory>
++ <Include>
++ <Category>Archlinux</Category>
++ </Include>
++ </Menu>
++ <Menu>
+ <Name>Applications</Name>
+ <Directory>kde-unknown.directory</Directory>
+ <OnlyUnallocated/>
Deleted: repos/testing-i686/kde-applications-menu.patch
===================================================================
--- repos/testing-i686/kde-applications-menu.patch 2012-12-05 23:07:31 UTC
(rev 172780)
+++ repos/testing-i686/kde-applications-menu.patch 2012-12-05 23:08:19 UTC
(rev 172781)
@@ -1,22 +0,0 @@
---- kdelibs-4.3.98/kded/CMakeLists.txt 2009-10-02 14:55:17.000000000 +0000
-+++ kdelibs-4.3.98/kded/CMakeLists.txt 2010-01-31 22:16:13.946933892 +0000
-@@ -69,7 +69,7 @@
- if (WIN32)
- install( FILES applications.menu DESTINATION
${SHARE_INSTALL_PREFIX}/xdg/menus )
- else (WIN32)
--install( FILES applications.menu DESTINATION
${SYSCONF_INSTALL_DIR}/xdg/menus )
-+install( FILES applications.menu DESTINATION
${SYSCONF_INSTALL_DIR}/xdg/menus RENAME kde-applications.menu )
- endif (WIN32)
- install( FILES kdedmodule.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
- install( FILES kded.upd DESTINATION
${DATA_INSTALL_DIR}/kconf_update )
---- kdelibs-4.3.98/kded/kbuildsycoca.cpp 2009-12-04 23:10:18.000000000
+0000
-+++ kdelibs-4.3.98/kded/kbuildsycoca.cpp 2010-01-31 22:16:13.962766572
+0000
-@@ -302,7 +302,7 @@
- if (!m_trackId.isEmpty())
- g_vfolder->setTrackId(m_trackId);
-
-- VFolderMenu::SubMenu *kdeMenu =
g_vfolder->parseMenu("applications.menu", true);
-+ VFolderMenu::SubMenu *kdeMenu =
g_vfolder->parseMenu("kde-applications.menu", true);
-
- KServiceGroup::Ptr entry = g_bsgf->addNew("/", kdeMenu->directoryFile,
KServiceGroup::Ptr(), false);
- entry->setLayoutInfo(kdeMenu->layoutList);
Copied: kdelibs/repos/testing-i686/kde-applications-menu.patch (from rev
172780, kdelibs/trunk/kde-applications-menu.patch)
===================================================================
--- repos/testing-i686/kde-applications-menu.patch
(rev 0)
+++ repos/testing-i686/kde-applications-menu.patch 2012-12-05 23:08:19 UTC
(rev 172781)
@@ -0,0 +1,22 @@
+--- kdelibs-4.3.98/kded/CMakeLists.txt 2009-10-02 14:55:17.000000000 +0000
++++ kdelibs-4.3.98/kded/CMakeLists.txt 2010-01-31 22:16:13.946933892 +0000
+@@ -69,7 +69,7 @@
+ if (WIN32)
+ install( FILES applications.menu DESTINATION
${SHARE_INSTALL_PREFIX}/xdg/menus )
+ else (WIN32)
+-install( FILES applications.menu DESTINATION
${SYSCONF_INSTALL_DIR}/xdg/menus )
++install( FILES applications.menu DESTINATION
${SYSCONF_INSTALL_DIR}/xdg/menus RENAME kde-applications.menu )
+ endif (WIN32)
+ install( FILES kdedmodule.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
+ install( FILES kded.upd DESTINATION
${DATA_INSTALL_DIR}/kconf_update )
+--- kdelibs-4.3.98/kded/kbuildsycoca.cpp 2009-12-04 23:10:18.000000000
+0000
++++ kdelibs-4.3.98/kded/kbuildsycoca.cpp 2010-01-31 22:16:13.962766572
+0000
+@@ -302,7 +302,7 @@
+ if (!m_trackId.isEmpty())
+ g_vfolder->setTrackId(m_trackId);
+
+- VFolderMenu::SubMenu *kdeMenu =
g_vfolder->parseMenu("applications.menu", true);
++ VFolderMenu::SubMenu *kdeMenu =
g_vfolder->parseMenu("kde-applications.menu", true);
+
+ KServiceGroup::Ptr entry = g_bsgf->addNew("/", kdeMenu->directoryFile,
KServiceGroup::Ptr(), false);
+ entry->setLayoutInfo(kdeMenu->layoutList);
Deleted: repos/testing-i686/kdelibs.install
===================================================================
--- repos/testing-i686/kdelibs.install 2012-12-05 23:07:31 UTC (rev 172780)
+++ repos/testing-i686/kdelibs.install 2012-12-05 23:08:19 UTC (rev 172781)
@@ -1,13 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-mime-database usr/share/mime &> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: kdelibs/repos/testing-i686/kdelibs.install (from rev 172780,
kdelibs/trunk/kdelibs.install)
===================================================================
--- repos/testing-i686/kdelibs.install (rev 0)
+++ repos/testing-i686/kdelibs.install 2012-12-05 23:08:19 UTC (rev 172781)
@@ -0,0 +1,13 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-mime-database usr/share/mime &> /dev/null
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied:
kdelibs/repos/testing-x86_64/0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch
(from rev 172780,
kdelibs/trunk/0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch)
===================================================================
---
repos/testing-x86_64/0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch
(rev 0)
+++
repos/testing-x86_64/0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch
2012-12-05 23:08:19 UTC (rev 172781)
@@ -0,0 +1,53 @@
+From 73283f1332e90fbb6fe0caa39a038cb16b83a54c Mon Sep 17 00:00:00 2001
+From: David Faure <[email protected]>
+Date: Wed, 5 Dec 2012 22:42:25 +0100
+Subject: [PATCH] Revert "Also check parent mimetypes in
+ protocolForArchiveMimetype()."
+
+This reverts commit 4f296cfbced2c4ad54beec8f500ed2d3fc04ee05.
+It breaks opening odt and other zip-based files in external apps.
+That's what I get for delegating the testing :-)
+BUG: 311214
+---
+ kio/kio/kprotocolmanager.cpp | 19 +------------------
+ 1 files changed, 1 insertions(+), 18 deletions(-)
+
+diff --git a/kio/kio/kprotocolmanager.cpp b/kio/kio/kprotocolmanager.cpp
+index 3f1cadd..502a3e6 100644
+--- a/kio/kio/kprotocolmanager.cpp
++++ b/kio/kio/kprotocolmanager.cpp
+@@ -47,7 +47,6 @@
+ #include <ksharedconfig.h>
+ #include <kstandarddirs.h>
+ #include <kurl.h>
+-#include <kmimetype.h>
+ #include <kmimetypetrader.h>
+ #include <kprotocolinfofactory.h>
+
+@@ -1190,23 +1189,7 @@ QString KProtocolManager::protocolForArchiveMimetype(
const QString& mimeType )
+ }
+ }
+ }
+- const QString prot = d->protocolForArchiveMimetypes.value(mimeType);
+- if (!prot.isEmpty())
+- return prot;
+-
+- // Check parent mimetypes
+- KMimeType::Ptr mime = KMimeType::mimeType(mimeType);
+- if (mime) {
+- const QStringList parentMimeTypes = mime->allParentMimeTypes();
+- Q_FOREACH(const QString& parentMimeType, parentMimeTypes) {
+- const QString res =
d->protocolForArchiveMimetypes.value(parentMimeType);
+- if (!res.isEmpty()) {
+- return res;
+- }
+- }
+- }
+-
+- return QString();
++ return d->protocolForArchiveMimetypes.value(mimeType);
+ }
+
+ #undef PRIVATE_DATA
+--
+1.7.7
Deleted: repos/testing-x86_64/PKGBUILD
===================================================================
--- repos/testing-x86_64/PKGBUILD 2012-12-05 23:07:31 UTC (rev 172780)
+++ repos/testing-x86_64/PKGBUILD 2012-12-05 23:08:19 UTC (rev 172781)
@@ -1,57 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <[email protected]
-# Contributor: Pierre Schmitz <[email protected]>
-
-pkgname=kdelibs
-pkgver=4.9.4
-pkgrel=1
-pkgdesc="KDE Core Libraries"
-arch=('i686' 'x86_64')
-url='https://projects.kde.org/projects/kde/kdelibs'
-license=('GPL' 'LGPL' 'FDL')
-depends=('strigi' 'attica' 'libxss' 'soprano' 'krb5' 'grantlee'
- 'shared-desktop-ontologies' 'qca' 'libdbusmenu-qt' 'polkit-qt'
- 'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr'
- 'docbook-xsl' 'upower' 'udisks' 'libxcursor' 'phonon' 'qtwebkit'
- 'media-player-info' 'libxtst')
-makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell' 'mesa')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz";
- 'kde-applications-menu.patch' 'archlinux-menu.patch')
-sha1sums=('b2fe70261207a96a26b5d8789379f134e3e070be'
- '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
- '63a850ab4196b9d06934f2b4a13acd9f7739bc67')
-
-build() {
- cd "${srcdir}"/${pkgname}-${pkgver}
-
- # avoid file conflict with gnome-menus
- patch -p1 -i "${srcdir}"/kde-applications-menu.patch
- # add Archlinux menu entry
- patch -p1 -i "${srcdir}"/archlinux-menu.patch
-
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
- -DKDE_DISTRIBUTION_TEXT='Arch Linux' \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DSYSCONF_INSTALL_DIR=/etc \
- -DHTML_INSTALL_DIR=/usr/share/doc/kde/html \
- -DKDE_DEFAULT_HOME='.kde4' \
- -DWITH_FAM=OFF \
- -DWITH_HUpnp=OFF
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-
- # cert bundle seems to be hardcoded
- # link it to the one from ca-certificates
- rm -f "${pkgdir}"/usr/share/apps/kssl/ca-bundle.crt
- ln -sf /etc/ssl/certs/ca-certificates.crt
"${pkgdir}"/usr/share/apps/kssl/ca-bundle.crt
-}
Copied: kdelibs/repos/testing-x86_64/PKGBUILD (from rev 172780,
kdelibs/trunk/PKGBUILD)
===================================================================
--- repos/testing-x86_64/PKGBUILD (rev 0)
+++ repos/testing-x86_64/PKGBUILD 2012-12-05 23:08:19 UTC (rev 172781)
@@ -0,0 +1,61 @@
+# $Id$
+# Maintainer: Andrea Scarpino <[email protected]
+# Contributor: Pierre Schmitz <[email protected]>
+
+pkgname=kdelibs
+pkgver=4.9.4
+pkgrel=2
+pkgdesc="KDE Core Libraries"
+arch=('i686' 'x86_64')
+url='https://projects.kde.org/projects/kde/kdelibs'
+license=('GPL' 'LGPL' 'FDL')
+depends=('strigi' 'attica' 'libxss' 'soprano' 'krb5' 'grantlee'
+ 'shared-desktop-ontologies' 'qca' 'libdbusmenu-qt' 'polkit-qt'
+ 'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr'
+ 'docbook-xsl' 'upower' 'udisks' 'libxcursor' 'phonon' 'qtwebkit'
+ 'media-player-info' 'libxtst')
+makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell' 'mesa')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz";
+ 'kde-applications-menu.patch' 'archlinux-menu.patch'
+ '0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch')
+sha1sums=('b2fe70261207a96a26b5d8789379f134e3e070be'
+ '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
+ '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
+ 'f5d203932f67ab6d87c794e9cb78a3b1a22ef747')
+
+build() {
+ cd "${srcdir}"/${pkgname}-${pkgver}
+
+ # avoid file conflict with gnome-menus
+ patch -p1 -i "${srcdir}"/kde-applications-menu.patch
+ # add Archlinux menu entry
+ patch -p1 -i "${srcdir}"/archlinux-menu.patch
+
+ patch -p1 -i
"${srcdir}"/0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch
+
+ cd "${srcdir}"
+ mkdir build
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_SKIP_RPATH=ON \
+ -DKDE_DISTRIBUTION_TEXT='Arch Linux' \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DSYSCONF_INSTALL_DIR=/etc \
+ -DHTML_INSTALL_DIR=/usr/share/doc/kde/html \
+ -DKDE_DEFAULT_HOME='.kde4' \
+ -DWITH_FAM=OFF \
+ -DWITH_HUpnp=OFF
+ make
+}
+
+package() {
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
+
+ # cert bundle seems to be hardcoded
+ # link it to the one from ca-certificates
+ rm -f "${pkgdir}"/usr/share/apps/kssl/ca-bundle.crt
+ ln -sf /etc/ssl/certs/ca-certificates.crt
"${pkgdir}"/usr/share/apps/kssl/ca-bundle.crt
+}
Deleted: repos/testing-x86_64/archlinux-menu.patch
===================================================================
--- repos/testing-x86_64/archlinux-menu.patch 2012-12-05 23:07:31 UTC (rev
172780)
+++ repos/testing-x86_64/archlinux-menu.patch 2012-12-05 23:08:19 UTC (rev
172781)
@@ -1,22 +0,0 @@
---- kdelibs-4.3.98/kded/applications.menu 2010-01-31 19:28:11.000000000
+0000
-+++ kdelibs-4.3.98/kded/applications.menu 2010-01-31 22:25:53.556043077
+0000
-@@ -16,11 +16,19 @@
- </DefaultLayout>
- <Layout>
- <Merge type="menus"/>
-+ <Menuname>Arch Linux</Menuname>
- <Menuname>Applications</Menuname>
- <Merge type="files"/>
- </Layout>
-
- <Menu>
-+ <Name>Arch Linux</Name>
-+ <Directory>Archlinux.directory</Directory>
-+ <Include>
-+ <Category>Archlinux</Category>
-+ </Include>
-+ </Menu>
-+ <Menu>
- <Name>Applications</Name>
- <Directory>kde-unknown.directory</Directory>
- <OnlyUnallocated/>
Copied: kdelibs/repos/testing-x86_64/archlinux-menu.patch (from rev 172780,
kdelibs/trunk/archlinux-menu.patch)
===================================================================
--- repos/testing-x86_64/archlinux-menu.patch (rev 0)
+++ repos/testing-x86_64/archlinux-menu.patch 2012-12-05 23:08:19 UTC (rev
172781)
@@ -0,0 +1,22 @@
+--- kdelibs-4.3.98/kded/applications.menu 2010-01-31 19:28:11.000000000
+0000
++++ kdelibs-4.3.98/kded/applications.menu 2010-01-31 22:25:53.556043077
+0000
+@@ -16,11 +16,19 @@
+ </DefaultLayout>
+ <Layout>
+ <Merge type="menus"/>
++ <Menuname>Arch Linux</Menuname>
+ <Menuname>Applications</Menuname>
+ <Merge type="files"/>
+ </Layout>
+
+ <Menu>
++ <Name>Arch Linux</Name>
++ <Directory>Archlinux.directory</Directory>
++ <Include>
++ <Category>Archlinux</Category>
++ </Include>
++ </Menu>
++ <Menu>
+ <Name>Applications</Name>
+ <Directory>kde-unknown.directory</Directory>
+ <OnlyUnallocated/>
Deleted: repos/testing-x86_64/kde-applications-menu.patch
===================================================================
--- repos/testing-x86_64/kde-applications-menu.patch 2012-12-05 23:07:31 UTC
(rev 172780)
+++ repos/testing-x86_64/kde-applications-menu.patch 2012-12-05 23:08:19 UTC
(rev 172781)
@@ -1,22 +0,0 @@
---- kdelibs-4.3.98/kded/CMakeLists.txt 2009-10-02 14:55:17.000000000 +0000
-+++ kdelibs-4.3.98/kded/CMakeLists.txt 2010-01-31 22:16:13.946933892 +0000
-@@ -69,7 +69,7 @@
- if (WIN32)
- install( FILES applications.menu DESTINATION
${SHARE_INSTALL_PREFIX}/xdg/menus )
- else (WIN32)
--install( FILES applications.menu DESTINATION
${SYSCONF_INSTALL_DIR}/xdg/menus )
-+install( FILES applications.menu DESTINATION
${SYSCONF_INSTALL_DIR}/xdg/menus RENAME kde-applications.menu )
- endif (WIN32)
- install( FILES kdedmodule.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
- install( FILES kded.upd DESTINATION
${DATA_INSTALL_DIR}/kconf_update )
---- kdelibs-4.3.98/kded/kbuildsycoca.cpp 2009-12-04 23:10:18.000000000
+0000
-+++ kdelibs-4.3.98/kded/kbuildsycoca.cpp 2010-01-31 22:16:13.962766572
+0000
-@@ -302,7 +302,7 @@
- if (!m_trackId.isEmpty())
- g_vfolder->setTrackId(m_trackId);
-
-- VFolderMenu::SubMenu *kdeMenu =
g_vfolder->parseMenu("applications.menu", true);
-+ VFolderMenu::SubMenu *kdeMenu =
g_vfolder->parseMenu("kde-applications.menu", true);
-
- KServiceGroup::Ptr entry = g_bsgf->addNew("/", kdeMenu->directoryFile,
KServiceGroup::Ptr(), false);
- entry->setLayoutInfo(kdeMenu->layoutList);
Copied: kdelibs/repos/testing-x86_64/kde-applications-menu.patch (from rev
172780, kdelibs/trunk/kde-applications-menu.patch)
===================================================================
--- repos/testing-x86_64/kde-applications-menu.patch
(rev 0)
+++ repos/testing-x86_64/kde-applications-menu.patch 2012-12-05 23:08:19 UTC
(rev 172781)
@@ -0,0 +1,22 @@
+--- kdelibs-4.3.98/kded/CMakeLists.txt 2009-10-02 14:55:17.000000000 +0000
++++ kdelibs-4.3.98/kded/CMakeLists.txt 2010-01-31 22:16:13.946933892 +0000
+@@ -69,7 +69,7 @@
+ if (WIN32)
+ install( FILES applications.menu DESTINATION
${SHARE_INSTALL_PREFIX}/xdg/menus )
+ else (WIN32)
+-install( FILES applications.menu DESTINATION
${SYSCONF_INSTALL_DIR}/xdg/menus )
++install( FILES applications.menu DESTINATION
${SYSCONF_INSTALL_DIR}/xdg/menus RENAME kde-applications.menu )
+ endif (WIN32)
+ install( FILES kdedmodule.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
+ install( FILES kded.upd DESTINATION
${DATA_INSTALL_DIR}/kconf_update )
+--- kdelibs-4.3.98/kded/kbuildsycoca.cpp 2009-12-04 23:10:18.000000000
+0000
++++ kdelibs-4.3.98/kded/kbuildsycoca.cpp 2010-01-31 22:16:13.962766572
+0000
+@@ -302,7 +302,7 @@
+ if (!m_trackId.isEmpty())
+ g_vfolder->setTrackId(m_trackId);
+
+- VFolderMenu::SubMenu *kdeMenu =
g_vfolder->parseMenu("applications.menu", true);
++ VFolderMenu::SubMenu *kdeMenu =
g_vfolder->parseMenu("kde-applications.menu", true);
+
+ KServiceGroup::Ptr entry = g_bsgf->addNew("/", kdeMenu->directoryFile,
KServiceGroup::Ptr(), false);
+ entry->setLayoutInfo(kdeMenu->layoutList);
Deleted: repos/testing-x86_64/kdelibs.install
===================================================================
--- repos/testing-x86_64/kdelibs.install 2012-12-05 23:07:31 UTC (rev
172780)
+++ repos/testing-x86_64/kdelibs.install 2012-12-05 23:08:19 UTC (rev
172781)
@@ -1,13 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-mime-database usr/share/mime &> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: kdelibs/repos/testing-x86_64/kdelibs.install (from rev 172780,
kdelibs/trunk/kdelibs.install)
===================================================================
--- repos/testing-x86_64/kdelibs.install (rev 0)
+++ repos/testing-x86_64/kdelibs.install 2012-12-05 23:08:19 UTC (rev
172781)
@@ -0,0 +1,13 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-mime-database usr/share/mime &> /dev/null
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
