summaryrefslogtreecommitdiff
path: root/libre/kdelibs-libre
diff options
context:
space:
mode:
Diffstat (limited to 'libre/kdelibs-libre')
-rw-r--r--libre/kdelibs-libre/0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch53
-rw-r--r--libre/kdelibs-libre/PKGBUILD26
-rw-r--r--libre/kdelibs-libre/fix-crash-on-open-with.patch19
-rw-r--r--libre/kdelibs-libre/fix-kmail-crash.patch71
-rw-r--r--libre/kdelibs-libre/fix-save-path.patch27
-rw-r--r--libre/kdelibs-libre/qt4.patch11
-rw-r--r--libre/kdelibs-libre/use-pythondontwritebytecode.patch113
7 files changed, 26 insertions, 294 deletions
diff --git a/libre/kdelibs-libre/0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch b/libre/kdelibs-libre/0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch
deleted file mode 100644
index 5aadeb883..000000000
--- a/libre/kdelibs-libre/0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 73283f1332e90fbb6fe0caa39a038cb16b83a54c Mon Sep 17 00:00:00 2001
-From: David Faure <faure@kde.org>
-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
diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD
index e73cc2f36..d8d648b3b 100644
--- a/libre/kdelibs-libre/PKGBUILD
+++ b/libre/kdelibs-libre/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 174033 2013-01-02 10:59:35Z andrea $
+# $Id: PKGBUILD 181384 2013-04-04 03:32:27Z svenstaro $
# Maintainer: Andrea Scarpino <andrea@archlinux.org
# Contributor: Pierre Schmitz <pierre@archlinux.de>
# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
_pkgname=kdelibs
pkgname=kdelibs-libre
-pkgver=4.9.5
+pkgver=4.10.2
pkgrel=1
pkgdesc="KDE Core Libraries"
arch=('i686' 'x86_64' 'mips64el')
@@ -14,33 +14,36 @@ 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' 'libutempter')
+ 'docbook-xsl' 'upower' 'udisks2' 'libxcursor' 'phonon'
+ 'media-player-info' 'libxtst' 'libutempter' 'qtwebkit')
makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell' 'mesa')
provides=("kdelibs=$pkgver")
replaces=('kdelibs')
conflicts=('kdelibs')
install=${_pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz"
- 'kde-applications-menu.patch'
- 'khtml-fsdg.diff')
-sha1sums=('899a58c5cf2115a1a18fb1690c99b2b3815975c6'
+ 'kde-applications-menu.patch' 'qt4.patch' 'khtml-fsdg.diff')
+sha1sums=('2f1f455c39fa33cc133db7ec6b3d2dbbabe03c85'
'86ee8c8660f19de8141ac99cd6943964d97a1ed7'
+ 'ed1f57ee661e5c7440efcaba7e51d2554709701c'
'a1502a964081ad583a00cf90c56e74bf60121830')
build() {
- cd "${srcdir}"/${_pkgname}-${pkgver}
-
+ cd ${_pkgname}-${pkgver}
# avoid file conflict with gnome-menus
patch -p1 -i "${srcdir}"/kde-applications-menu.patch
+ # qmake refers to Qt5
+ patch -p1 -i "${srcdir}"/qt4.patch
# Don't ask the user to download a plugin, it's probably nonfree.
patch -p1 -i "${srcdir}"/khtml-fsdg.diff
- cd "${srcdir}"
+ cd ../
+
mkdir build
cd build
cmake ../${_pkgname}-${pkgver} \
-DCMAKE_BUILD_TYPE=Release \
+ -DKDE4_BUILD_TESTS=OFF \
-DCMAKE_SKIP_RPATH=ON \
-DKDE_DISTRIBUTION_TEXT='Parabola GNU/Linux-libre' \
-DCMAKE_INSTALL_PREFIX=/usr \
@@ -48,7 +51,8 @@ build() {
-DHTML_INSTALL_DIR=/usr/share/doc/kde/html \
-DKDE_DEFAULT_HOME='.kde4' \
-DWITH_FAM=OFF \
- -DWITH_HUpnp=OFF
+ -DWITH_HUpnp=OFF \
+ -DWITH_SOLID_UDISKS2=ON
make
}
diff --git a/libre/kdelibs-libre/fix-crash-on-open-with.patch b/libre/kdelibs-libre/fix-crash-on-open-with.patch
deleted file mode 100644
index 60556386d..000000000
--- a/libre/kdelibs-libre/fix-crash-on-open-with.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 0820b3173aff4f0f3c803a9e75e726024da38ee5
-Author: David Faure <faure@kde.org>
-Date: Thu Dec 6 11:55:05 2012 +0100
-
- Fix crash when no service was selected (user clicked on "Open With...")
-
-diff --git a/kparts/browserrun.cpp b/kparts/browserrun.cpp
-index 6d84800..6de0380 100644
---- a/kparts/browserrun.cpp
-+++ b/kparts/browserrun.cpp
-@@ -304,7 +304,7 @@ BrowserRun::NonEmbeddableResult BrowserRun::handleNonEmbeddable(const QString& _
- this, SLOT(slotCopyToTempFileResult(KJob*)) );
- return Delayed; // We'll continue after the job has finished
- }
-- if (selectedService) {
-+ if (selectedService && question.selectedService()) {
- *selectedService = question.selectedService();
- // KRun will use this when starting an app
- KRun::setPreferredService(question.selectedService()->desktopEntryName());
diff --git a/libre/kdelibs-libre/fix-kmail-crash.patch b/libre/kdelibs-libre/fix-kmail-crash.patch
deleted file mode 100644
index 27caa25f0..000000000
--- a/libre/kdelibs-libre/fix-kmail-crash.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-commit 979b0436510e7807c054e79c40c3753834ac2863
-Author: Sebastian Trueg <trueg@kde.org>
-Date: Thu Mar 15 09:14:35 2012 +0100
-
- Thread-safe ResourceWatcher handling.
-
- We simply perform all RW operations in the manager thread.
-
- BUG: 295474
- FIXED-IN: 4.8.2
-
-diff --git a/nepomuk/core/resourcedata.cpp b/nepomuk/core/resourcedata.cpp
-index abe55ea..9d45228 100644
---- a/nepomuk/core/resourcedata.cpp
-+++ b/nepomuk/core/resourcedata.cpp
-@@ -175,7 +175,8 @@ void Nepomuk::ResourceData::resetAll( bool isDelete )
- if( !m_uri.isEmpty() ) {
- m_rm->m_initializedData.remove( m_uri );
- if( m_rm->m_watcher && m_addedToWatcher ) {
-- m_rm->m_watcher->removeResource(Resource::fromResourceUri(m_uri));
-+ // See load() for an explanation of the QMetaObject call
-+ QMetaObject::invokeMethod(m_rm->m_watcher, "removeResource", Qt::AutoConnection, Q_ARG(Nepomuk::Resource, Resource::fromResourceUri(m_uri)));
- m_addedToWatcher = false;
- }
- }
-@@ -393,16 +394,23 @@ bool Nepomuk::ResourceData::load()
- m_cache.clear();
-
- if(!m_rm->m_watcher) {
-+ //
-+ // The ResourceWatcher is not thread-safe. Thus, we need to ensure the safety ourselves.
-+ // We do that by simply handling all RW related operations in the manager thread.
-+ // This also means to invoke methods on the watcher through QMetaObject to make sure they
-+ // get queued in case of calls between different threads.
-+ //
- m_rm->m_watcher = new ResourceWatcher(m_rm->m_manager);
-+ m_rm->m_watcher->moveToThread(m_rm->m_manager->thread());
- QObject::connect( m_rm->m_watcher, SIGNAL(propertyAdded(Nepomuk::Resource, Nepomuk::Types::Property, QVariant)),
- m_rm->m_manager, SLOT(slotPropertyAdded(Nepomuk::Resource, Nepomuk::Types::Property, QVariant)) );
- QObject::connect( m_rm->m_watcher, SIGNAL(propertyRemoved(Nepomuk::Resource, Nepomuk::Types::Property, QVariant)),
- m_rm->m_manager, SLOT(slotPropertyRemoved(Nepomuk::Resource, Nepomuk::Types::Property, QVariant)) );
- m_rm->m_watcher->addResource( Nepomuk::Resource::fromResourceUri(m_uri) );
-- m_rm->m_watcher->start();
-+ QMetaObject::invokeMethod(m_rm->m_watcher, "start", Qt::AutoConnection);
- }
- else {
-- m_rm->m_watcher->addResource( Nepomuk::Resource::fromResourceUri(m_uri) );
-+ QMetaObject::invokeMethod(m_rm->m_watcher, "addResource", Qt::AutoConnection, Q_ARG(Nepomuk::Resource, Nepomuk::Resource::fromResourceUri(m_uri)) );
- }
- m_addedToWatcher = true;
-
-diff --git a/nepomuk/core/resourcewatcher.h b/nepomuk/core/resourcewatcher.h
-index 06b9622..92b12f5 100644
---- a/nepomuk/core/resourcewatcher.h
-+++ b/nepomuk/core/resourcewatcher.h
-@@ -93,6 +93,7 @@ namespace Nepomuk {
- */
- virtual ~ResourceWatcher();
-
-+ public Q_SLOTS:
- /**
- * \brief Add a type to be watched.
- *
-@@ -204,7 +205,6 @@ namespace Nepomuk {
- */
- QList<Types::Property> properties() const;
-
-- public Q_SLOTS:
- /**
- * \brief Start the signalling of changes.
- *
diff --git a/libre/kdelibs-libre/fix-save-path.patch b/libre/kdelibs-libre/fix-save-path.patch
deleted file mode 100644
index 1a00221a7..000000000
--- a/libre/kdelibs-libre/fix-save-path.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-commit 793e2a69f8aa193b60494b03d51c5fd44373c0e7
-Author: Jonathan Marten <jjm@keelhaul.me.uk>
-Date: Wed Nov 7 12:45:03 2012 +0000
-
- Fix regression: specified or remembered save path is not used
-
- As requested on review https://git.reviewboard.kde.org/r/106475/
-
-diff --git a/kfile/kfilewidget.cpp b/kfile/kfilewidget.cpp
-index 65deca2..e755aae 100644
---- a/kfile/kfilewidget.cpp
-+++ b/kfile/kfilewidget.cpp
-@@ -2593,8 +2593,12 @@ KUrl KFileWidget::getStartUrl( const KUrl& startDir,
- }
- else // not special "kfiledialog" URL
- {
-- if (!startDir.isRelative()) // has directory, maybe with filename
-- {
-+ // We can use startDir as the starting directory if either:
-+ // (a) it has a directory part, or
-+ // (b) there is a scheme (protocol), and it is not just "file".
-+ if (!startDir.directory().isEmpty() ||
-+ (!startDir.scheme().isEmpty() && !startDir.isLocalFile()))
-+ { // can use start directory
- ret = startDir; // will be checked by stat later
- // If we won't be able to list it (e.g. http), then use default
- if ( !KProtocolManager::supportsListing( ret ) ) {
diff --git a/libre/kdelibs-libre/qt4.patch b/libre/kdelibs-libre/qt4.patch
new file mode 100644
index 000000000..bb4312d40
--- /dev/null
+++ b/libre/kdelibs-libre/qt4.patch
@@ -0,0 +1,11 @@
+--- kdelibs-4.10.1/cmake/modules/FindQt4.cmake~ 2013-03-07 16:57:29.735552097 +0000
++++ kdelibs-4.10.1/cmake/modules/FindQt4.cmake 2013-03-07 16:57:52.038725421 +0000
+@@ -446,7 +446,7 @@
+ # check for qmake
+ # Debian uses qmake-qt4
+ # macports' Qt uses qmake-mac
+-FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac PATHS
++FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake-qt4 qmake-mac PATHS
+ "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin"
+ "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin"
+ "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]/bin"
diff --git a/libre/kdelibs-libre/use-pythondontwritebytecode.patch b/libre/kdelibs-libre/use-pythondontwritebytecode.patch
deleted file mode 100644
index 9b5d92042..000000000
--- a/libre/kdelibs-libre/use-pythondontwritebytecode.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-From: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
-Date: Wed, 07 Nov 2012 19:08:01 +0000
-Subject: Respect PYTHONDONTWRITEBYTECODE environmental variable.
-X-Git-Url: http://quickgit.kde.org/?p=kdelibs.git&amp;a=commitdiff&amp;h=5a3cedacdb6485f7551090467cffb2cdf150b05a
----
-Respect PYTHONDONTWRITEBYTECODE environmental variable.
-
-BUG: 276151
-REVIEW: 107228
----
-
-
---- a/cmake/modules/PythonMacros.cmake
-+++ b/cmake/modules/PythonMacros.cmake
-@@ -23,54 +23,56 @@
- # Install the source file.
- INSTALL(FILES ${SOURCE_FILE} DESTINATION ${DESTINATION_DIR})
-
-- # Byte compile and install the .pyc file.
-- GET_FILENAME_COMPONENT(_absfilename ${SOURCE_FILE} ABSOLUTE)
-- GET_FILENAME_COMPONENT(_filename ${SOURCE_FILE} NAME)
-- GET_FILENAME_COMPONENT(_filenamebase ${SOURCE_FILE} NAME_WE)
-- GET_FILENAME_COMPONENT(_basepath ${SOURCE_FILE} PATH)
-+ # Byte compile and install the .pyc file.
-+ IF("$ENV{PYTHONDONTWRITEBYTECODE}" STREQUAL "")
-+ GET_FILENAME_COMPONENT(_absfilename ${SOURCE_FILE} ABSOLUTE)
-+ GET_FILENAME_COMPONENT(_filename ${SOURCE_FILE} NAME)
-+ GET_FILENAME_COMPONENT(_filenamebase ${SOURCE_FILE} NAME_WE)
-+ GET_FILENAME_COMPONENT(_basepath ${SOURCE_FILE} PATH)
-
-- if(WIN32)
-- string(REGEX REPLACE ".:/" "/" _basepath "${_basepath}")
-- endif(WIN32)
-+ if(WIN32)
-+ string(REGEX REPLACE ".:/" "/" _basepath "${_basepath}")
-+ endif(WIN32)
-
-- SET(_bin_py ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filename})
-+ SET(_bin_py ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filename})
-
-- # Python 3.2 changed the pyc file location
-- IF(PYTHON_SHORT_VERSION GREATER 3.1)
-- # To get the right version for suffix
-- STRING(REPLACE "." "" _suffix ${PYTHON_SHORT_VERSION})
-- SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/__pycache__/${_filenamebase}.cpython-${_suffix}.pyc)
-- ELSE(PYTHON_SHORT_VERSION GREATER 3.1)
-- SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filenamebase}.pyc)
-- ENDIF(PYTHON_SHORT_VERSION GREATER 3.1)
-+ # Python 3.2 changed the pyc file location
-+ IF(PYTHON_SHORT_VERSION GREATER 3.1)
-+ # To get the right version for suffix
-+ STRING(REPLACE "." "" _suffix ${PYTHON_SHORT_VERSION})
-+ SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/__pycache__/${_filenamebase}.cpython-${_suffix}.pyc)
-+ ELSE(PYTHON_SHORT_VERSION GREATER 3.1)
-+ SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filenamebase}.pyc)
-+ ENDIF(PYTHON_SHORT_VERSION GREATER 3.1)
-
-- FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${_basepath})
-+ FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${_basepath})
-
-- SET(_message "Byte-compiling ${_bin_py}")
-+ SET(_message "Byte-compiling ${_bin_py}")
-
-- GET_FILENAME_COMPONENT(_abs_bin_py ${_bin_py} ABSOLUTE)
-- IF(_abs_bin_py STREQUAL ${_absfilename}) # Don't copy the file onto itself.
-- ADD_CUSTOM_COMMAND(
-- TARGET compile_python_files
-- COMMAND ${CMAKE_COMMAND} -E echo ${_message}
-- COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py}
-- DEPENDS ${_absfilename}
-- )
-- ELSE(_abs_bin_py STREQUAL ${_absfilename})
-- ADD_CUSTOM_COMMAND(
-- TARGET compile_python_files
-- COMMAND ${CMAKE_COMMAND} -E echo ${_message}
-- COMMAND ${CMAKE_COMMAND} -E copy ${_absfilename} ${_bin_py}
-- COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py}
-- DEPENDS ${_absfilename}
-- )
-- ENDIF(_abs_bin_py STREQUAL ${_absfilename})
-+ GET_FILENAME_COMPONENT(_abs_bin_py ${_bin_py} ABSOLUTE)
-+ IF(_abs_bin_py STREQUAL ${_absfilename}) # Don't copy the file onto itself.
-+ ADD_CUSTOM_COMMAND(
-+ TARGET compile_python_files
-+ COMMAND ${CMAKE_COMMAND} -E echo ${_message}
-+ COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py}
-+ DEPENDS ${_absfilename}
-+ )
-+ ELSE(_abs_bin_py STREQUAL ${_absfilename})
-+ ADD_CUSTOM_COMMAND(
-+ TARGET compile_python_files
-+ COMMAND ${CMAKE_COMMAND} -E echo ${_message}
-+ COMMAND ${CMAKE_COMMAND} -E copy ${_absfilename} ${_bin_py}
-+ COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py}
-+ DEPENDS ${_absfilename}
-+ )
-+ ENDIF(_abs_bin_py STREQUAL ${_absfilename})
-
-- IF(PYTHON_SHORT_VERSION GREATER 3.1)
-- INSTALL(FILES ${_bin_pyc} DESTINATION ${DESTINATION_DIR}/__pycache__/)
-- ELSE (PYTHON_SHORT_VERSION GREATER 3.1)
-- INSTALL(FILES ${_bin_pyc} DESTINATION ${DESTINATION_DIR})
-- ENDIF (PYTHON_SHORT_VERSION GREATER 3.1)
-+ IF(PYTHON_SHORT_VERSION GREATER 3.1)
-+ INSTALL(FILES ${_bin_pyc} DESTINATION ${DESTINATION_DIR}/__pycache__/)
-+ ELSE (PYTHON_SHORT_VERSION GREATER 3.1)
-+ INSTALL(FILES ${_bin_pyc} DESTINATION ${DESTINATION_DIR})
-+ ENDIF (PYTHON_SHORT_VERSION GREATER 3.1)
-+ ENDIF("$ENV{PYTHONDONTWRITEBYTECODE}" STREQUAL "")
-
- ENDMACRO(PYTHON_INSTALL)
-
-
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-10 18:57:28 +0000