4.4.5 try1

This commit is contained in:
amnon 2010-06-27 15:29:22 +00:00
parent 405313637b
commit 565bc9f228
22 changed files with 57 additions and 91 deletions

View File

@ -3,7 +3,7 @@
#
post_install() {
echo " "
echo " > KDE Software Compilation 4.4.4"
echo " > KDE Software Compilation 4.4.5"
echo " > packaged by the Chakra Project"
echo " "
echo " Installation Prefix : /usr"

View File

@ -44,7 +44,7 @@ options=('docs')
makedepends=('pkgconfig' 'cmake' 'automoc4' "kdebase-runtime>=${_kdever}" "kdelibs>=${_kdever}" "speech-dispatcher>=0.6.7")
source=($_mirror/${_origname}-$_kdever.tar.bz2)
md5sums=('bdb0442ed0762b1dd3cde82335225251') # kdeaccessibility-4.4.4.tar.bz2
md5sums=('c8034d8475185faad52556ab61c55c56') # kdeaccessibility-4.4.5.tar.bz2

View File

@ -44,7 +44,7 @@ source=($_mirror/${_origname}-$_kdever.tar.bz2
fix-syslog-path.patch
fix-when-accessing-the-KCM.patch)
md5sums=('26a1033026e300b70b297af61f5e1e1c' # kdeadmin-4.4.4.tar.bz2
md5sums=('695dfc8c22b34fa9914a8e6bec7ccafc' # kdeadmin-4.4.5.tar.bz2
'41b71823c7a33975ec08aaf75d67a374' # fix-syslog-path.patch
'3d79416bd7ac5a04f3ceae5529279c50') # fix-when-accessing-the-KCM.patch

View File

@ -23,7 +23,7 @@ pkgname=('kdebase-runtime'
arch=('i686' 'x86_64')
pkgver=${_kdever}
pkgrel=2
pkgrel=1
pkgdesc="split package"
url="http://www.kde.org"
@ -45,7 +45,7 @@ source=($_mirror/${_origname}-$_kdever.tar.bz2
03_disable_logout_sound.patch
04_disable_nepomuk_popups.patch)
md5sums=('60cc64c36942e3e761493ddfbe2bba7e' # kdebase-runtime-4.4.4.tar.bz2
md5sums=('6f2bfc771ff5143b89f5a5709d4cca69' # kdebase-runtime-4.4.5.tar.bz2
'68cd8eb57db22c2f2ed554b721253bc2' # branding.svgz
'45fa12b8baf21c4fc845147afcea2bc1' # 01_knetattach_use_sftp.patch
'1f0225f31d5f44e753e966fd3a032f00' # 02_oxygenify_knetattach_icon.patch

View File

@ -49,13 +49,14 @@ diff -Naur kdebase-workspace-4.3.90.orig/plasma/desktop/shell/desktopcorona.cpp
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
@@ -744,20 +744,21 @@
void Applet::addDefaultApplets()
{
@@ -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");
@ -67,21 +68,22 @@ diff -Naur kdebase-workspace-4.3.90.orig/plasma/generic/applets/systemtray/ui/ap
- }
- 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");
+// }
}
+ // 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");
+ //}
NotificationWidget *Applet::addNotification(Notification *notification)
config().writeEntry("DefaultAppletsAdded", true);
configChanged();

View File

@ -6,7 +6,7 @@ diff -Naur kdebase-workspace-4.3.80.orig/plasma/desktop/applets/kickoff/core/fav
{
QList<QString> applications;
- applications << "konqbrowser" << "kmail" << "systemsettings" << "dolphin";
+ applications << "dolphin" << "konqbrowser" << "kopete" << "KMail" << "systemsettings" << "shaman" << "konsole";
+ applications << "dolphin" << "konqbrowser" << "kate" << "kopete" << "KMail" << "systemsettings" << "pkgmanager" << "konsole" << "k3b";
QList<QString> desktopFiles;

View File

@ -40,7 +40,7 @@ depends=('polkit-kde' "kdepimlibs>=${_kdever}" "kdepim-runtime>=${_kdever}" "kde
'libxdamage' 'xorg-utils' 'libxrandr')
makedepends=('pkgconfig' 'cmake' 'automoc4' 'networkmanager' 'bluez' "kdebindings-python>=${_kdever}"
"kdebindings-ruby>=${_kdever}" 'google-gadgets-qt>=0.11.1' 'oxygen-icons')
"kdebindings-ruby>=${_kdever}" 'oxygen-icons' 'qedje') # 'gpsd' 'google-gadgets-qt>=0.11.1'
source=($_mirror/${_origname}-$_kdever.tar.bz2
mishaaq-kcm_touchpad-00370b5.tar.gz
@ -69,10 +69,6 @@ source=($_mirror/${_origname}-$_kdever.tar.bz2
# restart xserver on logout
fix_terminate-server.patch
# http://cvs.fedoraproject.org/viewvc//rpms/kdebase-workspace/devel/
# kdebindings-python is only a runtime dependency
fix_pykde4-only-runtime-dep.patch
# if kdm is not loaded, try to shutdown via consolekit
fix_ck-shutdown.patch
@ -99,7 +95,7 @@ source=($_mirror/${_origname}-$_kdever.tar.bz2
screensaver-sleep.patch)
md5sums=('6ab7328b83caab34b802d7135290f983' # kdebase-workspace-4.4.4.tar.bz2
md5sums=('c2fba3b92ae82aa120ac159a3333db28' # kdebase-workspace-4.4.5.tar.bz2
'f355a658d2e9267fdf4e8d8f88038bcf' # mishaaq-kcm_touchpad-00370b5.tar.gz
'd4570491bcf9986d84aeb77c939090a9' # 114856-kcm_tablet-1.1.3.tar.gz
'b60baabccbd302d00923e053db0dc0ae' # 117639-favorites-0.1.tar.bz2
@ -114,14 +110,13 @@ md5sums=('6ab7328b83caab34b802d7135290f983' # kdebase-workspace-4.4.4.tar.bz2
'e2eb9d270fe0e93901b29256bdedd7e2' # 02_sane_env_and_shutdown_path.patch
'df2e8fe56d5e7912ccd89232ee098da1' # 03_plasma_menubutton_branding.patch
'522a294c09d88d3d722de3f39fd203c3' # 04_plasma_kickoff_url.patch
'192c0b3da6b4334bc3e7b7a3a34dc9db' # 05_plasma_desktop_defaults.patch
'5e57f92a9b0f5359678a3b5bb7c57184' # 06_kickoff_default_favourites.patch
'0aba9287f038d66afbf545c83a46fd19' # 05_plasma_desktop_defaults.patch
'0ee6e12bb9830b4248becb0442dc7e0c' # 06_kickoff_default_favourites.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
'6febdfac9efb15b8f2c14aa3084b6efc' # fix_pykde4-only-runtime-dep.patch
'5d752cf39a28306438bb6d82db6e1696' # fix_ck-shutdown.patch
'58eefd448d84fa2c612e27c457c5df9f' # fix_root-only-kcms.patch
@ -165,7 +160,6 @@ build()
msg "applying fixes ..."
patch -Np0 -i ${srcdir}/fix_kdm-increase-xserver-timeout-bnc#462478.patch || return 1
patch -Np0 -i ${srcdir}/fix_terminate-server.patch || return 1
patch -Np1 -i ${srcdir}/fix_pykde4-only-runtime-dep.patch || return 1
patch -Np1 -i ${srcdir}/fix_ck-shutdown.patch || return 1
patch -Np1 -i ${srcdir}/fix_root-only-kcms.patch || return 1
@ -231,6 +225,7 @@ package_kdebase-workspace()
{
pkgdesc="KDE Workspace"
# FIXME don't find google-gadgets and gpsd can't be build cos of liblesstif
# NOTE keep in sync with depends
depends=('polkit-kde' "kdepimlibs>=${_kdever}" "kdepim-runtime>=${_kdever}" "kdebase-runtime>=${_kdever}" 'qimageblitz'
'libxxf86misc' 'libxcomposite' 'libxss' 'lm_sensors' 'libxklavier' 'libxft' 'oxygen-icons' "xkit"
@ -238,15 +233,15 @@ package_kdebase-workspace()
optdepends=("kdebindings-python : Python Support for Plasma"
"kdeedu-marble : Marble Wallpaper Plugin"
"google-gadgets-qt : Plasma Support for Google Gadgets"
#"google-gadgets-qt : Plasma Support for Google Gadgets"
"qedje : Plasma Support for Edje Files"
"gpsd : Plasma geolocation support"
#"gpsd : Plasma geolocation support"
"(open)ntp : Time/Date sync support")
provides=("${_origname}=${_kdever}" "powerdevil" 'powerdevil' 'policykit-kde' 'policykit-kde' 'kcm_tablet=1.1.3')
replaces=('policykit-kde' 'policykit-kde' 'kdebase-workspace-devel' 'guidance-power-manager' 'policykit-kde')
provides=("${_origname}=${_kdever}" "powerdevil" 'powerdevil' 'kcm_tablet=1.1.3')
replaces=('kdebase-workspace-devel' 'guidance-power-manager')
conflicts=("kdemod-${_origname}" "powerdevil" 'powerdevil' "kde-meta-${_origname}" 'kcm_tablet' 'guidance-power-manager' 'policykit-kde')
conflicts=("kdemod-${_origname}" "powerdevil" 'powerdevil' "kde-meta-${_origname}" 'kcm_tablet' 'guidance-power-manager')
groups=("kde" "kde-complete" "kde-uninstall" "kde-minimal")
backup=('usr/share/config/kdm/kdmrc'

View File

@ -1,15 +0,0 @@
diff -up kdebase-workspace-4.2.0/CMakeLists.txt.orig kdebase-workspace-4.2.0/CMakeLists.txt
--- kdebase-workspace-4.2.0/CMakeLists.txt.orig 2009-02-18 15:47:51.000000000 +0100
+++ kdebase-workspace-4.2.0/CMakeLists.txt 2009-02-18 15:50:34.000000000 +0100
@@ -59,9 +59,9 @@ endif(PYQT4_FOUND AND PYQT4_VERSION STRL
macro_optional_find_package(PyKDE4)
set(PythonSupport_FOUND FALSE)
-if(PYTHONLIBRARY_FOUND AND SIP_FOUND AND PYQT4_FOUND AND PYKDE4_FOUND)
+if(PYTHONLIBRARY_FOUND)
set(PythonSupport_FOUND TRUE)
-endif(PYTHONLIBRARY_FOUND AND SIP_FOUND AND PYQT4_FOUND AND PYKDE4_FOUND)
+endif(PYTHONLIBRARY_FOUND)
macro_log_feature(PythonSupport_FOUND "Python" "KDE Python support" "http://techbase.kde.org/Development/Languages/Python" FALSE "" "Needed to build plasma scriptengine for Python")
#### End Python support ####

View File

@ -27,7 +27,7 @@ pkgname=('kdebase'
arch=('i686' 'x86_64')
pkgver=${_kdever}
pkgrel=2
pkgrel=1
pkgdesc="split package"
url="http://www.kde.org"
@ -45,7 +45,7 @@ source=($_mirror/${_origname}-$_kdever.tar.bz2
04_konq_scan_nsplugins_at_startup.patch)
# feature_user-image-from-webcam.patch)
md5sums=('3e759b5ba2dbc350560c3a4316bfec71' # kdebase-4.4.4.tar.bz2
md5sums=('93fa095ba7bee61a995f1ef6c60a1e32' # kdebase-4.4.5.tar.bz2
'f98c26deff86b32a26e0238896d49382' # 99752-kde_cdemu-0.3.tar.gz
'12d902dd5d090b146676231c5163bc4f' # 01_dolphin_add_toolbar_buttons.patch
'92a47ed820a541b34dd220e1da5649b7' # 02_dolphin_properties.patch

View File

@ -43,7 +43,7 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' "kdelibs>=${_kdever}" 'pyqt' "kdepim
'ruby' 'mono' "kdegraphics-okular>=${_kdever}" "kdegraphics-common>=${_kdever}")
source=($_mirror/${_origname}-$_kdever.tar.bz2)
md5sums=('7fed573eeca601538554c943b4f400bc') # kdebindings-4.4.4.tar.bz2
md5sums=('57a56607069d1f80164015c641e127e5') # kdebindings-4.4.5.tar.bz2
#

View File

@ -52,11 +52,11 @@ license=('GPL' 'LGPL' 'FDL')
options=('docs' '!splithdr')
makedepends=('pkgconfig' 'cmake' 'automoc4' 'ocaml' 'facile' 'eigen' 'cfitsio' "kdelibs>=${_kdever}"
"kdebase-runtime>=${_kdever}" 'openbabel' 'libqalculate' 'gsl' 'boost' 'indilib' 'r'
'libspectre' 'python')
"kdebase-runtime>=${_kdever}" 'openbabel' 'libqalculate' 'gsl' 'boost' 'indilib' 'r>=2.11.1'
'libspectre' 'python' 'xplanet')
source=($_mirror/${_origname}-$_kdever.tar.bz2)
md5sums=('e511d63282f2ee9ff46a0bbb7e95b9ba') # kdeedu-4.4.4.tar.bz2
md5sums=('9f6849939e47266650567778470d73c8') # kdeedu-4.4.5.tar.bz2
#
@ -150,7 +150,7 @@ package_kdeedu-blinken()
package_kdeedu-cantor()
{
pkgdesc="Cantor is a KDE Application aimed to provide a nice Interface for doing Mathematics and Scientific Computing."
depends=("${_origname}-common>=${_kdever}" 'r')
depends=("${_origname}-common>=${_kdever}" 'r>=2.11.1')
conflicts=("kdemod-${_origname}-cantor")
groups=("kde-complete" "kdeedu" "kde-uninstall")
install=${_origname}.install

View File

@ -72,7 +72,7 @@ options=('docs' '!splithdr')
makedepends=('pkgconfig' 'cmake' 'automoc4' "kdelibs>=${_kdever}" "kdebase-runtime>=${_kdever}" 'qca' 'ggz-client-libs' 'gnugo')
source=("$_mirror/${_origname}-$_kdever.tar.bz2")
md5sums=('7dd7057b6d4102f2b444263e63e672fa') # kdegames-4.4.4.tar.bz2
md5sums=('720bac51311730cfb36c6082bf85ec60') # kdegames-4.4.5.tar.bz2

View File

@ -30,7 +30,7 @@ pkgname=('kdegraphics-common'
arch=('i686' 'x86_64')
pkgver=${_kdever}
pkgrel=3
pkgrel=1
pkgdesc="split package"
url="http://www.kde.org"
@ -43,11 +43,9 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' "kdelibs>=${_kdever}" "kdebase-runti
'qimageblitz' 'ebook-tools' 'libxxf86vm')
source=("$_mirror/${_origname}-$_kdever.tar.bz2"
"fix-libjpeg8-compatibility.patch"
"update-libkexiv2-libkipi-libdcraw.patch")
md5sums=('4555d85bb1e302d085d14d2c4ad01323' # kdegraphics-4.4.4.tar.bz2
'492dc2dfe799ff81d55fcb488faf2860' # fix-libjpeg8-compatibility.patch
md5sums=('e3a1bad9e37b82bd62be00797714f38d' # kdegraphics-4.4.5.tar.bz2
'd34f1ac582c1f48023d7e2ec3cf11e2b') # update-libkexiv2-libkipi-libdcraw.patch
@ -61,7 +59,6 @@ build()
msg "apply patches ..."
# Fixed in 4.5
cd ${srcdir}/${pkgbase}-${pkgver}
patch -Np1 -i ${srcdir}/fix-libjpeg8-compatibility.patch || return 1
patch -Np1 -i ${srcdir}/update-libkexiv2-libkipi-libdcraw.patch || return 1
msg "starting build ..."

View File

@ -1,13 +0,0 @@
--- kdegraphics-4.4.3/gwenview/lib/jpegcontent.cpp~ 2010-05-05 00:34:00.190335453 +0200
+++ kdegraphics-4.4.3/gwenview/lib/jpegcontent.cpp 2010-05-05 00:35:32.947818779 +0200
@@ -455,9 +455,8 @@
// Init transformation
jpeg_transform_info transformoption;
+ memset(&transformoption, 0, sizeof(jpeg_transform_info));
transformoption.transform = findJxform(d->mTransformMatrix);
- transformoption.force_grayscale = false;
- transformoption.trim = false;
jtransform_request_workspace(&srcinfo, &transformoption);
/* Read source file as DCT coefficients */

View File

@ -48,7 +48,7 @@ source=($_mirror/${_origname}-$_kdever.tar.bz2
sprocket-medium.png
sprocket-small.png)
md5sums=('2e7275b769090461c72ce4c5583374be' # kdemultimedia-4.4.4.tar.bz2
md5sums=('00511c7efe14c7d0e89e2728f29201ef' # kdemultimedia-4.4.5.tar.bz2
'edf694939f4b5d5e97c3fe2f91e7cec3' # kde-odf-thumbnail-1.0.0.tar.gz
'5e3022ddcf3876e07d4b9870e1806b48' # 107128-GimpResourcesThumbnailer-2.1.0.tar.gz
'07c3039ddf5e88ba0ab290570f43749d' # 114885-AudioThumbs-0.1.tar.gz

View File

@ -28,7 +28,7 @@ pkgname=('kdenetwork-common'
arch=('i686' 'x86_64')
pkgver=${_kdever}
pkgrel=2
pkgrel=1
pkgdesc="split package"
url="http://www.kde.org"
@ -46,7 +46,7 @@ source=($_mirror/${_origname}-$_kdever.tar.bz2 \
'lisa.daemon'
"gcc45.patch")
md5sums=('42619dc65cf8b8a6e483dff23a4a5127' # kdenetwork-4.4.4.tar.bz2
md5sums=('597e8c8259a625088defbaed322119f6' # kdenetwork-4.4.5.tar.bz2
'66069c83fd5fa0df5d743d4486799033' # lisa.daemon
'8d509b4a541704606f9688bcd4e38a61') # gcc45.patch

View File

@ -51,7 +51,7 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' "kdebase-runtime>=${_kdever}
"kdepimlibs>=${_kdever}" 'subversion' "kdepim-runtime>=${_kdever}" "kdebindings-python>=${_kdever}")
source=($_mirror/${_origname}-$_kdever.tar.bz2)
md5sums=('fecf6bd1dd1664147543fd65cda532e6') # kdesdk-4.4.4.tar.bz2
md5sums=('20453e07a3c5c60bcb0bb46a14f9fb18') # kdesdk-4.4.5.tar.bz2

View File

@ -38,7 +38,7 @@ options=('docs')
makedepends=('pkgconfig' 'cmake' 'automoc4' "kdebase-workspace>=${_kdever}")
source=($_mirror/${_origname}-$_kdever.tar.bz2)
md5sums=('08c4127cdb8f08888764989e627d210b') # kdetoys-4.4.4.tar.bz2
md5sums=('298f1781f26041b8692d8b7e356519df') # kdetoys-4.4.5.tar.bz2
#

View File

@ -51,7 +51,7 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' "kdelibs>=${_kdever}"
"kdepim-runtime>=${_kdever}" 'p7zip' 'zip' 'unzip' 'unrar')
source=($_mirror/${_origname}-$_kdever.tar.bz2)
md5sums=('f09331f3a3b1afcf489726cc9f31a186') # kdeutils-4.4.4.tar.bz2
md5sums=('3c8cf4cc05eb9f5ee065de8f472e0390') # kdeutils-4.4.5.tar.bz2
#

View File

@ -36,7 +36,7 @@ makedepends=('pkgconfig' 'cmake' 'automoc4')
source=($_mirror/${_origname}-$_kdever.tar.bz2
http://chakra-project.org/source/icons/oxygencolors-addon.tar.gz)
md5sums=('fb5aeee6517a1fd834cfd32a16d91780' # oxygen-icons-4.4.4.tar.bz2
md5sums=('297f43a4ea74be738ad61a5651cdf34d' # oxygen-icons-4.4.5.tar.bz2
'da971d7e2c862a6f77fb310a289f5529') # ../_sources/oxygencolors-addon.tar.gz

View File

@ -15,7 +15,7 @@ _origname=qedje
pkgname=${_origname}
pkgver=20100207
pkgver=20100627
pkgrel=1
pkgdesc="Enlightenment Edje bindings for the Qt toolkit."

View File

@ -15,7 +15,7 @@ _origname=qzion
pkgname=${_origname}
pkgver=20100520
pkgver=20100627
pkgrel=1
pkgdesc="A canvas abstraction used by and made for QEdje."