[arch-commits] Commit in kdebase-workspace/kde-unstable (2 files)

[Andrea Scarpino]

    Date: Sunday, December 2, 2012 @ 06:19:23
  Author: andrea
Revision: 172322

KDE 4.10 beta2

Modified:
  kdebase-workspace/kde-unstable/PKGBUILD
Deleted:
  kdebase-workspace/kde-unstable/fix-akonadi-support.patch

---------------------------+
 PKGBUILD                  |   15 +++-------
 fix-akonadi-support.patch |   66 --------------------------------------------
 2 files changed, 5 insertions(+), 76 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-12-02 11:19:20 UTC (rev 172321)
+++ PKGBUILD	2012-12-02 11:19:23 UTC (rev 172322)
@@ -4,8 +4,8 @@
 
 pkgname=kdebase-workspace
 _pkgname=kde-workspace
-pkgver=4.9.80
-pkgrel=2
+pkgver=4.9.90
+pkgrel=1
 pkgdesc="Provides the interface and basic tools for the KDE workspace"
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/kde-workspace'
@@ -27,9 +27,8 @@
 backup=('usr/share/config/kdm/kdmrc')
 source=("http://download.kde.org/unstable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz"
         'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' 'kdm.service' 'kdm.logrotate'
-        'etc-scripts.patch' 'terminate-server.patch' 'kdm-xinitrd.patch'
-        'fix-akonadi-support.patch')
-sha1sums=('6144d8d136b481155d9fcbcb831a5a9b9c58d772'
+        'etc-scripts.patch' 'terminate-server.patch' 'kdm-xinitrd.patch')
+sha1sums=('30ce259ffdad79ccf420574490371e89b9ea190e'
           '5db3a245201bd4a50e65aa2ef583cf5490e4f646'
           '660eae40a707d2711d8d7f32a93214865506b795'
           '6aeecc9e0e221f0515c6bf544f9a3c11cb6961fe'
@@ -38,8 +37,7 @@
           'bbe55f2000217474ce7246f12ee437ceaaf7e9ae'
           'c079ebd157c836ba996190f0d2bcea1a7828d02c'
           'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee'
-          'd509dac592bd8b310df27991b208c95b6d907514'
-          'd11bd82384f4bff1d087a1aa1323cfe0a314e8d4')
+          'd509dac592bd8b310df27991b208c95b6d907514')
 
 build() {
 	cd ${_pkgname}-${pkgver}
@@ -52,9 +50,6 @@
     # KDEBUG#202629
 	patch -p0 -i "${srcdir}"/terminate-server.patch
 
-    # KDEBUG#310553
-    patch -p1 -i "${srcdir}"/fix-akonadi-support.patch
-
     cd ../
 
 	mkdir build

Deleted: fix-akonadi-support.patch
===================================================================
--- fix-akonadi-support.patch	2012-12-02 11:19:20 UTC (rev 172321)
+++ fix-akonadi-support.patch	2012-12-02 11:19:23 UTC (rev 172322)
@@ -1,66 +0,0 @@
-commit 328cfa5e2f9d39906096142af9c7468c066ea802
-Author: Cedric Bellegarde <gnumdk at gmail.com>
-Date:   Fri Nov 23 14:51:51 2012 +0100
-
-    BUG:310553 Fix building akonadi support in plasma data engines
-
-diff --git a/plasma/generic/dataengines/CMakeLists.txt b/plasma/generic/dataengines/CMakeLists.txt
-index 0280482..44bc2d0 100644
---- a/plasma/generic/dataengines/CMakeLists.txt
-+++ b/plasma/generic/dataengines/CMakeLists.txt
-@@ -26,13 +26,13 @@ if (NepomukCore_FOUND AND Soprano_FOUND)
-     add_subdirectory(metadata)
- endif ()
- 
--if(Boost_FOUND AND KDEPIMLIBS_FOUND)
--   if(AKONADI_FOUND)
-+if(Boost_FOUND AND KdepimLibs_FOUND)
-+   if(Akonadi_FOUND)
-       add_subdirectory(akonadi)
--   endif(AKONADI_FOUND)
-+   endif(Akonadi_FOUND)
-    add_subdirectory(calendar)
-    add_subdirectory(rss)
--endif(Boost_FOUND AND KDEPIMLIBS_FOUND)
-+endif(Boost_FOUND AND KdepimLibs_FOUND)
- 
- if(NOT WIN32)
-    add_subdirectory(mouse)
-diff --git a/plasma/generic/dataengines/calendar/CMakeLists.txt b/plasma/generic/dataengines/calendar/CMakeLists.txt
-index e05cbe7..5539f99 100644
---- a/plasma/generic/dataengines/calendar/CMakeLists.txt
-+++ b/plasma/generic/dataengines/calendar/CMakeLists.txt
-@@ -11,7 +11,7 @@ set(calendar_engine_srcs
-     calendarengine.cpp
- )
- 
--if(AKONADI_FOUND)
-+if(Akonadi_FOUND)
-     ADD_DEFINITIONS(-DAKONADI_FOUND)
-     set(calendar_engine_srcs ${calendar_engine_srcs}
-         eventdatacontainer.cpp
-@@ -23,7 +23,7 @@ if(AKONADI_FOUND)
-         akonadi/blockalarmsattribute.cpp
-         akonadi/collectionselection.cpp
-     )
--endif(AKONADI_FOUND)
-+endif(Akonadi_FOUND)
- 
- kde4_add_plugin(plasma_engine_calendar ${calendar_engine_srcs})
- 
-@@ -37,13 +37,13 @@ target_link_libraries(
-     ${KDE4_KCALUTILS_LIBS}
- )
- 
--if(AKONADI_FOUND)
-+if(Akonadi_FOUND)
-     target_link_libraries(
-         plasma_engine_calendar
-         ${KDE4_AKONADI_LIBS}
-         ${KDEPIMLIBS_AKONADI_KCAL_LIBS}
-     )
--endif(AKONADI_FOUND)
-+endif(Akonadi_FOUND)
- 
- install(TARGETS plasma_engine_calendar DESTINATION ${PLUGIN_INSTALL_DIR})
- install(FILES plasma-dataengine-calendar.desktop DESTINATION ${SERVICES_INSTALL_DIR})