Commit 8d33b34c authored by Manuel's avatar Manuel

Deep clean, the goal is remove completelly the fixes and the main patchsets in...

Deep clean, the goal is remove completelly the fixes and the main patchsets in order to have a KDE absolutelly vanilla as much as possible with some little branding
parent be76d2b7
--- startkde.cmake.orig 2009-01-15 14:24:44.000000000 +0100
+++ startkde.cmake 2009-01-15 14:33:08.000000000 +0100
@@ -34,22 +34,6 @@
MALLOC_CHECK_=2
export MALLOC_CHECK_
-# in case we have been started with full pathname spec without being in PATH
-bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
-if [ -n "$bindir" ]; then
- qbindir=`$bindir/kde4-config --qt-binaries`
- if [ -n "$qbindir" ]; then
- case $PATH in
- $qbindir|$qbindir:*|*:$qbindir|*:$qbindir:*) ;;
- *) PATH=$qbindir:$PATH; export PATH;;
- esac
- fi
- case $PATH in
- $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;;
- *) PATH=$bindir:$PATH; export PATH;;
- esac
-fi
-
# Boot sequence:
#
# kdeinit is used to fork off processes which improves memory usage
@@ -206,7 +190,7 @@
# For anything else (that doesn't set env vars, or that needs a window manager),
# better use the Autostart folder.
-libpath=`kde4-config --path lib | tr : '\n'`
+libpath=`kde4-config --path lib | tr : '\n'`'\n/etc/kde/lib/'
for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'`; do
for file in "$prefix"*.sh; do
diff -Naur kdebase-workspace-4.3.80.orig/plasma/desktop/applets/kickoff/ui/brandingbutton.cpp kdebase-workspace-4.3.80/plasma/desktop/applets/kickoff/ui/brandingbutton.cpp
--- kdebase-workspace-4.3.80.orig/plasma/desktop/applets/kickoff/ui/brandingbutton.cpp 2009-09-16 11:40:52.000000000 +0000
+++ kdebase-workspace-4.3.80/plasma/desktop/applets/kickoff/ui/brandingbutton.cpp 2009-12-06 18:23:21.000000000 +0000
@@ -69,7 +69,7 @@
void BrandingButton::openHomepage()
{
//FIXME: 4.3 .. add a brandingConfig to Theme
- KUrl home("http://www.kde.org");
+ KUrl home("http://www.chakra-project.org");
QString themePath = KStandardDirs::locate("data", "desktoptheme/" +
Plasma::Theme::defaultTheme()->themeName() +
"/metadata.desktop");
diff -Naur kdebase-workspace-4.3.90.orig/plasma/desktop/shell/desktopcorona.cpp kdebase-workspace-4.3.90/plasma/desktop/shell/desktopcorona.cpp
--- kdebase-workspace-4.3.90.orig/plasma/desktop/shell/desktopcorona.cpp 2009-10-06 23:37:23.000000000 +0200
+++ kdebase-workspace-4.3.90/plasma/desktop/shell/desktopcorona.cpp 2010-01-17 21:44:01.000000000 +0100
@@ -26,7 +26,7 @@
#include <QTimer>
#include <QMenu>
#include <QSignalMapper>
-
+#include <QFile>
#include <KDebug>
#include <KDialog>
@@ -396,8 +396,8 @@
applet->setGlobalShortcut(KShortcut("Alt+F1"));
}
- loadDefaultApplet("pager", panel);
loadDefaultApplet("tasks", panel);
+
Plasma::Applet *sysTray = loadDefaultApplet("systemtray", panel);
if (sysTray) {
@@ -408,6 +408,25 @@
}
loadDefaultApplet("digital-clock", panel);
+
+ loadDefaultApplet("trash", panel);
+
+ loadDefaultApplet("notifier", panel);
+
+ //if (QFile::exists("/usr/share/kde4/services/plasma-applet-networkmanagement.desktop")) {
+ // loadDefaultApplet("org.kde.networkmanagement", panel);
+ //}
+
+ Plasma::DataEngineManager *engines = Plasma::DataEngineManager::self();
+ Plasma::DataEngine *power = engines->loadEngine("powermanagement");
+ if (power) {
+ const QStringList &batteries = power->query("Battery")["sources"].toStringList();
+ if (!batteries.isEmpty()) {
+ loadDefaultApplet("battery", panel);
+ }
+ }
+ engines->unloadEngine("powermanagement");
+
emit containmentAdded(panel);
QTimer::singleShot(1000, this, SLOT(saveDefaultSetup()));
diff -Naur kdebase-workspace-4.3.90.orig/plasma/generic/applets/systemtray/ui/applet.cpp kdebase-workspace-4.3.90/plasma/generic/applets/systemtray/ui/applet.cpp
--- kdebase-workspace-4.3.90.orig/plasma/generic/applets/systemtray/ui/applet.cpp 2010-01-06 18:00:20.000000000 +0100
+++ kdebase-workspace-4.3.90/plasma/generic/applets/systemtray/ui/applet.cpp 2010-01-17 19:14:42.000000000 +0100
@@ -713,21 +713,22 @@
QStringList applets = s_manager->applets(this);
- if (!applets.contains("notifier")) {
- s_manager->addApplet("notifier", this);
- }
-
- if (!applets.contains("battery")) {
- Plasma::DataEngineManager *engines = Plasma::DataEngineManager::self();
- Plasma::DataEngine *power = engines->loadEngine("powermanagement");
- if (power) {
- const QStringList &batteries = power->query("Battery")["sources"].toStringList();
- if (!batteries.isEmpty()) {
- s_manager->addApplet("battery", this);
- }
- }
- engines->unloadEngine("powermanagement");
- }
+ // oh bloody hack, we dont want them here
+ // if (!applets.contains("notifier")) {
+ // s_manager->addApplet("notifier", this);
+ // }
+ //
+ //if (!applets.contains("battery")) {
+ // Plasma::DataEngineManager *engines = Plasma::DataEngineManager::self();
+ // Plasma::DataEngine *power = engines->loadEngine("powermanagement");
+ // if (power) {
+ // const QStringList &batteries = power->query("Battery")["sources"].toStringList();
+ // if (!batteries.isEmpty()) {
+ // s_manager->addApplet("battery", this);
+ // }
+ // }
+ // engines->unloadEngine("powermanagement");
+ //}
config().writeEntry("DefaultAppletsAdded", true);
configChanged();
--- kdebase-workspace-4.3.3/startkde.cmake.patched 2009-11-03 02:26:54.000000000 +0100
+++ kdebase-workspace-4.3.3/startkde.cmake 2009-11-11 14:45:33.000000000 +0100
@@ -193,8 +193,9 @@
# better use the Autostart folder.
libpath=`kde4-config --path lib | tr : '\n'`'\n/etc/kde/lib/'
+envpath=/etc/kde/env/
-for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'`; do
+for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'` $envpath ; do
for file in "$prefix"*.sh; do
test -r "$file" && . "$file"
done
@@ -407,7 +408,9 @@
echo 'startkde: Running shutdown scripts...' 1>&2
# Run scripts found in $KDEDIRS/shutdown
-for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/shutdown/,p'`; do
+shutdownpath=/etc/kde/shutdown/
+
+for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/shutdown/,p'` $shutdownpath; do
for file in `ls "$prefix" 2> /dev/null | egrep -v '(~|\.bak)$'`; do
test -x "$prefix$file" && "$prefix$file"
done
...@@ -10,11 +10,8 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf ...@@ -10,11 +10,8 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
# Default wallpaper included in kde-workspace pkg # Default wallpaper included in kde-workspace pkg
_default_wp="Ariya" _default_wp="Ariya"
#
# package info
#
pkgname="kde-workspace" pkgname="kde-workspace"
arch=('i686' 'x86_64') arch=('x86_64')
pkgver=${_kdever} pkgver=${_kdever}
pkgrel=1 pkgrel=1
pkgdesc="KDE Workspace" pkgdesc="KDE Workspace"
...@@ -23,7 +20,8 @@ license=('GPL' 'LGPL' 'FDL') ...@@ -23,7 +20,8 @@ license=('GPL' 'LGPL' 'FDL')
options=('docs' '!splithdr' 'splitdbg' 'log') options=('docs' '!splithdr' 'splitdbg' 'log')
install=${pkgname}.install install=${pkgname}.install
depends=('polkit-kde-agent' "kdepimlibs>=${_kdever}" "kde-runtime>=${_kdever}" 'qimageblitz' 'mesa' "kactivities>=${_kdever}" depends=('polkit-kde-agent' "kdepimlibs>=${_kdever}" "kde-runtime>=${_kdever}" 'qimageblitz' 'mesa' "kactivities>=${_kdever}"
'libxxf86misc' 'libxcomposite' 'libxss' 'lm_sensors' 'libxklavier' 'libxft' 'oxygen-icons' 'xkit' 'libxdamage' 'xorg-utils' 'libxrandr' 'libxres' 'libdmtx' 'libqalculate' 'prison' 'qrencode' "kdepim-runtime>=${_kdever}" "kde-base-artwork>=${_kdever}") 'libxxf86misc' 'libxcomposite' 'xcb-util-image' 'xcb-util-renderutil' 'libxss' 'lm_sensors' 'libxklavier' 'libxft' 'oxygen-icons' 'xkit' 'libxdamage'
'xorg-utils' 'libxrandr' 'libxres' 'libdmtx' 'libqalculate' 'prison' 'qrencode' "kdepim-runtime>=${_kdever}" "kde-base-artwork>=${_kdever}")
makedepends=('pkgconfig' 'cmake' 'automoc4' 'networkmanager' 'bluez' "kdebindings-pykde4>=${_kdever}" makedepends=('pkgconfig' 'cmake' 'automoc4' 'networkmanager' 'bluez' "kdebindings-pykde4>=${_kdever}"
'oxygen-icons' 'qedje' "kde-runtime>=${_kdever}" 'gpsd' 'samba' 'oxygen-icons' 'qedje' "kde-runtime>=${_kdever}" 'gpsd' 'samba'
'libraw1394' 'libdmtx' 'docbook-xsl' 'prison' 'qrencode') #google-gadgets-qt 'libraw1394' 'libdmtx' 'docbook-xsl' 'prison' 'qrencode') #google-gadgets-qt
...@@ -38,8 +36,6 @@ replaces=('guidance-power-manager' 'kdebase-workspace' 'kde-workspace-doc') ...@@ -38,8 +36,6 @@ replaces=('guidance-power-manager' 'kdebase-workspace' 'kde-workspace-doc')
conflicts=('kdebase-workspace' 'powerdevil' 'kcm_tablet' 'guidance-power-manager' 'kde-workspace-doc') conflicts=('kdebase-workspace' 'powerdevil' 'kcm_tablet' 'guidance-power-manager' 'kde-workspace-doc')
groups=("kde" "kde-uninstall" "kde-minimal") groups=("kde" "kde-uninstall" "kde-minimal")
backup=('usr/share/config/kdm/kdmrc' backup=('usr/share/config/kdm/kdmrc'
#'etc/pam.d/kde'
#'etc/pam.d/kde-np'
'etc/pam.d/kscreensaver') 'etc/pam.d/kscreensaver')
...@@ -57,22 +53,14 @@ source=($_mirror/${pkgname}-$_kdever.tar.xz ...@@ -57,22 +53,14 @@ source=($_mirror/${pkgname}-$_kdever.tar.xz
# core patches # core patches
01_kdm_zsh_profile.patch 01_kdm_zsh_profile.patch
02_sane_env_and_shutdown_path.patch
03_plasma_menubutton_branding.patch 03_plasma_menubutton_branding.patch
06_kickoff_default_favourites.patch 06_kickoff_default_favourites.patch
07_always_show_kickoff_subtext.patch 07_always_show_kickoff_subtext.patch
09_enable_start-shutdown-scripts.patch
# fixes
# let KDM wait a big longer for X to start up, fixes problems on some gfx hardware that needs a lot of time to initialize
#fix_kdm-increase-xserver-timeout-bnc#462478.patch
# restart xserver on logout # restart xserver on logout
fix_terminate-server.patch fix_terminate-server.patch
# fix kdm default user for greeter
#fix_kdm_configdef.patch
# "fix" some sytemsettings modules that need root access # "fix" some sytemsettings modules that need root access
fix_root-only-kcms.patch fix_root-only-kcms.patch
# shutdown-fix.patch
appmenu.diff) appmenu.diff)
md5sums=(`grep ${pkgname}-$_kdever.tar.xz ../kde-sc.md5 | cut -d" " -f1` md5sums=(`grep ${pkgname}-$_kdever.tar.xz ../kde-sc.md5 | cut -d" " -f1`
...@@ -89,38 +77,27 @@ md5sums=(`grep ${pkgname}-$_kdever.tar.xz ../kde-sc.md5 | cut -d" " -f1` ...@@ -89,38 +77,27 @@ md5sums=(`grep ${pkgname}-$_kdever.tar.xz ../kde-sc.md5 | cut -d" " -f1`
'c4b5f1b342b3dad38642318ca077daee' # kdm.service 'c4b5f1b342b3dad38642318ca077daee' # kdm.service
'721e97031b62aee8914e8617e86f9235' # 01_kdm_zsh_profile.patch '721e97031b62aee8914e8617e86f9235' # 01_kdm_zsh_profile.patch
'e2eb9d270fe0e93901b29256bdedd7e2' # 02_sane_env_and_shutdown_path.patch
'8e623bb5608025417ff9ed061e5a03f1' # 03_plasma_menubutton_branding.patch '8e623bb5608025417ff9ed061e5a03f1' # 03_plasma_menubutton_branding.patch
'd4d7d3fc3ac072a8ca848e9c96e517dc' # 06_kickoff_default_favourites.patch 'd4d7d3fc3ac072a8ca848e9c96e517dc' # 06_kickoff_default_favourites.patch
'89d96455c6a446ef59b0620d1b8606af' # 07_always_show_kickoff_subtext.patch '89d96455c6a446ef59b0620d1b8606af' # 07_always_show_kickoff_subtext.patch
'5eb9285268916492012151045bdebd26' # 09_enable_start-shutdown-scripts.patch
#'db2d8166f5ea80ecd291deb9c0e2bb71' # fix_kdm-increase-xserver-timeout-bnc#462478.patch
'814350c52c135d6f7bdada1e29223d38' # fix_terminate-server.patch '814350c52c135d6f7bdada1e29223d38' # fix_terminate-server.patch
#'97a5eb51e6f9d460f0d61bb322a1db5e' # fix_kdm_configdef.patch
'5f963f80a026f0600edae1b1c70411e5' # fix_root-only-kcms.patch '5f963f80a026f0600edae1b1c70411e5' # fix_root-only-kcms.patch
'ca3877bf428d13eead45756fa94376b5') # appmenu.diff 'ca3877bf428d13eead45756fa94376b5') # appmenu.diff
#
# build function
#
build() { build() {
cd ${srcdir}/${pkgname}-${pkgver} cd ${srcdir}/${pkgname}-${pkgver}
msg "applying main patchset ..." msg "applying main patchset ..."
patch -Np0 -i ${srcdir}/01_kdm_zsh_profile.patch patch -Np0 -i ${srcdir}/01_kdm_zsh_profile.patch
patch -Np0 -i ${srcdir}/02_sane_env_and_shutdown_path.patch
patch -Np1 -i ${srcdir}/03_plasma_menubutton_branding.patch patch -Np1 -i ${srcdir}/03_plasma_menubutton_branding.patch
patch -Np1 -i ${srcdir}/06_kickoff_default_favourites.patch patch -Np1 -i ${srcdir}/06_kickoff_default_favourites.patch
patch -Np1 -i ${srcdir}/07_always_show_kickoff_subtext.patch patch -Np1 -i ${srcdir}/07_always_show_kickoff_subtext.patch
patch -Np1 -i ${srcdir}/09_enable_start-shutdown-scripts.patch
msg "applying fixes ..." msg "applying fixes ..."
#patch -Np0 -i ${srcdir}/fix_kdm-increase-xserver-timeout-bnc#462478.patch
patch -p0 -i ${srcdir}/fix_terminate-server.patch patch -p0 -i ${srcdir}/fix_terminate-server.patch
#patch -p0 -N -i ${srcdir}/fix_kdm_configdef.patch
patch -p1 -i ${srcdir}/fix_root-only-kcms.patch patch -p1 -i ${srcdir}/fix_root-only-kcms.patch
patch -p1 -i ${srcdir}/appmenu.diff #patch -p1 -i ${srcdir}/appmenu.diff
msg "starting workspace build ..." msg "starting workspace build ..."
cmake . -DCMAKE_BUILD_TYPE=${_build_type} \ cmake . -DCMAKE_BUILD_TYPE=${_build_type} \
...@@ -215,19 +192,6 @@ package() { ...@@ -215,19 +192,6 @@ package() {
mkdir -p ${pkgdir}/usr/share/wallpapers mkdir -p ${pkgdir}/usr/share/wallpapers
cp -rv ${srcdir}/kde-wallpapers-${_kdever}/${_default_wp} ${pkgdir}/usr/share/wallpapers cp -rv ${srcdir}/kde-wallpapers-${_kdever}/${_default_wp} ${pkgdir}/usr/share/wallpapers
# include our patches into the package
ls -1 ${startdir}/*.patch &>/dev/null 2>&1
if [ "$?" = "0" ]; then
warning "incuding patches into package"
mkdir -p ${pkgdir}/usr/share/chakra/patches/${pkgname} &>/dev/null
for i in ${startdir}/*.patch; do
msg "$i"
cp $i ${pkgdir}/usr/share/chakra/patches/${pkgname}/ &>/dev/null
done
else
warning "no patches found, skipping to include them into the package..."
fi
# Adding powerdevil option files # Adding powerdevil option files
mkdir -p ${pkgdir}/usr/include/powerdevil mkdir -p ${pkgdir}/usr/include/powerdevil
cp -rv ${srcdir}/${pkgname}-${_kdever}/powerdevil/daemon/powerdevilaction.h ${pkgdir}/usr/include/powerdevil cp -rv ${srcdir}/${pkgname}-${_kdever}/powerdevil/daemon/powerdevilaction.h ${pkgdir}/usr/include/powerdevil
...@@ -236,5 +200,4 @@ package() { ...@@ -236,5 +200,4 @@ package() {
# Systemd .service file # Systemd .service file
install -D -m644 "${srcdir}"/kdm.service "${pkgdir}"/usr/lib/systemd/system/kdm.service install -D -m644 "${srcdir}"/kdm.service "${pkgdir}"/usr/lib/systemd/system/kdm.service
} }
commit 3919480e78c9b8854ce6e17f5ecbfbc009d40fef
Author: Dario Freddi <drf@kde.org>
Date: Fri Jan 20 14:59:37 2012 +0100
The logic for the inhibition checkbox in the plasma applet was inverted: fix that
diff --git a/plasma/generic/applets/battery/battery.cpp b/plasma/generic/applets/battery/battery.cpp
index 63d3673..854469d 100644
--- a/plasma/generic/applets/battery/battery.cpp
+++ b/plasma/generic/applets/battery/battery.cpp
@@ -1066,14 +1066,16 @@ void Battery::toggleInhibit(bool toggle)
{
using namespace Solid::PowerManagement;
- if (m_inhibitCookies.first > 0 && m_inhibitCookies.second > 0 && !toggle) {
+ if (m_inhibitCookies.first > 0 && m_inhibitCookies.second > 0 && toggle) {
// Release inhibition
+ kDebug() << "Releasing inhibition";
stopSuppressingSleep(m_inhibitCookies.first);
stopSuppressingScreenPowerManagement(m_inhibitCookies.second);
m_inhibitCookies = qMakePair< int, int >(-1, -1);
- } else if (m_inhibitCookies.first < 0 && m_inhibitCookies.second < 0 && toggle) {
+ } else if (m_inhibitCookies.first < 0 && m_inhibitCookies.second < 0 && !toggle) {
// Trigger inhibition
+ kDebug() << "Trigger inhibition";
QString reason = i18n("The battery applet has enabled system-wide inhibition");
m_inhibitCookies = qMakePair< int, int >(beginSuppressingSleep(reason),
beginSuppressingScreenPowerManagement(reason));
Subject: Increase the time KDM waits for X to start up
From: Lubos Lunak
Patch-upstream: no
Bug: bnc#462478
See the bugreport. In short, some drivers suck.
--- kdm/config.def.sav 2008-09-29 11:23:22.000000000 +0200
+++ kdm/config.def 2009-01-14 17:23:34.000000000 +0100
@@ -1332,7 +1332,7 @@ Description:
Key: ServerTimeout
Type: int
-Default: 15
+Default: 60
User: core
Instance: #:*/
Comment:
--- kdm/config.def 2010-06-21 17:48:35.530941459 +0200
+++ kdm/config.def 2010-06-21 17:48:55.517603966 +0200
@@ -1033,7 +1033,7 @@
Type: string
Default: ""
User: core
-Instance: "kdm"
+Instance: ""
Update: upd_greeteruid
Comment: &
Description:
kdm.log:
klauncher(2891) kdemain: No DBUS session-bus found. Check if you have started the DBUS server.
kdeinit4: Communication error with launcher. Exiting!
kdmgreet(2881)/kdecore (K*TimeZone*): KSystemTimeZones: ktimezoned initialize() D-Bus call failed: "Not connected to D-Bus server"
The XKEYBOARD keymap compiler (xkbcomp) reports:
> Warning: Type "ONE_LEVEL" has 1 levels, but <RALT> has 2 symbols
> Ignoring extra symbols
Errors from xkbcomp are not fatal to the X server
PKGBUILD:
msg "revert upstream patches ..."
patch -Np1 -R < ${srcdir}/rev_dont_rebase_special_time_0_against_monotonic_clock.patch
patch -Np1 -R < ${srcdir}/rev_rebase_shutdown_times_against_real_time_when_querying_them.patch
patch -Np1 -R < ${srcdir}/rev_fix_shutdown_timeouts_with_monotonic_clock.patch
patch -Np1 -R < ${srcdir}/rev_cleaner_restart_logic_for_crashing_greeter.patch
patch -Np1 -R < ${srcdir}/rev_session.c_update_now.patch
patch -Np1 -R < ${srcdir}/rev_be_posix-compliant_about_monotonic_clock_detection.patch
patch -Np1 -R < ${srcdir}/rev_monotonic_clock.patch
Patches to revert:
http://chakra-project.org/sources/kde-workspace/rev_dont_rebase_special_time_0_against_monotonic_clock.patch
http://chakra-project.org/sources/kde-workspace/rev_rebase_shutdown_times_against_real_time_when_querying_them.patch
http://chakra-project.org/sources/kde-workspace/rev_fix_shutdown_timeouts_with_monotonic_clock.patch
http://chakra-project.org/sources/kde-workspace/rev_cleaner_restart_logic_for_crashing_greeter.patch
http://chakra-project.org/sources/kde-workspace/rev_session.c_update_now.patch
http://chakra-project.org/sources/kde-workspace/rev_be_posix-compliant_about_monotonic_clock_detection.patch
http://chakra-project.org/sources/kde-workspace/rev_monotonic_clock.patch
Build log:
-> Found rev_dont_rebase_special_time_0_against_monotonic_clock.patch
-> Found rev_rebase_shutdown_times_against_real_time_when_querying_them.patch
-> Found rev_fix_shutdown_timeouts_with_monotonic_clock.patch
-> Found rev_cleaner_restart_logic_for_crashing_greeter.patch
-> Found rev_session.c_update_now.patch
-> Found rev_be_posix-compliant_about_monotonic_clock_detection.patch
-> Found rev_monotonic_clock.patch
==> Validating source files with md5sums...
rev_dont_rebase_special_time_0_against_monotonic_clock.patch ... Passed
rev_rebase_shutdown_times_against_real_time_when_querying_them.patch ... Passed
rev_fix_shutdown_timeouts_with_monotonic_clock.patch ... Passed
rev_cleaner_restart_logic_for_crashing_greeter.patch ... Passed
rev_session.c_update_now.patch ... Passed
rev_be_posix-compliant_about_monotonic_clock_detection.patch ... Passed
rev_monotonic_clock.patch ... Passed
==> revert upstream patches ...
patching file kdm/backend/ctrl.c
Hunk #1 succeeded at 650 (offset 1 line).
Hunk #2 succeeded at 666 (offset 1 line).
patching file kdm/backend/ctrl.c
patching file kdm/backend/ctrl.c
patching file kdm/backend/greet.h
patching file kdm/backend/session.c
patching file kdm/kfrontend/kgapp.cpp
patching file kdm/kfrontend/kgapp.h
patching file kdm/backend/session.c
patching file kdm/backend/dm.c
patching file kdm/backend/dm.h
patching file kdm/backend/CMakeLists.txt
patching file kdm/backend/dm.c
patching file kdm/backend/dm.h
patching file kdm/backend/session.c
...@@ -12,7 +12,7 @@ pkgver=${_kdever} ...@@ -12,7 +12,7 @@ pkgver=${_kdever}
pkgrel=1 pkgrel=1
pkgdesc="Kioslave for accessing audio CDs" pkgdesc="Kioslave for accessing audio CDs"
url='https://projects.kde.org/projects/kde/kdemultimedia/audiocd-kio' url='https://projects.kde.org/projects/kde/kdemultimedia/audiocd-kio'
arch=('i686' 'x86_64') arch=('x86_64')
license=('GPL' 'LGPL' 'FDL') license=('GPL' 'LGPL' 'FDL')
depends=("libkcddb>=${_kdever}" "libkcompactdisc>=${_kdever}" 'lame') depends=("libkcddb>=${_kdever}" "libkcompactdisc>=${_kdever}" 'lame')
makedepends=('cmake' 'automoc4') makedepends=('cmake' 'automoc4')
......
...@@ -13,7 +13,7 @@ pkgrel=1 ...@@ -13,7 +13,7 @@ pkgrel=1
pkgdesc="A multimedia player where the focus is on simplicity, instead of pkgdesc="A multimedia player where the focus is on simplicity, instead of
features" features"
url='http://kde.org/applications/multimedia/dragonplayer/' url='http://kde.org/applications/multimedia/dragonplayer/'
arch=('i686' 'x86_64') arch=('x86_64')
license=('GPL' 'LGPL' 'FDL') license=('GPL' 'LGPL' 'FDL')
depends=("kde-runtime>=${_kdever}") depends=("kde-runtime>=${_kdever}")
makedepends=('cmake' 'automoc4') makedepends=('cmake' 'automoc4')
......
...@@ -37,3 +37,4 @@ package() { ...@@ -37,3 +37,4 @@ package() {
make DESTDIR=${pkgdir} install || return 1 make DESTDIR=${pkgdir} install || return 1
} }
# #
# KDE SC Packages for Chakra, part of chakra-project.org # KDE SC Packages for Chakra, part of chakra-project.org
# #
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org> # maintainer: Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
# include global config # include global config
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
...@@ -12,7 +12,7 @@ pkgver=${_kdever} ...@@ -12,7 +12,7 @@ pkgver=${_kdever}
pkgrel=1 pkgrel=1
pkgdesc="KDE volume control program" pkgdesc="KDE volume control program"
url='http://kde.org/applications/multimedia/kmix/' url='http://kde.org/applications/multimedia/kmix/'
arch=('i686' 'x86_64') arch=('x86_64')
license=('GPL' 'LGPL' 'FDL') license=('GPL' 'LGPL' 'FDL')
depends=("kde-runtime>=${_kdever}" 'libcanberra') depends=("kde-runtime>=${_kdever}" 'libcanberra')
makedepends=('cmake' 'automoc4') makedepends=('cmake' 'automoc4')
......
# #
# KDE SC Packages for Chakra, part of chakra-project.org # KDE SC Packages for Chakra, part of chakra-project.org
# #
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org> # maintainer: Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
# include global config # include global config
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
...@@ -12,7 +12,7 @@ pkgver=${_kdever} ...@@ -12,7 +12,7 @@ pkgver=${_kdever}
pkgrel=1 pkgrel=1
pkgdesc="KDE CD player" pkgdesc="KDE CD player"
url='http://kde.org/applications/multimedia/kscd/' url='http://kde.org/applications/multimedia/kscd/'
arch=('i686' 'x86_64') arch=('x86_64')
license=('GPL' 'LGPL' 'FDL') license=('GPL' 'LGPL' 'FDL')
depends=("kde-runtime>=${_kdever}" "libkcddb>=${_kdever}" "libkcompactdisc>=${_kdever}" 'libmusicbrainz3') depends=("kde-runtime>=${_kdever}" "libkcddb>=${_kdever}" "libkcompactdisc>=${_kdever}" 'libmusicbrainz3')
makedepends=('cmake' 'automoc4') makedepends=('cmake' 'automoc4')
......
...@@ -8,7 +8,7 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf ...@@ -8,7 +8,7 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname="kdemultimedia-thumbnailers" pkgname="kdemultimedia-thumbnailers"
pkgdesc='KDE Thumbnailers for several formats' pkgdesc='KDE Thumbnailers for several formats'
arch=('i686' 'x86_64') arch=('x86_64')
pkgver=${_kdever} pkgver=${_kdever}
pkgrel=1 pkgrel=1
depends=('mplayer' 'ffmpeg' 'kdelibs') depends=('mplayer' 'ffmpeg' 'kdelibs')
......
# #
# KDE SC Packages for Chakra, part of chakra-project.org # KDE SC Packages for Chakra, part of chakra-project.org
# #
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org> # maintainer: Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
# include global config # include global config
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
...@@ -11,7 +11,7 @@ pkgver=${_kdever} ...@@ -11,7 +11,7 @@ pkgver=${_kdever}
pkgrel=1 pkgrel=1
pkgdesc="KDE CDDB library" pkgdesc="KDE CDDB library"
url='https://projects.kde.org/projects/kde/kdemultimedia/libkcddb' url='https://projects.kde.org/projects/kde/kdemultimedia/libkcddb'
arch=('i686' 'x86_64') arch=('x86_64')
license=('GPL' 'LGPL' 'FDL') license=('GPL' 'LGPL' 'FDL')
depends=("kdelibs>=${_kdever}" "libmusicbrainz5") depends=("kdelibs>=${_kdever}" "libmusicbrainz5")
makedepends=('cmake' 'automoc4') makedepends=('cmake' 'automoc4')
......
# #
# KDE SC Packages for Chakra, part of chakra-project.org # KDE SC Packages for Chakra, part of chakra-project.org
# #
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org> # maintainer: Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
# include global config # include global config
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
...@@ -11,7 +11,7 @@ pkgver=${_kdever} ...@@ -11,7 +11,7 @@ pkgver=${_kdever}
pkgrel=1 pkgrel=1
pkgdesc="A library for interfacing with CDs" pkgdesc="A library for interfacing with CDs"
url='https://projects.kde.org/projects/kde/kdemultimedia/libkcompactdisc' url='https://projects.kde.org/projects/kde/kdemultimedia/libkcompactdisc'
arch=('i686' 'x86_64') arch=('x86_64')
license=('GPL' 'LGPL' 'FDL') license=('GPL' 'LGPL' 'FDL')
depends=("kdelibs>=${_kdever}") depends=("kdelibs>=${_kdever}")
makedepends=('cmake' 'automoc4') makedepends=('cmake' 'automoc4')
......
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