mirror of
https://gitdl.cn/https://github.com/chakralinux/desktop.git
synced 2025-02-03 11:37:15 +08:00
kdeplasma-applets-daisy rebuild with fix for KDE 4.8
This commit is contained in:
parent
739e43d575
commit
bdc715ae1b
@ -1,5 +1,5 @@
|
||||
#
|
||||
# KDEPlasma Packages for Chakra, part of chakra-project.org
|
||||
# Apps Packages for Chakra, part of chakra-project.org
|
||||
#
|
||||
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
|
||||
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
|
||||
@ -9,28 +9,33 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
|
||||
|
||||
pkgname=kdeplasma-applets-daisy
|
||||
pkgver=0.0.4.25
|
||||
pkgrel=2
|
||||
pkgrel=4
|
||||
pkgdesc="A simple application launcher for Plasma."
|
||||
arch=('i686' 'x86_64')
|
||||
url="http://lechio.freehostia.com/daisy.html"
|
||||
license=('GPL')
|
||||
depends=('kdebase-workspace')
|
||||
depends=('kde-workspace')
|
||||
makedepends=('gcc' 'cmake' 'automoc4')
|
||||
conflicts=('kde-extragear-plasmoids')
|
||||
replaces=('plasma-daisy-plasmoid')
|
||||
install=daisy.install
|
||||
source=(""http://cdlszm.org/downloads/plasma-applet-daisy-$pkgver.tar.gz"")
|
||||
md5sums=('269fd526453a16066cb704352505f7e9')
|
||||
source=("http://cdlszm.org/downloads/plasma-applet-daisy-$pkgver.tar.gz"
|
||||
'patch.diff')
|
||||
md5sums=('269fd526453a16066cb704352505f7e9'
|
||||
'0a36cfe275cb2c981c26e8e467d0fd57')
|
||||
|
||||
build() {
|
||||
cd $srcdir/plasma-applet-daisy-${pkgver}
|
||||
|
||||
# Fix compile errors, introduced with GCC 4.5
|
||||
#patch -p1 < $srcdir/daisy-compile-fix.patch
|
||||
#Patch to make daisy work with KDE>=4.8
|
||||
patch -Np1 -i "${srcdir}/patch.diff"
|
||||
|
||||
mkdir build && cd build
|
||||
cmake -DCMAKE_INSTALL_PREFIX=/usr .. || return 1
|
||||
make || return 1
|
||||
make DESTDIR="$pkgdir/" install || return 1
|
||||
cmake -DCMAKE_INSTALL_PREFIX=/usr ..
|
||||
make
|
||||
}
|
||||
|
||||
package() {
|
||||
cd $srcdir/plasma-applet-daisy-${pkgver}/build
|
||||
make DESTDIR="$pkgdir/" install
|
||||
}
|
||||
|
||||
|
@ -1,21 +0,0 @@
|
||||
diff -ur plasma-applet-daisy-0.0.4.22.orig//applet/src/daisy.cpp plasma-applet-daisy-0.0.4.22/applet/src/daisy.cpp
|
||||
--- plasma-applet-daisy-0.0.4.22.orig//applet/src/daisy.cpp 2009-12-21 02:18:08.000000000 +0100
|
||||
+++ plasma-applet-daisy-0.0.4.22/applet/src/daisy.cpp 2010-04-30 12:50:20.947897658 +0200
|
||||
@@ -870,7 +870,7 @@
|
||||
if (m_task)
|
||||
{
|
||||
TaskManager::BasicMenu *taskMenu;TaskManager::TaskItem *taskitem;
|
||||
- taskitem = new TaskManager::TaskItem::TaskItem(this, m_task);
|
||||
+ taskitem = new TaskManager::TaskItem(this, m_task);
|
||||
taskMenu = new TaskManager::BasicMenu( qobject_cast<QWidget*>(this), taskitem, m_groupManager );
|
||||
taskMenu->popup( event->screenPos() );
|
||||
}
|
||||
@@ -896,7 +896,7 @@
|
||||
{
|
||||
QList<QAction*> actionList;actionList << m_act_newinstance << m_act_editlauncher;
|
||||
TaskManager::BasicMenu *taskMenu;TaskManager::TaskItem *taskitem;
|
||||
- taskitem = new TaskManager::TaskItem::TaskItem(this, m_task);
|
||||
+ taskitem = new TaskManager::TaskItem(this, m_task);
|
||||
taskMenu = new TaskManager::BasicMenu( qobject_cast<QWidget*>(this), taskitem, m_groupManager, actionList );
|
||||
taskMenu->popup( event->screenPos() );
|
||||
}
|
1739
kdeplasma-applets-daisy/patch.diff
Normal file
1739
kdeplasma-applets-daisy/patch.diff
Normal file
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user