rpms/kdepim/devel kdepim-4.3.75-build-kalarm.patch, NONE, 1.1 .cvsignore, 1.72, 1.73 kdepim.spec, 1.245, 1.246 sources, 1.78, 1.79

[Ben Boeckel]

Author: mathstuf

Update of /cvs/pkgs/rpms/kdepim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26381

Modified Files:
	.cvsignore kdepim.spec sources 
Added Files:
	kdepim-4.3.75-build-kalarm.patch 
Log Message:
Add patch to build kalarm

kdepim-4.3.75-build-kalarm.patch:
 CMakeLists.txt        |   15 ++++++---------
 kalarm/CMakeLists.txt |   14 +++++++++++---
 2 files changed, 17 insertions(+), 12 deletions(-)

--- NEW FILE kdepim-4.3.75-build-kalarm.patch ---
Index: kalarm/CMakeLists.txt
===================================================================
--- kalarm/CMakeLists.txt	(revision 1050504)
+++ kalarm/CMakeLists.txt	(revision 1050505)
@@ -11,7 +11,13 @@
 ) 
 
 add_subdirectory( cal ) 
-add_subdirectory( akonadi ) 
+
+# Kalarm depend on kdepim/akonadi/ which is impossible for packagers.
+# the Akonadi resource for Kalarm won't be available in KDE 4.4
+if( BUILD_akonadi )
+  add_subdirectory( akonadi )
+endif( BUILD_akonadi )
+
 add_subdirectory( resources ) 
 add_subdirectory( appicons ) 
 add_subdirectory( pixmaps ) 
@@ -106,8 +112,10 @@
 endif (KMAIL_SUPPORTED)
 qt4_add_dbus_interfaces(kalarm_bin_SRCS ${KDE4_DBUS_INTERFACES_DIR}/org.kde.KSpeech.xml)
 
-kcfg_generate_dbus_interface(${CMAKE_CURRENT_SOURCE_DIR}/akonadi/kalarmresource.kcfg org.kde.Akonadi.KAlarm.Settings)
-qt4_add_dbus_interface(kalarm_bin_SRCS ${CMAKE_CURRENT_BINARY_DIR}/org.kde.Akonadi.KAlarm.Settings.xml kalarmresourcesettings KAlarmResourceSettings)
+if( BUILD_akonadi )
+  kcfg_generate_dbus_interface(${CMAKE_CURRENT_SOURCE_DIR}/akonadi/kalarmresource.kcfg org.kde.Akonadi.KAlarm.Settings)
+  qt4_add_dbus_interface(kalarm_bin_SRCS ${CMAKE_CURRENT_BINARY_DIR}/org.kde.Akonadi.KAlarm.Settings.xml kalarmresourcesettings KAlarmResourceSettings)
+endif( BUILD_akonadi )
 
 kde4_add_kcfg_files(kalarm_bin_SRCS GENERATE_MOC kalarmconfig.kcfgc)
 
Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt	(revision 1050504)
+++ CMakeLists.txt	(revision 1050505)
@@ -209,14 +209,19 @@
   macro_optional_add_subdirectory(akregator)
   macro_optional_add_subdirectory(blogilo)
   macro_optional_add_subdirectory(console)
+  macro_optional_add_subdirectory(kalarm)
   macro_optional_add_subdirectory(kjots)
   macro_optional_add_subdirectory(knotes)
   macro_optional_add_subdirectory(strigi-analyzer)
-
+    
   if(EXISTS ${CMAKE_SOURCE_DIR}/akonadi)
     macro_optional_add_subdirectory(akonadi)
   endif(EXISTS ${CMAKE_SOURCE_DIR}/akonadi)
 
+  if (BUILD_akonadi)
+    include_directories(${CMAKE_SOURCE_DIR}/akonadi ${CMAKE_BINARY_DIR}/akonadi)
+  endif (BUILD_akonadi)
+
   macro_optional_add_subdirectory(kaddressbook)
   if(Q_WS_X11)
     macro_optional_add_subdirectory(ktimetracker)
@@ -227,14 +232,6 @@
     macro_optional_add_subdirectory(kpilot)
   endif(NOT WIN32)
 
-  if (BUILD_akonadi)
-    include_directories(${CMAKE_SOURCE_DIR}/akonadi ${CMAKE_BINARY_DIR}/akonadi)
-
-    # Kalarm depend on kdepim/akonadi.
-    # that means these app won't compile for packagers. Disable them for anything else than a svn checkout.
-    macro_optional_add_subdirectory(kalarm)
-  endif (BUILD_akonadi)
-
   macro_optional_add_subdirectory(kontact) # must be the last one.
 
   # These targets depend on optional applications


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/.cvsignore,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- .cvsignore	31 Oct 2009 14:51:41 -0000	1.72
+++ .cvsignore	24 Nov 2009 23:35:00 -0000	1.73
@@ -1 +1 @@
-kdepim-4.3.3.tar.bz2
+kdepim-4.3.75svn1048496.tar.bz2


Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.245
retrieving revision 1.246
diff -u -p -r1.245 -r1.246
--- kdepim.spec	24 Nov 2009 18:06:38 -0000	1.245
+++ kdepim.spec	24 Nov 2009 23:35:00 -0000	1.246
@@ -8,7 +8,7 @@ Name:    kdepim
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
 Version: 4.3.75
-Release: 0.1.%{alphatag}%{?dist}
+Release: 0.2.%{alphatag}%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
@@ -22,6 +22,7 @@ Patch1:  kdepim-4.3.1-kmail-saveAttachme
 # add -fno-var-tracking-assignments for kmail/globalsettings_base.cpp (#538233)
 Patch2:  kdepim-4.3.3-kmail_globalsettings_no_var_tracking.patch 
 Patch3:  kdepim-4.3.75-desktop-fixes.patch
+Patch4:  kdepim-4.3.75-build-kalarm.patch
 
 # upstream patches (4.3 branch):
 
@@ -104,6 +105,7 @@ Requires: %{name} = %{?epoch:%{epoch}:}%
 %patch1 -p0 -b .kmail-saveAttachments
 %patch2 -p1 -b .kmail_globalsettings_no_var_tracking
 %patch3 -p1 -b .desktop-fixes
+%patch4 -p0 -b .build-kalarm
 
 
 %build
@@ -181,6 +183,7 @@ rm -rf %{buildroot}
 %{_kde4_appsdir}/akregator/
 %{_kde4_appsdir}/blogilo/
 %{_kde4_appsdir}/kaddressbook/
+%{_kde4_appsdir}/kalarm/
 %{_kde4_appsdir}/kconf_update/*
 %{_kde4_appsdir}/kdepimwidgets/
 %{_kde4_appsdir}/kjots/
@@ -225,6 +228,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Nov 24 2009 Ben Boeckel <MathStuf at gmail.com> - 4.3.75-0.2.svn1048496
+- Add patch to build kalarm
+
 * Sun Nov 24 2009 Ben Boeckel <MathStuf at gmail.com> - 4.3.75-0.1.svn1048496
 - Update to 4.3.75 snapshot
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/sources,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- sources	31 Oct 2009 14:51:41 -0000	1.78
+++ sources	24 Nov 2009 23:35:00 -0000	1.79
@@ -1 +1 @@
-3a3c01abd6571cc337fa22d1c3601fe7  kdepim-4.3.3.tar.bz2
+4649ffc2be9045d6909e80871d58a786  kdepim-4.3.75svn1048496.tar.bz2