Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Sukneet Basuta (223544c5a8300404287384647f68a8d25e01bd5b)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Sukneet Basuta <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Sukneet Basuta (223544c5a8300404287384647f68a8d25e01bd5b)
  • Date: Mon, 30 Jul 2012 17:41:57 -0500

GIT changes to master grimoire by Sukneet Basuta <sukneet AT sourcemage.org>:

kde4/HISTORY | 1 +
kde4/KDE_DEPENDS | 6 ------
kde4/kdepim4/DEPENDS | 27 +++++++++++++++------------
kde4/kdepim4/DETAILS | 4 ++--
kde4/kdepim4/HISTORY | 9 +++++++++
kde4/kdepim4/PRE_BUILD | 4 ++++
kde4/kdepim4/kdepim-4.8.4-boost-1.48.patch | 11 +++++++++++
kde4/kdepimlibs4/DEPENDS | 10 +++++++++-
kde4/kdepimlibs4/DETAILS | 4 ++--
kde4/kdepimlibs4/HISTORY | 5 +++++
10 files changed, 58 insertions(+), 23 deletions(-)

New commits:
commit 223544c5a8300404287384647f68a8d25e01bd5b
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

kdepim4: => 4.8.4
* DEPENDS: added depends akonadi, zlib, strigi, libxslt.
Changed optional_depends gpgme, libassuan to depends.
Removed optional_depends qca2, libmal, gnokii.
Added optional_depends grantlee, dblatex
* PRE_BUILD: added, to apply boost patch
* kdepim-4.8.4-boost-1.48.patch: added, fixes compilation with boost >=
1.48

commit d77298634e78f9befeca0baa04b7a95549a9e4ac
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

kdepimlibs4: => 4.8.4
* DEPENDS: added depends boost, gpgme, shared-mime-info,
shared-desktop-ontologies, soprano, libxsl

Moved kdepimlibs case from KDE_DEPENDS and added them to the spell. I
don't see a reason to put individual spell depends in KDE_DEPENDS.

diff --git a/kde4/HISTORY b/kde4/HISTORY
index 1adb665..e9ea6ff 100644
--- a/kde4/HISTORY
+++ b/kde4/HISTORY
@@ -2,6 +2,7 @@
* FUNCTIONS, ../kde4*/FUNCTIONS: added prepare_cmake_flags to
default_build, to allow
passing cmake flags.
Added to default_build rather than each individual BUILD since all
kde spells use cmake.
+ * KDE_DEPENDS: removed kdepimlib4 case and added its dependencies to
the SPELL

2010-05-20 Tommy Boatman <tboatman AT sourcemage.org>
* KDE_DEPENDS: kdebindings4 depends on attica
diff --git a/kde4/KDE_DEPENDS b/kde4/KDE_DEPENDS
index 604e0d2..69e0ea7 100755
--- a/kde4/KDE_DEPENDS
+++ b/kde4/KDE_DEPENDS
@@ -24,12 +24,6 @@ case $SPELL in
depends giflib
;;

- kdepimlibs4) depends kdelibs4 &&
- depends gpgme &&
- depends libgpg-error &&
- depends boost
- ;;
-
kdebase4-runtime)
depends kdelibs4 &&
depends phonon
diff --git a/kde4/kdepim4/DEPENDS b/kde4/kdepim4/DEPENDS
index 8c4c220..b1536e3 100755
--- a/kde4/kdepim4/DEPENDS
+++ b/kde4/kdepim4/DEPENDS
@@ -1,13 +1,16 @@
-source $SECTION_DIRECTORY/KDE_DEPENDS &&
-depends kdepimlibs4 &&
-depends -sub GRAPH boost &&
-depends kdepim4-runtime &&
-depends shared-desktop-ontologies &&
-depends soprano &&
-optional_depends qca2 '' '' 'crypto support' &&
-optional_depends gpgme '' '' 'encrypted signatures' &&
-optional_depends libassuan '' '' 'for kleopatra' &&
-optional_depends libmal '' '' 'Avantgo support' &&
-optional_depends gnokii '' '' 'Nokia support' &&
-optional_depends libxscrnsaver '' '' 'screensaver support for ktimetracker'
+source $SECTION_DIRECTORY/KDE_DEPENDS &&
+depends kdepimlibs4 &&
+depends -sub GRAPH boost &&
+depends kdepim4-runtime &&
+depends akonadi &&
+depends zlib &&
+depends strigi &&
+depends shared-desktop-ontologies &&
+depends soprano &&
+depends libxslt &&
+depends gpgme &&
+depends libassuan &&

+optional_depends grantlee '' '' 'for templating and theming for kJots
and KaddressBook' &&
+optional_depends libxscrnsaver '' '' 'for screensaver support for
ktimetracker' &&
+optional_depends dblatex '' '' 'to generate Kontact-Touch license
information'
diff --git a/kde4/kdepim4/DETAILS b/kde4/kdepim4/DETAILS
index 5a80d01..7ff6c4d 100755
--- a/kde4/kdepim4/DETAILS
+++ b/kde4/kdepim4/DETAILS
@@ -1,7 +1,7 @@
SPELL=kdepim4
SPELLX=${SPELL//4}
- VERSION=4.8.3
-
SOURCE_HASH=sha512:2ce8924a669c1520df97412b3358a520363e1107ca6b0de029ed59e09bb4410a16204e8a18ab6617800100758741abe15e549a0dab50f26507e59732c9d6ca4c
+ VERSION=4.8.4
+
SOURCE_HASH=sha512:b202befe64c731faf851e7fdd7c578511393f4604e117f180b29b77cf2716a264c1084a0348425609d38340ba1319c81fe1480bc82411e02adc5a167262c4759
SOURCE=$SPELLX-$VERSION.tar.xz
SOURCE_URL[0]=$KDE_URL/stable/$VERSION/src/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
diff --git a/kde4/kdepim4/HISTORY b/kde4/kdepim4/HISTORY
index 39d5ba7..80c5417 100644
--- a/kde4/kdepim4/HISTORY
+++ b/kde4/kdepim4/HISTORY
@@ -1,3 +1,12 @@
+2012-07-30 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DETAILS: updated spell to 4.8.4
+ * DEPENDS: added depends akonadi, zlib, strigi, libxslt.
+ Changed optional_depends gpgme, libassuan to depends.
+ Removed optional_depends qca2, libmal, gnokii.
+ Added optional_depends grantlee, dblatex
+ * PRE_BUILD: added, to apply boost patch
+ * kdepim-4.8.4-boost-1.48.patch: added, fixes compilation with boost
>= 1.48
+
2012-05-10 Julien "_kaze_" ROZO <julien AT rozo.org>
* DETAILS: updated version to 4.8.3, switched SOURCE from bz2 to xz

diff --git a/kde4/kdepim4/PRE_BUILD b/kde4/kdepim4/PRE_BUILD
new file mode 100755
index 0000000..8e94aff
--- /dev/null
+++ b/kde4/kdepim4/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+patch -p1 < $SPELL_DIRECTORY/kdepim-4.8.4-boost-1.48.patch
diff --git a/kde4/kdepim4/kdepim-4.8.4-boost-1.48.patch
b/kde4/kdepim4/kdepim-4.8.4-boost-1.48.patch
new file mode 100644
index 0000000..7060e81
--- /dev/null
+++ b/kde4/kdepim4/kdepim-4.8.4-boost-1.48.patch
@@ -0,0 +1,11 @@
+--- kdepim-4.9.0/kleopatra/CMakeLists.txt~ 2012-07-30 08:06:15.031181647
+0000
++++ kdepim-4.9.0/kleopatra/CMakeLists.txt 2012-07-30 08:07:13.594082584
+0000
+@@ -365,7 +365,7 @@
+ endif(KDEPIM_MOBILE_UI)
+
+ add_definitions ( -DKDE_DEFAULT_DEBUG_AREA=5151 )
+-
++add_definitions ( -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED )
+
+ kde4_add_app_icon(_kleopatra_mainwindow_SRCS "hi*-app-kleopatra.png")
+ kde4_add_executable(kleopatra_bin ${_kleopatra_SRCS}
${_kleopatra_mainwindow_SRCS} ${_kleopatra_uiserver_SRCS}
${_kleopatra_libkdepim_SRCS} )
diff --git a/kde4/kdepimlibs4/DEPENDS b/kde4/kdepimlibs4/DEPENDS
index b3ce3b8..8f1229a 100755
--- a/kde4/kdepimlibs4/DEPENDS
+++ b/kde4/kdepimlibs4/DEPENDS
@@ -1,5 +1,13 @@
source $SECTION_DIRECTORY/KDE_DEPENDS &&
+depends kdelibs4 &&
+depends -sub GRAPH boost &&
+depends gpgme &&
depends akonadi &&
depends libical &&
depends LIBSASL &&
-optional_depends openldap '' '' 'LDAP functionality'
+depends shared-mime-info &&
+depends shared-desktop-ontologies &&
+depends soprano &&
+depends libxslt &&
+
+optional_depends openldap '' '' 'for LDAP functionality'
diff --git a/kde4/kdepimlibs4/DETAILS b/kde4/kdepimlibs4/DETAILS
index 8b66fb7..4d17e85 100755
--- a/kde4/kdepimlibs4/DETAILS
+++ b/kde4/kdepimlibs4/DETAILS
@@ -1,7 +1,7 @@
SPELL=kdepimlibs4
SPELLX=${SPELL//4}
- VERSION=4.8.3
-
SOURCE_HASH=sha512:86b50bb34fe5c1a8c0836ea3aa08979d4d3c11af59b99d6915eeb9074a14b377bda8956a86a8b58c09c8acf263dbd096ff6b935dd713ae856eaddc6fa3f3304b
+ VERSION=4.8.4
+
SOURCE_HASH=sha512:f0883dceb4cd6079a9ef4083e318f4dd615124e5d0492444d7806ac5c2ec798d9eb26dc18dc496505f3ccd5c3018963048c8be4f8533d75a1f524aa908c81fc6
SOURCE=$SPELLX-$VERSION.tar.xz
SOURCE_URL[0]=$KDE_URL/stable/$VERSION/src/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
diff --git a/kde4/kdepimlibs4/HISTORY b/kde4/kdepimlibs4/HISTORY
index 6fde23d..bc5b9a4 100644
--- a/kde4/kdepimlibs4/HISTORY
+++ b/kde4/kdepimlibs4/HISTORY
@@ -1,3 +1,8 @@
+2012-07-30 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DETAILS: updated spell to 4.8.4
+ * DEPENDS: added depends boost, gpgme, shared-mime-info,
+ shared-desktop-ontologies, soprano, libxsl.
+
2012-05-07 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 4.8.3, bz2 -> xz




  • [SM-Commit] GIT changes to master grimoire by Sukneet Basuta (223544c5a8300404287384647f68a8d25e01bd5b), Sukneet Basuta, 07/30/2012

Archive powered by MHonArc 2.6.24.

Top of Page