From f470938c215266c32e5f1ed919d4c62184ba01c2 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 22 Jun 2018 23:28:37 +0000 Subject: [PATCH] remove remaining kde4 packages --- srcpkgs/kdelibs-devel | 1 - srcpkgs/kdelibs/patches/CVE-2016-6232.patch | 32 ---- srcpkgs/kdelibs/patches/CVE-2017-8422.patch | 164 ------------------ .../patches/fix-gcc6-string_literal.patch | 39 ----- .../kdelibs/patches/fix-headers-kdelibs.patch | 18 -- .../patches/fix-kdeui-cmakelists_txt.patch | 13 -- .../patches/fix-kdoctools_char16_t.patch | 14 -- .../patches/fix-kio-information-leak.patch | 22 --- .../patches/kde-applications-menu.patch | 22 --- .../patches/musl-_nl_msg_cat_cntr.patch | 17 -- srcpkgs/kdelibs/template | 55 ------ srcpkgs/kdevplatform-devel | 1 - ...make-allow-dup-targets-in-po-subdirs.patch | 21 --- srcpkgs/kdevplatform/template | 28 --- srcpkgs/libkdcraw-devel | 1 - srcpkgs/libkdcraw/patches/libraw-0.16.patch | 18 -- srcpkgs/libkdcraw/template | 24 --- srcpkgs/libkexiv2-devel | 1 - srcpkgs/libkexiv2/template | 23 --- srcpkgs/libkipi-devel | 1 - srcpkgs/libkipi/template | 26 --- .../patches/findlightdm.patch | 33 ---- srcpkgs/lightdm-kde-greeter/template | 26 --- srcpkgs/lightdm-kde-greeter/update | 1 - srcpkgs/marble-devel | 1 - srcpkgs/marble/template | 29 ---- srcpkgs/polkit-kde/template | 14 -- srcpkgs/polkit-kde/update | 1 - 28 files changed, 646 deletions(-) delete mode 120000 srcpkgs/kdelibs-devel delete mode 100644 srcpkgs/kdelibs/patches/CVE-2016-6232.patch delete mode 100644 srcpkgs/kdelibs/patches/CVE-2017-8422.patch delete mode 100644 srcpkgs/kdelibs/patches/fix-gcc6-string_literal.patch delete mode 100644 srcpkgs/kdelibs/patches/fix-headers-kdelibs.patch delete mode 100644 srcpkgs/kdelibs/patches/fix-kdeui-cmakelists_txt.patch delete mode 100644 srcpkgs/kdelibs/patches/fix-kdoctools_char16_t.patch delete mode 100644 srcpkgs/kdelibs/patches/fix-kio-information-leak.patch delete mode 100644 srcpkgs/kdelibs/patches/kde-applications-menu.patch delete mode 100644 srcpkgs/kdelibs/patches/musl-_nl_msg_cat_cntr.patch delete mode 100644 srcpkgs/kdelibs/template delete mode 120000 srcpkgs/kdevplatform-devel delete mode 100644 srcpkgs/kdevplatform/patches/kdevplatform-1.7.3.cmake-allow-dup-targets-in-po-subdirs.patch delete mode 100644 srcpkgs/kdevplatform/template delete mode 120000 srcpkgs/libkdcraw-devel delete mode 100644 srcpkgs/libkdcraw/patches/libraw-0.16.patch delete mode 100644 srcpkgs/libkdcraw/template delete mode 120000 srcpkgs/libkexiv2-devel delete mode 100644 srcpkgs/libkexiv2/template delete mode 120000 srcpkgs/libkipi-devel delete mode 100644 srcpkgs/libkipi/template delete mode 100644 srcpkgs/lightdm-kde-greeter/patches/findlightdm.patch delete mode 100644 srcpkgs/lightdm-kde-greeter/template delete mode 100644 srcpkgs/lightdm-kde-greeter/update delete mode 120000 srcpkgs/marble-devel delete mode 100644 srcpkgs/marble/template delete mode 100644 srcpkgs/polkit-kde/template delete mode 100644 srcpkgs/polkit-kde/update diff --git a/srcpkgs/kdelibs-devel b/srcpkgs/kdelibs-devel deleted file mode 120000 index 0285553782..0000000000 --- a/srcpkgs/kdelibs-devel +++ /dev/null @@ -1 +0,0 @@ -kdelibs \ No newline at end of file diff --git a/srcpkgs/kdelibs/patches/CVE-2016-6232.patch b/srcpkgs/kdelibs/patches/CVE-2016-6232.patch deleted file mode 100644 index bcc6073f79..0000000000 --- a/srcpkgs/kdelibs/patches/CVE-2016-6232.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- kdecore/io/karchive.cpp -+++ kdecore/io/karchive.cpp -@@ -800,6 +800,7 @@ - void KArchiveDirectory::copyTo(const QString& dest, bool recursiveCopy ) const - { - QDir root; -+ const QString destDir(QDir(dest).absolutePath()); // get directory path without any "." or ".." - - QList fileList; - QMap fileToDir; -@@ -809,10 +810,19 @@ - QStack dirNameStack; - - dirStack.push( this ); // init stack at current directory -- dirNameStack.push( dest ); // ... with given path -+ dirNameStack.push(destDir); // ... with given path - do { - const KArchiveDirectory* curDir = dirStack.pop(); -- const QString curDirName = dirNameStack.pop(); -+ -+ // extract only to specified folder if it is located within archive's extraction folder -+ // otherwise put file under root position in extraction folder -+ QString curDirName = dirNameStack.pop(); -+ if (!QDir(curDirName).absolutePath().startsWith(destDir)) { -+ qWarning() << "Attempted export into folder" << curDirName -+ << "which is outside of the extraction root folder" << destDir << "." -+ << "Changing export of contained files to extraction root folder."; -+ curDirName = destDir; -+ } - root.mkdir(curDirName); - - const QStringList dirEntries = curDir->entries(); diff --git a/srcpkgs/kdelibs/patches/CVE-2017-8422.patch b/srcpkgs/kdelibs/patches/CVE-2017-8422.patch deleted file mode 100644 index 3bc7090420..0000000000 --- a/srcpkgs/kdelibs/patches/CVE-2017-8422.patch +++ /dev/null @@ -1,164 +0,0 @@ ---- kdecore/auth/AuthBackend.cpp -+++ kdecore/auth/AuthBackend.cpp -@@ -54,6 +54,11 @@ void AuthBackend::setCapabilities(AuthBackend::Capabilities capabilities) - d->capabilities = capabilities; - } - -+AuthBackend::ExtraCallerIDVerificationMethod AuthBackend::extraCallerIDVerificationMethod() const -+{ -+ return NoExtraCallerIDVerificationMethod; -+} -+ - bool AuthBackend::actionExists(const QString& action) - { - Q_UNUSED(action); ---- kdecore/auth/AuthBackend.h -+++ kdecore/auth/AuthBackend.h -@@ -43,6 +43,12 @@ public: - }; - Q_DECLARE_FLAGS(Capabilities, Capability) - -+ enum ExtraCallerIDVerificationMethod { -+ NoExtraCallerIDVerificationMethod, -+ VerifyAgainstDBusServiceName, -+ VerifyAgainstDBusServicePid, -+ }; -+ - AuthBackend(); - virtual ~AuthBackend(); - virtual void setupAction(const QString &action) = 0; -@@ -50,6 +56,7 @@ public: - virtual Action::AuthStatus authorizeAction(const QString &action) = 0; - virtual Action::AuthStatus actionStatus(const QString &action) = 0; - virtual QByteArray callerID() const = 0; -+ virtual ExtraCallerIDVerificationMethod extraCallerIDVerificationMethod() const; - virtual bool isCallerAuthorized(const QString &action, QByteArray callerID) = 0; - virtual bool actionExists(const QString &action); - ---- kdecore/auth/backends/dbus/DBusHelperProxy.cpp -+++ kdecore/auth/backends/dbus/DBusHelperProxy.cpp -@@ -271,6 +271,29 @@ void DBusHelperProxy::performActions(QByteArray blob, const QByteArray &callerID - } - } - -+bool DBusHelperProxy::isCallerAuthorized(const QString &action, const QByteArray &callerID) -+{ -+ // Check the caller is really who it says it is -+ switch (BackendsManager::authBackend()->extraCallerIDVerificationMethod()) { -+ case AuthBackend::NoExtraCallerIDVerificationMethod: -+ break; -+ -+ case AuthBackend::VerifyAgainstDBusServiceName: -+ if (message().service().toUtf8() != callerID) { -+ return false; -+ } -+ break; -+ -+ case AuthBackend::VerifyAgainstDBusServicePid: -+ if (connection().interface()->servicePid(message().service()).value() != callerID.toUInt()) { -+ return false; -+ } -+ break; -+ } -+ -+ return BackendsManager::authBackend()->isCallerAuthorized(action, callerID); -+} -+ - QByteArray DBusHelperProxy::performAction(const QString &action, const QByteArray &callerID, QByteArray arguments) - { - if (!responder) { -@@ -295,7 +318,7 @@ QByteArray DBusHelperProxy::performAction(const QString &action, const QByteArra - QTimer *timer = responder->property("__KAuth_Helper_Shutdown_Timer").value(); - timer->stop(); - -- if (BackendsManager::authBackend()->isCallerAuthorized(action, callerID)) { -+ if (isCallerAuthorized(action, callerID)) { - QString slotname = action; - if (slotname.startsWith(m_name + QLatin1Char('.'))) { - slotname = slotname.right(slotname.length() - m_name.length() - 1); -@@ -338,7 +361,7 @@ uint DBusHelperProxy::authorizeAction(const QString& action, const QByteArray& c - QTimer *timer = responder->property("__KAuth_Helper_Shutdown_Timer").value(); - timer->stop(); - -- if (BackendsManager::authBackend()->isCallerAuthorized(action, callerID)) { -+ if (isCallerAuthorized(action, callerID)) { - retVal = static_cast(Action::Authorized); - } else { - retVal = static_cast(Action::Denied); ---- kdecore/auth/backends/dbus/DBusHelperProxy.h -+++ kdecore/auth/backends/dbus/DBusHelperProxy.h -@@ -21,6 +21,7 @@ - #ifndef DBUS_HELPER_PROXY_H - #define DBUS_HELPER_PROXY_H - -+#include - #include - #include "HelperProxy.h" - #include "kauthactionreply.h" -@@ -28,7 +29,7 @@ - namespace KAuth - { - --class DBusHelperProxy : public HelperProxy -+class DBusHelperProxy : public HelperProxy, protected QDBusContext - { - Q_OBJECT - Q_INTERFACES(KAuth::HelperProxy) -@@ -73,6 +74,9 @@ signals: - - private slots: - void remoteSignalReceived(int type, const QString &action, QByteArray blob); -+ -+private: -+ bool isCallerAuthorized(const QString &action, const QByteArray &callerID); - }; - - } // namespace Auth ---- kdecore/auth/backends/policykit/PolicyKitBackend.cpp -+++ kdecore/auth/backends/policykit/PolicyKitBackend.cpp -@@ -78,6 +78,11 @@ QByteArray PolicyKitBackend::callerID() const - return a; - } - -+AuthBackend::ExtraCallerIDVerificationMethod Polkit1Backend::extraCallerIDVerificationMethod() const -+{ -+ return VerifyAgainstDBusServicePid; -+} -+ - bool PolicyKitBackend::isCallerAuthorized(const QString &action, QByteArray callerID) - { - QDataStream s(&callerID, QIODevice::ReadOnly); ---- kdecore/auth/backends/policykit/PolicyKitBackend.h -+++ kdecore/auth/backends/policykit/PolicyKitBackend.h -@@ -40,6 +40,7 @@ public: - virtual Action::AuthStatus authorizeAction(const QString&); - virtual Action::AuthStatus actionStatus(const QString&); - virtual QByteArray callerID() const; -+ virtual ExtraCallerIDVerificationMethod extraCallerIDVerificationMethod() const; - virtual bool isCallerAuthorized(const QString &action, QByteArray callerID); - - private Q_SLOTS: ---- kdecore/auth/backends/polkit-1/Polkit1Backend.cpp -+++ kdecore/auth/backends/polkit-1/Polkit1Backend.cpp -@@ -163,6 +163,11 @@ QByteArray Polkit1Backend::callerID() const - return QDBusConnection::systemBus().baseService().toUtf8(); - } - -+AuthBackend::ExtraCallerIDVerificationMethod Polkit1Backend::extraCallerIDVerificationMethod() const -+{ -+ return VerifyAgainstDBusServiceName; -+} -+ - bool Polkit1Backend::isCallerAuthorized(const QString &action, QByteArray callerID) - { - PolkitQt1::SystemBusNameSubject subject(QString::fromUtf8(callerID)); ---- kdecore/auth/backends/polkit-1/Polkit1Backend.h -+++ kdecore/auth/backends/polkit-1/Polkit1Backend.h -@@ -48,6 +48,7 @@ public: - virtual Action::AuthStatus authorizeAction(const QString&); - virtual Action::AuthStatus actionStatus(const QString&); - virtual QByteArray callerID() const; -+ virtual ExtraCallerIDVerificationMethod extraCallerIDVerificationMethod() const; - virtual bool isCallerAuthorized(const QString &action, QByteArray callerID); - virtual bool actionExists(const QString& action); - diff --git a/srcpkgs/kdelibs/patches/fix-gcc6-string_literal.patch b/srcpkgs/kdelibs/patches/fix-gcc6-string_literal.patch deleted file mode 100644 index b612b6a647..0000000000 --- a/srcpkgs/kdelibs/patches/fix-gcc6-string_literal.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- solid/solid/backends/shared/cpufeatures.cpp 2014-11-06 23:33:50.000000000 +0100 -+++ solid/solid/backends/shared/cpufeatures.cpp 2016-09-19 06:28:35.687133990 +0200 -@@ -52,22 +52,22 @@ - - #ifdef __i386__ - #define ASM_REG(reg) "%e"reg -- #define ASM_POP(reg) "popl %%e"reg" \n\t" -- #define ASM_PUSH(reg) "pushl %%e"reg" \n\t" -- #define ASM_XOR_REG(reg1, reg2) "xorl %%e"reg1", %%e"reg2" \n\t" -- #define ASM_XOR_VAR(var, reg) "xorl "var", %%e"reg" \n\t" -- #define ASM_CMP_REG(reg1, reg2) "cmpl %%e"reg1", %%e"reg2" \n\t" -- #define ASM_MOV_REG(reg1, reg2) "movl %%e"reg1", %%e"reg2" \n\t" -- #define ASM_MOV_VAR(var, reg) "movl "var", %%e"reg" \n\t" -+ #define ASM_POP(reg) "popl %%e" reg" \n\t" -+ #define ASM_PUSH(reg) "pushl %%e" reg" \n\t" -+ #define ASM_XOR_REG(reg1, reg2) "xorl %%e" reg1 ", %%e" reg2 " \n\t" -+ #define ASM_XOR_VAR(var, reg) "xorl "var", %%e" reg " \n\t" -+ #define ASM_CMP_REG(reg1, reg2) "cmpl %%e" reg1 ", %%e" reg2 " \n\t" -+ #define ASM_MOV_REG(reg1, reg2) "movl %%e" reg1 ", %%e" reg2 " \n\t" -+ #define ASM_MOV_VAR(var, reg) "movl "var", %%e" reg " \n\t" - #elif defined(__x86_64__) - #define ASM_REG(reg) "%r"reg -- #define ASM_POP(reg) "popq %%r"reg" \n\t" -- #define ASM_PUSH(reg) "pushq %%r"reg" \n\t" -- #define ASM_XOR_REG(reg1, reg2) "xorq %%r"reg1", %%r"reg2" \n\t" -- #define ASM_XOR_VAR(var, reg) "xorq "var", %%r"reg" \n\t" -- #define ASM_CMP_REG(reg1, reg2) "cmpq %%r"reg1", %%r"reg2" \n\t" -- #define ASM_MOV_REG(reg1, reg2) "movq %%r"reg1", %%r"reg2" \n\t" -- #define ASM_MOV_VAR(var, reg) "movq "var", %%r"reg" \n\t" -+ #define ASM_POP(reg) "popq %%r" reg " \n\t" -+ #define ASM_PUSH(reg) "pushq %%r" reg " \n\t" -+ #define ASM_XOR_REG(reg1, reg2) "xorq %%r" reg1 ", %%r" reg2 " \n\t" -+ #define ASM_XOR_VAR(var, reg) "xorq "var", %%r" reg " \n\t" -+ #define ASM_CMP_REG(reg1, reg2) "cmpq %%r" reg1 ", %%r" reg2 " \n\t" -+ #define ASM_MOV_REG(reg1, reg2) "movq %%r" reg1 ", %%r" reg2 " \n\t" -+ #define ASM_MOV_VAR(var, reg) "movq "var", %%r" reg " \n\t" - #endif - - #ifdef __PPC__ diff --git a/srcpkgs/kdelibs/patches/fix-headers-kdelibs.patch b/srcpkgs/kdelibs/patches/fix-headers-kdelibs.patch deleted file mode 100644 index b9491a9a5b..0000000000 --- a/srcpkgs/kdelibs/patches/fix-headers-kdelibs.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- solid/solid/backends/udisks2/udisksblock.h -+++ solid/solid/backends/udisks2/udisksblock.h -@@ -21,6 +21,7 @@ - #ifndef UDISKS2BLOCK_H - #define UDISKS2BLOCK_H - -+#include - #include - #include "udisksdeviceinterface.h" - ---- kdecore/io/kdirwatch_p.h -+++ kdecore/io/kdirwatch_p.h -@@ -65,6 +65,7 @@ - - #include - #include // ino_t -+#include - #include diff --git a/srcpkgs/kdelibs/patches/fix-kdeui-cmakelists_txt.patch b/srcpkgs/kdelibs/patches/fix-kdeui-cmakelists_txt.patch deleted file mode 100644 index ad6f7edc0d..0000000000 --- a/srcpkgs/kdelibs/patches/fix-kdeui-cmakelists_txt.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- kdeui/CMakeLists.txt 2014-11-06 23:33:50.000000000 +0100 -+++ kdeui/CMakeLists.txt 2017-12-17 22:16:31.058116483 +0100 -@@ -312,9 +312,7 @@ - set(kdeui_LIB_SRCS ${kdeui_LIB_SRCS} util/kwallet_mac.cpp util/qosxkeychain.cpp) - add_definitions(-DMAC_USE_OSXKEYCHAIN) - else(Q_WS_MAC AND MAC_USE_OSXKEYCHAIN) -- set(kdeui_LIB_SRCS ${kdeui_LIB_SRCS} util/kwallet.cpp) --else(Q_WS_MAC AND MAC_USE_OSXKEYCHAIN) -- set(kdeui_LIB_SRCS ${kdeui_LIB_SRCS} util/kwallet.cpp) -+ set(kdeui_LIB_SRCS ${kdeui_LIB_SRCS} util/kwallet.cpp) - endif(Q_WS_MAC AND MAC_USE_OSXKEYCHAIN) - - if(NOT WINCE) diff --git a/srcpkgs/kdelibs/patches/fix-kdoctools_char16_t.patch b/srcpkgs/kdelibs/patches/fix-kdoctools_char16_t.patch deleted file mode 100644 index b4532b0048..0000000000 --- a/srcpkgs/kdelibs/patches/fix-kdoctools_char16_t.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- kdoctools/xslt.h 2014-11-06 23:33:50.000000000 +0100 -+++ kdoctools/xslt.h 2017-12-17 22:28:41.024101780 +0100 -@@ -1,6 +1,11 @@ - #ifndef _MEIN_XSLT_H_ - #define _MEIN_XSLT_H_ - -+#if !defined(char16_t) -+#include -+typedef uint16_t char16_t; -+#endif -+ - #include - #include - #include diff --git a/srcpkgs/kdelibs/patches/fix-kio-information-leak.patch b/srcpkgs/kdelibs/patches/fix-kio-information-leak.patch deleted file mode 100644 index 250b043b2a..0000000000 --- a/srcpkgs/kdelibs/patches/fix-kio-information-leak.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- kio/misc/kpac/script.cpp -+++ kio/misc/kpac/script.cpp -@@ -754,9 +754,16 @@ namespace KPAC - } - } - -+ KUrl cleanUrl = url; -+ cleanUrl.setUserInfo(QString()); -+ if (cleanUrl.scheme().toLower() == QLatin1String("https")) { -+ cleanUrl.setPath(QString()); -+ cleanUrl.setQuery(QString()); -+ } -+ - QScriptValueList args; -- args << url.url(); -- args << url.host(); -+ args << cleanUrl.url(); -+ args << cleanUrl.host(); - - QScriptValue result = func.call(QScriptValue(), args); - if (result.isError()) { - diff --git a/srcpkgs/kdelibs/patches/kde-applications-menu.patch b/srcpkgs/kdelibs/patches/kde-applications-menu.patch deleted file mode 100644 index ca1d1eaaa1..0000000000 --- a/srcpkgs/kdelibs/patches/kde-applications-menu.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- kded/CMakeLists.txt 2009-10-02 14:55:17.000000000 +0000 -+++ 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 ) ---- kded/kbuildsycoca.cpp 2009-12-04 23:10:18.000000000 +0000 -+++ 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); diff --git a/srcpkgs/kdelibs/patches/musl-_nl_msg_cat_cntr.patch b/srcpkgs/kdelibs/patches/musl-_nl_msg_cat_cntr.patch deleted file mode 100644 index c34ec4e94a..0000000000 --- a/srcpkgs/kdelibs/patches/musl-_nl_msg_cat_cntr.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- kdecore/localization/kcatalog.cpp -+++ kdecore/localization/kcatalog.cpp -@@ -193,12 +193,14 @@ void KCatalogPrivate::setupGettextEnv () - //kDebug() << "bindtextdomain" << name << localeDir; - bindtextdomain(name, localeDir); - -+#if defined(__GLIBC__) - // Magic to make sure Gettext doesn't use stale cached translation - // from previous language. - #ifndef _MSC_VER - extern int _nl_msg_cat_cntr; - #endif - ++_nl_msg_cat_cntr; -+#endif - } - } - diff --git a/srcpkgs/kdelibs/template b/srcpkgs/kdelibs/template deleted file mode 100644 index 796b8948ce..0000000000 --- a/srcpkgs/kdelibs/template +++ /dev/null @@ -1,55 +0,0 @@ -# Template file for 'kdelibs' -pkgname=kdelibs -version=4.14.3 -revision=10 -short_desc="KDE core libraries" -maintainer="Juan RP " -license="GPL-2.0, LGPL-2.1, FDL" -homepage="http://www.kde.org" -distfiles="http://download.kde.org/stable/${version}/src/${pkgname}-${version}.tar.xz" -checksum=f8206da1106184ef0bd031b82701c4910b8dade331c4cdaf1cd9c6c5208cfd9e - -build_style=cmake -configure_args="-Wno-dev -DKDE4_BUILD_TESTS=OFF -DKDE_DISTRIBUTION_TEXT=Void - -DSYSCONF_INSTALL_DIR=/etc -DHTML_INSTALL_DIR=/usr/share/doc/kde/html - -DKDE_DEFAULT_HOME=.kde4 -DWITH_FAM=OFF -DWITH_SOLID_UDISKS2=ON - -DWITH_Soprano=OFF -DWITH_ASPELL=OFF -DWITH_HSPELL=OFF" - -hostmakedepends="perl automoc4 pkg-config docbook-xsl" -makedepends="libressl-devel libSM-devel libXext-devel libXScrnSaver-devel - libXrender-devel phonon-devel strigi-devel pcre-devel libjpeg-turbo-devel - libpng-devel giflib-devel acl-devel enchant-devel jasper-devel - liblzma-devel mit-krb5-devel avahi-libs-devel eudev-libudev-devel libxslt-devel - polkit-qt-devel libdbusmenu-qt-devel attica-devel grantlee-devel qca-devel - qt-webkit-devel libutempter-devel MesaLib-devel udisks2-devel - libopenexr-devel media-player-info shared-mime-info shared-desktop-ontologies" -depends="docbook-xsl media-player-info shared-mime-info - shared-desktop-ontologies hicolor-icon-theme ca-certificates" -nocross="Fails to build after plasma_automoc with cross dependencies installed" - -CXXFLAGS="-std=gnu++98 -Wno-deprecated-declarations" - -if [ -n "$CROSS_BUILD" ]; then - # FIXME: still does not work - hostmakedepends+=" shared-mime-info qt-qmake qt-host-tools" - makedepends+=" docbook-xsl" -fi - -pre_configure() { - sed -i cmake/modules/FindKDE4Internal.cmake -e"s;_BSD_SOURCE;_DEFAULT_SOURCE;g" -} - -post_install() { - rm -f ${DESTDIR}/usr/share/apps/kssl/ca-bundle.crt - ln -sf /etc/ssl/certs/ca-certificates.crt \ - ${DESTDIR}/usr/share/apps/kssl/ca-bundle.crt -} - -kdelibs-devel_package() { - depends="${sourcepkg}>=${version}_${revision}" - pkg_install() { - vmove usr/include - vmove usr/share/apps/cmake - vmove usr/lib/cmake - } -} diff --git a/srcpkgs/kdevplatform-devel b/srcpkgs/kdevplatform-devel deleted file mode 120000 index 70e3438c42..0000000000 --- a/srcpkgs/kdevplatform-devel +++ /dev/null @@ -1 +0,0 @@ -kdevplatform \ No newline at end of file diff --git a/srcpkgs/kdevplatform/patches/kdevplatform-1.7.3.cmake-allow-dup-targets-in-po-subdirs.patch b/srcpkgs/kdevplatform/patches/kdevplatform-1.7.3.cmake-allow-dup-targets-in-po-subdirs.patch deleted file mode 100644 index c1e730aa87..0000000000 --- a/srcpkgs/kdevplatform/patches/kdevplatform-1.7.3.cmake-allow-dup-targets-in-po-subdirs.patch +++ /dev/null @@ -1,21 +0,0 @@ -cmake 3.x policy CMP0002 forbids same target name to be defined several times. -But the 28 po/*/CMakeList.txt files do it, so allow it or patch each. - -Error message was: -CMake Error at /usr/share/apps/cmake/modules/FindGettext.cmake:232 (ADD_CUSTOM_TARGET): - add_custom_target cannot create target "pofiles" because another target - with the same name already exists. The existing target is a custom target - created in source directory "/builddir/kdevplatform-1.7.3/po/fi". See - documentation for policy CMP0002 for more details. -Call Stack (most recent call first): - po/gl/CMakeLists.txt:2 (GETTEXT_PROCESS_PO_FILES) - ---- CMakeLists.txt.orig 2016-01-22 19:05:47.000000000 +0100 -+++ CMakeLists.txt 2016-04-15 01:18:05.456531820 +0200 -@@ -140,4 +140,6 @@ - configure_file(${CMAKE_SOURCE_DIR}/CTestCustom.cmake ${CMAKE_BINARY_DIR}/CTestCustom.cmake) - - include(MacroOptionalAddSubdirectory) -+set_property(GLOBAL -+ PROPERTY ALLOW_DUPLICATE_CUSTOM_TARGETS 1) - macro_optional_add_subdirectory( po ) diff --git a/srcpkgs/kdevplatform/template b/srcpkgs/kdevplatform/template deleted file mode 100644 index 32d926d0b1..0000000000 --- a/srcpkgs/kdevplatform/template +++ /dev/null @@ -1,28 +0,0 @@ -# Template file for 'kdevplatform' -pkgname=kdevplatform -version=1.7.3 -revision=2 - -build_style=cmake -configure_args="-Wno-dev" - -hostmakedepends="qt-qmake automoc4 perl" -makedepends="kdelibs-devel qt-devel qt-webkit-devel libressl-devel phonon-devel - grantlee-devel boost-devel subversion-devel apr-util-devel qjson-devel" - -short_desc="Libraries for use by KDE development tools" -maintainer="yopito " -license="GPL-2" -homepage="https://www.kdevelop.org/" -distfiles="http://download.kde.org/stable/kdevelop/4.7.3/src/${pkgname}-${version}.tar.bz2" -checksum=195134bde11672de38838f4b341ed28c58042374ca12beedacca9d30e6ab4a2b - -kdevplatform-devel_package() { - short_desc+="- development files" - depends="${sourcepkg}>=${version}_${revision}" - pkg_install() { - vmove usr/include - vmove usr/lib/cmake - vmove "usr/lib/lib*.so" - } -} diff --git a/srcpkgs/libkdcraw-devel b/srcpkgs/libkdcraw-devel deleted file mode 120000 index dc476a7a8a..0000000000 --- a/srcpkgs/libkdcraw-devel +++ /dev/null @@ -1 +0,0 @@ -libkdcraw \ No newline at end of file diff --git a/srcpkgs/libkdcraw/patches/libraw-0.16.patch b/srcpkgs/libkdcraw/patches/libraw-0.16.patch deleted file mode 100644 index cd335c6b06..0000000000 --- a/srcpkgs/libkdcraw/patches/libraw-0.16.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- CMakeLists.txt.orig 2015-05-23 09:25:05.721145281 +0200 -+++ CMakeLists.txt 2015-05-23 09:25:49.481580405 +0200 -@@ -35,6 +35,7 @@ INCLUDE(MacroLibrary) - INCLUDE(MacroOptionalAddSubdirectory) - INCLUDE(FindPackageHandleStandardArgs) - -+ - # NOTE: Libraw 0.16.x is prefered version to use because it's ported to Cmake with full features supported. - # Until libraw 0.16.0 is release (ends of 2013), we will support previous version (with limited support) - FIND_PACKAGE(LibRaw 0.15) -@@ -73,6 +74,7 @@ INCLUDE_DIRECTORIES(${QDBUS_INCLUDE_DIRS - - SET(LIBKDCRAW_AREA_CODE_GENERAL 51002) - ADD_DEFINITIONS(-DKDE_DEFAULT_DEBUG_AREA=${LIBKDCRAW_AREA_CODE_GENERAL}) -+ADD_DEFINITIONS(${KDE4_ENABLE_EXCEPTIONS}) - - # ================================================================================================== - # Information to update before to release this library. diff --git a/srcpkgs/libkdcraw/template b/srcpkgs/libkdcraw/template deleted file mode 100644 index 58c3a65958..0000000000 --- a/srcpkgs/libkdcraw/template +++ /dev/null @@ -1,24 +0,0 @@ -# Template file for 'libkdcraw' -pkgname=libkdcraw -version=4.14.3 -revision=3 -build_style=cmake -hostmakedepends="automoc4 pkg-config" -makedepends="libressl-devel boost-devel qt-devel phonon-devel kdelibs-devel libraw-devel" -depends="hicolor-icon-theme" -short_desc="A C++ interface used to decode RAW picture" -maintainer="Juan RP " -license="GPL, LGPL, FDL" -homepage="https://projects.kde.org/projects/kde/kdegraphics/libs/libkdcraw" -distfiles="http://download.kde.org/stable/${version}/src/${pkgname}-${version}.tar.xz" -checksum=78c851dba252224bf30012d2f6a79f3c846103b7ce6770d939ac2b8530cf4a4f - -libkdcraw-devel_package() { - short_desc+=" - development files" - depends="${sourcepkg}-${version}_${revision}" - pkg_install() { - vmove usr/include - vmove usr/lib/pkgconfig - vmove "usr/lib/*.so" - } -} diff --git a/srcpkgs/libkexiv2-devel b/srcpkgs/libkexiv2-devel deleted file mode 120000 index 0f64ad83dd..0000000000 --- a/srcpkgs/libkexiv2-devel +++ /dev/null @@ -1 +0,0 @@ -libkexiv2 \ No newline at end of file diff --git a/srcpkgs/libkexiv2/template b/srcpkgs/libkexiv2/template deleted file mode 100644 index 0464757b82..0000000000 --- a/srcpkgs/libkexiv2/template +++ /dev/null @@ -1,23 +0,0 @@ -# Template file for 'libkexiv2' -pkgname=libkexiv2 -version=4.14.3 -revision=3 -build_style=cmake -hostmakedepends="automoc4 pkg-config" -makedepends="qt-devel phonon-devel exiv2-devel kdelibs-devel" -short_desc="A library to manipulate pictures metadata" -maintainer="Juan RP " -license="GPL-2, LGPL-2, FDL" -homepage="https://projects.kde.org/projects/kde/kdegraphics/libs/libkexiv2" -distfiles="http://download.kde.org/stable/${version}/src/${pkgname}-${version}.tar.xz" -checksum=c487078cc7349768dc76f0eabd98e546762fdd3fda9da088fbfa74785daf0efd - -libkexiv2-devel_package() { - short_desc+=" - development files" - depends="${sourcepkg}-${version}_${revision}" - pkg_install() { - vmove usr/include - vmove usr/lib/pkgconfig - vmove usr/lib/*.so - } -} diff --git a/srcpkgs/libkipi-devel b/srcpkgs/libkipi-devel deleted file mode 120000 index a940d6211e..0000000000 --- a/srcpkgs/libkipi-devel +++ /dev/null @@ -1 +0,0 @@ -libkipi \ No newline at end of file diff --git a/srcpkgs/libkipi/template b/srcpkgs/libkipi/template deleted file mode 100644 index e702ac50be..0000000000 --- a/srcpkgs/libkipi/template +++ /dev/null @@ -1,26 +0,0 @@ -# Template file for 'libkipi' -# vim: set ts=4 sw=4 sts=4 et: - -pkgname=libkipi -version=4.14.3 -revision=1 -maintainer="Carlo Dormeletti " -homepage="https://projects.kde.org/projects/kde/kdegraphics/libs/libkipi" -license="GPL-2, LGPL-2" -build_style=cmake -hostmakedepends="automoc4 pkg-config" -makedepends="qt-devel kdelibs-devel phonon-devel" -depends="hicolor-icon-theme" -short_desc="A C++ interface to use kipi-plugins" -distfiles="http://download.kde.org/stable/${version}/src/${pkgname}-${version}.tar.xz" -checksum=dcedbad556840e1ed3b35609a6f700917f76cc0a4f41ca499da4e5c8af49553a - -libkipi-devel_package() { - short_desc+=" - development files" - depends="${sourcepkg}-${version}_${revision}" - pkg_install() { - vmove usr/include - vmove usr/lib/pkgconfig - vmove "usr/lib/*.so" - } -} diff --git a/srcpkgs/lightdm-kde-greeter/patches/findlightdm.patch b/srcpkgs/lightdm-kde-greeter/patches/findlightdm.patch deleted file mode 100644 index b940c613fc..0000000000 --- a/srcpkgs/lightdm-kde-greeter/patches/findlightdm.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- cmake/modules/FindQLightDM.cmake -+++ cmake/modules/FindQLightDM.cmake -@@ -19,10 +19,19 @@ - find_package(PkgConfig) - if(PKG_CONFIG_FOUND) - if (QLIGHTDM_MIN_VERSION) -- PKG_CHECK_MODULES(PC_QLIGHTDM liblightdm-qt-2>=${QLIGHTDM_MIN_VERSION}) -+ PKG_CHECK_MODULES(PC_QLIGHTDM liblightdm-qt-3>=${QLIGHTDM_MIN_VERSION}) - else (QLIGHTDM_MIN_VERSION) -- PKG_CHECK_MODULES(PC_QLIGHTDM liblightdm-qt-2) -+ PKG_CHECK_MODULES(PC_QLIGHTDM liblightdm-qt-3) - endif (QLIGHTDM_MIN_VERSION) -+ SET (QLIGHTDM_API 3) -+ if (NOT PC_QLIGHTDM_FOUND) -+ if (QLIGHTDM_MIN_VERSION) -+ PKG_CHECK_MODULES(PC_QLIGHTDM liblightdm-qt-2>=${QLIGHTDM_MIN_VERSION}) -+ else (QLIGHTDM_MIN_VERSION) -+ PKG_CHECK_MODULES(PC_QLIGHTDM liblightdm-qt-2) -+ endif (QLIGHTDM_MIN_VERSION) -+ SET (QLIGHTDM_API 2) -+ endif (NOT PC_QLIGHTDM_FOUND) - endif(PKG_CONFIG_FOUND) - - -@@ -34,7 +43,7 @@ - ) - - find_library(QLIGHTDM_LIBRARIES -- NAMES lightdm-qt-2 -+ NAMES lightdm-qt-${QLIGHTDM_API} - HINTS - ${PC_QLIGHTDM_LIBDIR} - ${PC_QLIGHTDM_LIBRARY_DIRS} diff --git a/srcpkgs/lightdm-kde-greeter/template b/srcpkgs/lightdm-kde-greeter/template deleted file mode 100644 index 680c50aecb..0000000000 --- a/srcpkgs/lightdm-kde-greeter/template +++ /dev/null @@ -1,26 +0,0 @@ -# Template file for 'lightdm-kde-greeter' -pkgname=lightdm-kde-greeter -version=0.3.2.2 -revision=4 -wrksrc="lightdm-0.3.2.1" -build_style=cmake -hostmakedepends="automoc4 qt-qmake perl pkg-config" -makedepends="kdelibs-devel qt-devel phonon-devel lightdm-devel" -depends="lightdm" -conf_files=" - /etc/lightdm/lightdm-kde-greeter.conf - /etc/dbus-1/system.d/org.kde.kcontrol.kcmlightdm.conf" -short_desc="Light Display Manager greeter for KDE (QT 4.x)" -maintainer="Juan RP " -license="GPL-3, LGPL-3" -homepage="https://projects.kde.org/projects/playground/base/lightdm" -distfiles="http://download.kde.org/unstable/${pkgname%-*}/src/${pkgname%%-*}-${version}.tar.bz2" -checksum=7948ef6a5f6639abd61be02cbdf886823b0d227b4411361737d1a44cca606b09 - -post_install() { - vmkdir usr/bin - mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin - vmkdir etc/lightdm - echo "[greeter]" >> ${DESTDIR}/etc/lightdm/lightdm-kde-greeter.conf - echo "theme-name=classic" >> ${DESTDIR}/etc/lightdm/lightdm-kde-greeter.conf -} diff --git a/srcpkgs/lightdm-kde-greeter/update b/srcpkgs/lightdm-kde-greeter/update deleted file mode 100644 index 403392c416..0000000000 --- a/srcpkgs/lightdm-kde-greeter/update +++ /dev/null @@ -1 +0,0 @@ -pkgname=${pkgname%%-*} diff --git a/srcpkgs/marble-devel b/srcpkgs/marble-devel deleted file mode 120000 index f208786e0b..0000000000 --- a/srcpkgs/marble-devel +++ /dev/null @@ -1 +0,0 @@ -marble \ No newline at end of file diff --git a/srcpkgs/marble/template b/srcpkgs/marble/template deleted file mode 100644 index 432a7fa6cc..0000000000 --- a/srcpkgs/marble/template +++ /dev/null @@ -1,29 +0,0 @@ -# Template file for 'marble' -# vim: set ts=4 sw=4 sts=4 et: -reverts=17.08.3_1 -pkgname=marble -version=4.14.3 -revision=5 -maintainer="Carlo Dormeletti " -homepage="https://marble.kde.org" -license="GPL-3" -short_desc="Virtual globe and world atlas" -build_style=cmake -hostmakedepends="automoc4 pkg-config" -makedepends="libressl-devel qt-devel qt-webkit-devel kdelibs-devel phonon-devel" -replaces="libmarble>=0" -distfiles="http://download.kde.org/stable/${version}/src/marble-${version}.tar.xz" -checksum="4d6667cf67ae9976e4c1efc306be222d13f2ee5927483325411ae0e9631dc0f0" -conflicts="marble5" - -marble-devel_package() { - replaces="libmarble-devel>=0" - short_desc+=" - development files" - depends="${makedepends} ${sourcepkg}>=${version}_${revision}" - conflicts="marble5-devel" - pkg_install() { - vmove usr/include - vmove "usr/lib/*.so" - vmove usr/share/apps/cmake - } -} diff --git a/srcpkgs/polkit-kde/template b/srcpkgs/polkit-kde/template deleted file mode 100644 index 5b0b15628d..0000000000 --- a/srcpkgs/polkit-kde/template +++ /dev/null @@ -1,14 +0,0 @@ -# Template file for 'polkit-kde' -pkgname=polkit-kde -version=0.99.0 -revision=2 -build_style=cmake -hostmakedepends="automoc4" -makedepends="qt-devel phonon-devel polkit-qt-devel kdelibs-devel" -wrksrc="${pkgname}-agent-1-${version}" -short_desc="Daemon providing a polkit authentication UI for KDE" -maintainer="Juan RP " -homepage="https://projects.kde.org/projects/extragear/base/polkit-kde-agent-1" -license="GPL-2" -distfiles="http://download.kde.org/stable/apps/KDE4.x/admin/${pkgname}-agent-1-${version}.tar.bz2" -checksum=e371ff2698431decc825bb146d638de432f5fffd09046e225270c30dbac1b467 diff --git a/srcpkgs/polkit-kde/update b/srcpkgs/polkit-kde/update deleted file mode 100644 index ae8cfb8d0a..0000000000 --- a/srcpkgs/polkit-kde/update +++ /dev/null @@ -1 +0,0 @@ -pkgname="${pkgname}-agent-1"