remove remaining kde4 packages
This commit is contained in:
parent
02d25b52bd
commit
f470938c21
|
@ -1 +0,0 @@
|
|||
kdelibs
|
|
@ -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<const KArchiveFile*> fileList;
|
||||
QMap<qint64, QString> fileToDir;
|
||||
@@ -809,10 +810,19 @@
|
||||
QStack<QString> 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();
|
|
@ -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<QTimer*>();
|
||||
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<QTimer*>();
|
||||
timer->stop();
|
||||
|
||||
- if (BackendsManager::authBackend()->isCallerAuthorized(action, callerID)) {
|
||||
+ if (isCallerAuthorized(action, callerID)) {
|
||||
retVal = static_cast<uint>(Action::Authorized);
|
||||
} else {
|
||||
retVal = static_cast<uint>(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 <QDBusContext>
|
||||
#include <QVariant>
|
||||
#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);
|
||||
|
|
@ -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__
|
|
@ -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 <sys/stat.h>
|
||||
#include <solid/ifaces/block.h>
|
||||
#include "udisksdeviceinterface.h"
|
||||
|
||||
--- kdecore/io/kdirwatch_p.h
|
||||
+++ kdecore/io/kdirwatch_p.h
|
||||
@@ -65,6 +65,7 @@
|
||||
|
||||
#include <sys/time.h>
|
||||
#include <sys/param.h> // ino_t
|
||||
+#include <sys/stat.h>
|
||||
#include <ctime>
|
|
@ -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)
|
|
@ -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 <stdint.h>
|
||||
+typedef uint16_t char16_t;
|
||||
+#endif
|
||||
+
|
||||
#include <libxml/parser.h>
|
||||
#include <QtCore/QString>
|
||||
#include <QtCore/QVector>
|
|
@ -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()) {
|
||||
|
|
@ -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);
|
|
@ -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
|
||||
}
|
||||
}
|
||||
|
|
@ -1,55 +0,0 @@
|
|||
# Template file for 'kdelibs'
|
||||
pkgname=kdelibs
|
||||
version=4.14.3
|
||||
revision=10
|
||||
short_desc="KDE core libraries"
|
||||
maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
||||
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
|
||||
}
|
||||
}
|
|
@ -1 +0,0 @@
|
|||
kdevplatform
|
|
@ -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 )
|
|
@ -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 <pierre.bourgin@free.fr>"
|
||||
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"
|
||||
}
|
||||
}
|
|
@ -1 +0,0 @@
|
|||
libkdcraw
|
|
@ -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.
|
|
@ -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 <xtraeme@voidlinux.eu>"
|
||||
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"
|
||||
}
|
||||
}
|
|
@ -1 +0,0 @@
|
|||
libkexiv2
|
|
@ -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 <xtraeme@voidlinux.eu>"
|
||||
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
|
||||
}
|
||||
}
|
|
@ -1 +0,0 @@
|
|||
libkipi
|
|
@ -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 <carloDOTdormelettiATaliceDOTit>"
|
||||
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"
|
||||
}
|
||||
}
|
|
@ -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}
|
|
@ -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 <xtraeme@voidlinux.eu>"
|
||||
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
|
||||
}
|
|
@ -1 +0,0 @@
|
|||
pkgname=${pkgname%%-*}
|
|
@ -1 +0,0 @@
|
|||
marble
|
|
@ -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 <carlo.dormeletti@alice.it>"
|
||||
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
|
||||
}
|
||||
}
|
|
@ -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 <xtraeme@voidlinux.eu>"
|
||||
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
|
|
@ -1 +0,0 @@
|
|||
pkgname="${pkgname}-agent-1"
|
Loading…
Reference in New Issue