Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (5c583327107ac5a106d9cc1f71155414db180f50)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (5c583327107ac5a106d9cc1f71155414db180f50)
  • Date: Wed, 21 Apr 2010 01:49:17 -0500

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

kde-core/kdepim/HISTORY | 5 +++++
kde-core/kdepim/PRE_BUILD | 3 ++-
kde-core/kdepim/gcc44.patch | 25 +++++++++++++++++++++++++
3 files changed, 32 insertions(+), 1 deletion(-)

New commits:
commit 5c583327107ac5a106d9cc1f71155414db180f50
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

kdepim: Fix compilation with GCC 4.4 (Bug #15253)

From
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/~checkout~/packages/kdepim/kdepim-3.5.10-gcc_4.4-2.patch?rev=1.3;content-type=text/plain

diff --git a/kde-core/kdepim/HISTORY b/kde-core/kdepim/HISTORY
index 8ca1cdb..1a2649e 100644
--- a/kde-core/kdepim/HISTORY
+++ b/kde-core/kdepim/HISTORY
@@ -1,3 +1,8 @@
+2010-04-20 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Apply gcc44.patch (Bug #15253)
+ * gcc44.patch: Fix compilation with GCC 4.4
+ From
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/~checkout~/packages/kdepim/kdepim-3.5.10-gcc_4.4-2.patch?rev=1.3;content-type=text/plain
+
2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
* DEPENDS: updated mysql dependency to MYSQL provider

diff --git a/kde-core/kdepim/PRE_BUILD b/kde-core/kdepim/PRE_BUILD
index b371357..2abcf28 100755
--- a/kde-core/kdepim/PRE_BUILD
+++ b/kde-core/kdepim/PRE_BUILD
@@ -1,3 +1,4 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
-patch -Np1 < "$SCRIPT_DIRECTORY/inotify.patch"
+patch -Np1 < "$SCRIPT_DIRECTORY/inotify.patch" &&
+patch -Np1 < "$SCRIPT_DIRECTORY/gcc44.patch"
diff --git a/kde-core/kdepim/gcc44.patch b/kde-core/kdepim/gcc44.patch
new file mode 100644
index 0000000..7fbc6ea
--- /dev/null
+++ b/kde-core/kdepim/gcc44.patch
@@ -0,0 +1,25 @@
+# From
http://www.mail-archive.com/pld-cvs-commit AT lists.pld-linux.org/msg210073.html
+Submitted By: Michael (rabenkind at selfservix dot org)
+Date: 2009-07-15
+Initial Package Version: 3.5.10
+Origin: http://forum.kde.org.pl/viewtopic.php?id=2981
+Upstream Status: Unknown
+Description: Fix compilation with gcc-4.4
+
+--- kdepim-3.5.10/indexlib/memvector.tcc~ 2008-02-13 11:39:38.000000000
+0200
++++ kdepim-3.5.10/indexlib/memvector.tcc 2010-02-15 16:23:19.290375795
+0200
+@@ -30,10 +30,11 @@
+ void memvector<T>::resize( size_type n_s ) {
+ if ( size() >= n_s ) return;
+
+- data_->resize( n_s * byte_io::byte_lenght<value_type>() +
byte_io::byte_lenght<unsigned>() );
++ using namespace byte_io;
++ data_->resize( n_s * byte_lenght<value_type>() +
byte_lenght<unsigned>() ); if ( size() >= n_s ) return;
+ iterator p_end = end();
+- byte_io::write<unsigned>( data_->rw_base( 0 ), n_s );
+- while ( operator !=<unsigned, unsigned>(p_end, end()) ) {
++ write<unsigned>( data_->rw_base( 0 ), n_s );
++ while ( p_end != end() ) {
+ *p_end = value_type();
+ ++p_end;
+
\ No newline at end of file



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (5c583327107ac5a106d9cc1f71155414db180f50), Eric Sandall, 04/21/2010

Archive powered by MHonArc 2.6.24.

Top of Page