Commit f46d8ab8 authored by AlmAck's avatar AlmAck
Browse files

removed kdelibs from core, keep the one in desktop

parent d681d62e
diff -Naur kdelibs-4.3.85.orig/kdeui/dialogs/kaboutapplicationdialog.cpp kdelibs-4.3.85/kdeui/dialogs/kaboutapplicationdialog.cpp
--- kdelibs-4.3.85.orig/kdeui/dialogs/kaboutapplicationdialog.cpp 2009-12-02 22:28:47.000000000 +0100
+++ kdelibs-4.3.85/kdeui/dialogs/kaboutapplicationdialog.cpp 2009-12-19 16:26:05.000000000 +0100
@@ -108,7 +108,7 @@
aboutData->programName(), aboutData->version()));
else
titleWidget->setText(i18nc("Program name, version and KDE platform version; do not translate 'Development Platform'",
- "<html><font size=\"5\">%1</font><br /><b>Version %2</b><br />Using KDE Development Platform %3</html>",
+ "<html><font size=\"5\">%1</font><br /><b>Version %2</b><br />Using KDE Development Platform %3 optimized by The Chakra Project</html>",
aboutData->programName(), aboutData->version(), QString(KDE_VERSION_STRING)));
QTabWidget *tabWidget = new QTabWidget;
diff -Naur kdelibs-4.3.85.orig/kdeui/dialogs/kaboutkdedialog_p.cpp kdelibs-4.3.85/kdeui/dialogs/kaboutkdedialog_p.cpp
--- kdelibs-4.3.85.orig/kdeui/dialogs/kaboutkdedialog_p.cpp 2009-11-12 22:50:55.000000000 +0100
+++ kdelibs-4.3.85/kdeui/dialogs/kaboutkdedialog_p.cpp 2009-12-19 16:27:11.000000000 +0100
@@ -43,7 +43,7 @@
setButtons(KDialog::Close);
KTitleWidget *titleWidget = new KTitleWidget(this);
- titleWidget->setText(i18n("<html><font size=\"5\">KDE - Be Free!</font><br /><b>Platform Version %1</b></html>",
+ titleWidget->setText(i18n("<html><font size=\"5\">KDE - Be Free!</font><br /><b>Platform Version %1 optimized by The Chakra Project</b></html>",
QString(KDE_VERSION_STRING)));
titleWidget->setPixmap(KIcon("kde").pixmap(48), KTitleWidget::ImageLeft);
Index: b/kded/kbuildsycoca.cpp
===================================================================
--- a/kded/kbuildsycoca.cpp
+++ b/kded/kbuildsycoca.cpp
@@ -307,7 +307,7 @@
connect(g_vfolder, SIGNAL(newService(const QString &, KService::Ptr *)),
this, SLOT(slotCreateEntry(const QString &, KService::Ptr *)));
- 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);
Index: b/kded/CMakeLists.txt
===================================================================
--- a/kded/CMakeLists.txt
+++ b/kded/CMakeLists.txt
@@ -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 )
diff -Naur kdelibs-4.3.98.orig/kded/applications.menu kdelibs-4.3.98/kded/applications.menu
--- kdelibs-4.3.98.orig/kded/applications.menu 2010-01-31 20:28:11.000000000 +0100
+++ kdelibs-4.3.98/kded/applications.menu 2010-02-01 14:30:58.000000000 +0100
@@ -373,6 +373,13 @@
</Include>
</Menu>
<Menu>
+ <Name>Chakra</Name>
+ <Directory>Chakra.directory</Directory>
+ <Include>
+ <Category>Chakra</Category>
+ </Include>
+ </Menu>
+ <Menu>
<Name>System</Name>
<Directory>kde-system.directory</Directory>
<Include>
\ No newline at end of file
diff -Naur kdelibs-4.9.1-orig/kded/applications.menu kdelibs-4.9.1/kded/applications.menu
--- kdelibs-4.9.1-orig/kded/applications.menu 2012-08-13 10:39:49.000000000 +0200
+++ kdelibs-4.9.1/kded/applications.menu 2012-09-29 17:50:31.554171400 +0200
@@ -437,5 +437,6 @@
</And>
</Include>
<DefaultMergeDirs/>
+ <MergeDir>applications-merged</MergeDir>
<MergeFile>applications-kmenuedit.menu</MergeFile>
</Menu>
pkgname="kdelibs"
arch=('x86_64')
pkgver=4.14.29
pkgrel=1
pkgdesc="KDE Core Libraries"
url="http://www.kde.org"
license=('GPL' 'LGPL' 'FDL')
options=('!docs' 'debug')
depends=('qt=4.8.7' 'shared-mime-info' 'upower' 'udisks2' 'xz' 'enchant' 'jasper' 'openexr' 'giflib' 'strigi' 'libxtst'
'ca-certificates' 'xdg-utils' 'qca' 'polkit-qt4' 'libxss' 'phonon' 'shared-desktop-ontologies'
'attica>=0.4.2' 'krb5' 'libxcursor' 'libutempter' 'hicolor-icon-theme' 'libdbusmenu-qt' 'grantlee'
'media-player-info' 'qtwebkit' 'systemd' 'pcre')
makedepends=('pkg-config' 'cmake' 'automoc4' 'intltool' 'avahi' 'libgl' 'aspell' 'hspell' 'shared-mime-info'
'docbook-xsl' 'docbook-xml' 'bzip2>=1.0.6' 'libzip' 'libpulse')
optdepends=('phonon-gstreamer: GStreamer Phonon backend (default)'
'phonon-xine: Xine Phonon backend'
'phonon-mplayer: MPlayer Phonon backend'
'phonon-vlc: VLC Phonon backend'
'avahi: Service discovery on your local network'
'aspell: Spell checking'
'hspell: Hebrew spell checking')
groups=("kde" "kde-minimal" "kde-uninstall")
install=${pkgname}.install
source=(http://download.kde.org/stable/applications/16.12.2/src/${pkgname}-${pkgver}.tar.xz
01_chakra_tag.patch
02_kde_applications_menu.patch
03_chakra_menu.patch
MergeDir.patch)
sha256sums=('1b538ddecaf818ae69b3de8ee11324bf92f4da5b3943f728cb0afdcd34037c77'
'029e2d07c5fc8676d143b903aa181fc470e5b469d49ccf107e19031f562bf4e3'
'b2d25c76081ea6bb31d90c4c6b619ce64ac36de3a6eefb2f9990d3dbf8cd9c91'
'505e9e5e969be5094b3f713b865d5927cc3de1f4693915174732b20793228c4f'
'd7d2fac1ceb1551081a5f3fa860c14d4aeb0c774d56067e931c20b8d79c4450f')
prepare() {
# main patches
msg "Applying patches..."
cd ${srcdir}/${pkgname}-${pkgver}
patch -Np1 -i ${srcdir}/01_chakra_tag.patch
patch -Np1 -i ${srcdir}/02_kde_applications_menu.patch
patch -Np1 -i ${srcdir}/03_chakra_menu.patch
# right positioning of applications' entries in kmenu
patch -p1 -i ${srcdir}/MergeDir.patch
cd ${srcdir}
rm -rf build
mkdir -p build
}
build() {
cd build
cmake ../${pkgname}-${pkgver} \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_INSTALL_PREFIX=/usr \
-DSYSCONF_INSTALL_DIR=/etc \
-DHTML_INSTALL_DIR=/usr/share/doc/kde/html \
-DLOCALE_INSTALL_DIR=/usr/share/locale/kde4 \
-DKDE_DISTRIBUTION_TEXT='Chakra' \
-DKDE_DEFAULT_HOME='.kde4' \
-DWITH_FAM=OFF \
-DWITH_HUpnp=OFF \
-DCMAKE_SKIP_RPATH=ON \
-DWITH_SOLID_UDISKS2=ON \
-DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--no-undefined -Wl,--as-needed'
make
}
package() {
cd ${srcdir}/build
make DESTDIR=${pkgdir} install
# link cert bundle 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
# remove wastes of KDE SC, which does nothing on Plamsa
rm -rf ${pkgdir}/etc/xdg/menus
}
From: Martin T. H. Sandsmark <martin.sandsmark@kde.org>
Date: Mon, 21 Jul 2014 20:52:40 +0000
Subject: Use dbus system bus name instead of PID for authentication.
X-Git-Url: http://quickgit.kde.org/?p=kdelibs.git&a=commitdiff&h=e4e7b53b71e2659adaf52691d4accc3594203b23
---
Use dbus system bus name instead of PID for authentication.
Using the PID for authentication is prone to a PID reuse
race condition, and a security issue.
REVIEW: 119323
---
--- a/kdecore/auth/backends/polkit-1/Polkit1Backend.cpp
+++ b/kdecore/auth/backends/polkit-1/Polkit1Backend.cpp
@@ -144,7 +144,7 @@
Action::AuthStatus Polkit1Backend::actionStatus(const QString &action)
{
- PolkitQt1::UnixProcessSubject subject(QCoreApplication::applicationPid());
+ PolkitQt1::SystemBusNameSubject subject(QString::fromUtf8(callerID()));
PolkitQt1::Authority::Result r = PolkitQt1::Authority::instance()->checkAuthorizationSync(action, subject,
PolkitQt1::Authority::None);
switch (r) {
@@ -160,21 +160,12 @@
QByteArray Polkit1Backend::callerID() const
{
- QByteArray a;
- QDataStream s(&a, QIODevice::WriteOnly);
- s << QCoreApplication::applicationPid();
-
- return a;
+ return QDBusConnection::systemBus().baseService().toUtf8();
}
bool Polkit1Backend::isCallerAuthorized(const QString &action, QByteArray callerID)
{
- QDataStream s(&callerID, QIODevice::ReadOnly);
- qint64 pid;
-
- s >> pid;
-
- PolkitQt1::UnixProcessSubject subject(pid);
+ PolkitQt1::SystemBusNameSubject subject(QString::fromUtf8(callerID));
PolkitQt1::Authority *authority = PolkitQt1::Authority::instance();
PolkitResultEventLoop e;
post_install() {
echo " "
echo " > ATTENTION:"
echo " Install aspell and the appropriate language package"
echo " to enable spell-checking in KDE ..."
echo " "
echo " If you experience problems with missing icons or menu"
echo " entries, run the following commands and restart KDE:"
echo " sudo chakra-config-updater"
echo " kbuildsycoca4"
echo " "
if [ -e "/etc/chakra/updates.conf" ] ; then
. /etc/chakra/updates.conf
/usr/bin/chakra-update-mime
if [ "$UPDATE_XDG_ICON_DB" = "yes" ]; then
/usr/bin/chakra-update-icons
fi
if [ "$UPDATE_GLOBAL_CONFIG" = "yes" ]; then
/usr/bin/chakra-update-sycoca
fi
if [ "$UPDATE_USER_CONFIG" = "yes" ]; then
/usr/bin/chakra-update-user-sycoca
fi
else
echo " > WARNING"
echo " The package chakra-common seems not to be installed,"
echo " this can possibly break the installation. Just install it"
echo " manually after this installation/update, run the following"
echo " commands and restart KDE afterwards:"
echo " sudo chakra-config-updater"
echo " kbuildsycoca4"
echo " "
fi
}
post_upgrade() {
if [ -e "/etc/chakra/updates.conf" ] ; then
. /etc/chakra/updates.conf
/usr/bin/chakra-update-mime
if [ "$UPDATE_XDG_ICON_DB" = "yes" ]; then
/usr/bin/chakra-update-icons
fi
if [ "$UPDATE_GLOBAL_CONFIG" = "yes" ]; then
/usr/bin/chakra-update-sycoca
fi
if [ "$UPDATE_USER_CONFIG" = "yes" ]; then
/usr/bin/chakra-update-user-sycoca
fi
else
echo " > WARNING"
echo " The package chakra-common seems not to be installed,"
echo " this can possibly break the installation. Just install it"
echo " manually after this installation/update, run the following"
echo " commands and restart KDE afterwards:"
echo " sudo chakra-config-updater"
echo " kbuildsycoca4"
echo " "
fi
}
post_remove() {
if [ -e "/etc/chakra/updates.conf" ] ; then
. /etc/chakra/updates.conf
/usr/bin/chakra-update-mime
if [ "$UPDATE_XDG_ICON_DB" = "yes" ]; then
/usr/bin/chakra-update-icons
fi
else
echo " > WARNING"
echo " The package chakra-common seems not to be installed,"
echo " this can possibly break the installation. Just install it"
echo " manually after this installation/update, run the following"
echo " commands and restart KDE afterwards:"
echo " sudo chakra-config-updater"
echo " kbuildsycoca4"
echo " "
fi
}
op=$1
shift
$op $*
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment