summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMárcio Alexandre Silva Delgado <coadde@lavabit.com>2013-03-07 21:25:47 -0200
committerMárcio Alexandre Silva Delgado <coadde@lavabit.com>2013-03-07 21:25:47 -0200
commitceda3b518a3eb130800744b3e3c7f1c5ba2e50ff (patch)
treecac8f9c172e5f565b0817d33784d0406363711e3
parentd8726151c9f8fdb5927ec4a3397ccb2e63216291 (diff)
parent2377f1cfac3abf4d573db1a0cfd043738b833afe (diff)
downloadabslibre-ceda3b518a3eb130800744b3e3c7f1c5ba2e50ff.tar.gz
abslibre-ceda3b518a3eb130800744b3e3c7f1c5ba2e50ff.tar.bz2
abslibre-ceda3b518a3eb130800744b3e3c7f1c5ba2e50ff.zip
Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre
-rw-r--r--libre/kdelibs-libre/PKGBUILD21
-rw-r--r--libre/kdelibs-libre/khtml-fsdg.diff50
-rw-r--r--libre/kdelibs-libre/qt4.patch11
3 files changed, 23 insertions, 59 deletions
diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD
index 18947854a..ac5afdfa1 100644
--- a/libre/kdelibs-libre/PKGBUILD
+++ b/libre/kdelibs-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 179135 2013-03-04 11:09:00Z andrea $
+# $Id: PKGBUILD 179600 2013-03-07 17:47:07Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org
# Contributor: Pierre Schmitz <pierre@archlinux.de>
# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -6,7 +6,7 @@
_pkgname=kdelibs
pkgname=kdelibs-libre
pkgver=4.10.1
-pkgrel=1
+pkgrel=2
pkgdesc="KDE Core Libraries"
arch=('i686' 'x86_64' 'mips64el')
url='https://projects.kde.org/projects/kde/kdelibs'
@@ -22,21 +22,24 @@ 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')
+ 'kde-applications-menu.patch' 'qt4.patch')
sha1sums=('91d1ab65a561decf7506df45bda7a7fec9a524bb'
'86ee8c8660f19de8141ac99cd6943964d97a1ed7'
- 'a1502a964081ad583a00cf90c56e74bf60121830')
+ 'ed1f57ee661e5c7440efcaba7e51d2554709701c')
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
+ rm -v khtml/html/html_objectimpl.cpp
+ sed -i -e '/html_objectimpl.cpp/d' khtml/CMakeLists.txt
+
+ cd ../
- cd "${srcdir}"
mkdir build
cd build
cmake ../${_pkgname}-${pkgver} \
diff --git a/libre/kdelibs-libre/khtml-fsdg.diff b/libre/kdelibs-libre/khtml-fsdg.diff
deleted file mode 100644
index 1a531b3c8..000000000
--- a/libre/kdelibs-libre/khtml-fsdg.diff
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -ru kdelibs-4.8.0.orig/khtml/html/html_objectimpl.cpp kdelibs-4.8.0/khtml/html/html_objectimpl.cpp
---- kdelibs-4.8.0.orig/khtml/html/html_objectimpl.cpp 2012-01-30 19:46:27.684114289 +0100
-+++ kdelibs-4.8.0/khtml/html/html_objectimpl.cpp 2012-01-30 19:47:47.222111046 +0100
-@@ -577,46 +577,6 @@
-
- void HTMLObjectBaseElementImpl::slotPartLoadingErrorNotify()
- {
-- // If we have an embed, we may be able to tell the user where to
-- // download the plugin.
--
-- HTMLEmbedElementImpl *embed = relevantEmbed();
-- QString serviceType; // shadows ours, but we don't care.
--
-- if (!embed)
-- return;
--
-- serviceType = embed->serviceType;
--
-- KHTMLPart* part = document()->part();
-- KParts::BrowserExtension *ext = part->browserExtension();
--
-- if(!embed->pluginPage.isEmpty() && ext) {
-- // Prepare the mimetype to show in the question (comment if available, name as fallback)
-- QString mimeName = serviceType;
-- KMimeType::Ptr mime = KMimeType::mimeType(serviceType, KMimeType::ResolveAliases);
-- if ( mime && mime->name() != KMimeType::defaultMimeType() )
-- mimeName = mime->comment();
--
-- // Check if we already asked the user, for this page
-- if (!mimeName.isEmpty() && !part->pluginPageQuestionAsked(serviceType))
-- {
-- part->setPluginPageQuestionAsked(serviceType);
--
-- // Prepare the URL to show in the question (host only if http, to make it short)
-- KUrl pluginPageURL(embed->pluginPage);
-- QString shortURL = pluginPageURL.protocol() == "http" ? pluginPageURL.host() : pluginPageURL.prettyUrl();
-- int res = KMessageBox::questionYesNo( part->view(),
-- i18n("No plugin found for '%1'.\nDo you want to download one from %2?", mimeName, shortURL),
-- i18n("Missing Plugin"), KGuiItem(i18n("Download")), KGuiItem(i18n("Do Not Download")), QString("plugin-")+serviceType);
-- if (res == KMessageBox::Yes)
-- {
-- // Display vendor download page
-- ext->createNewWindow(pluginPageURL);
-- return;
-- }
-- }
-- }
- }
-
-
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"