rev 6072 - in kde-extras/kipi-plugins/trunk/debian: . patches
Mark Purcell
msp at alioth.debian.org
Tue May 8 20:26:47 UTC 2007
Author: msp
Date: 2007-05-08 20:26:43 +0000 (Tue, 08 May 2007)
New Revision: 6072
Added:
kde-extras/kipi-plugins/trunk/debian/patches/Bug#417297-GCC4.3.diff
kde-extras/kipi-plugins/trunk/debian/patches/use-icedove-instead-of-thunderbird.diff
Modified:
kde-extras/kipi-plugins/trunk/debian/changelog
Log:
* Include gcc4.3 patch from Martin (Closes: #417297)
* Include icedove patch from Gon?\195?\169ri (Closes: #410479)
Modified: kde-extras/kipi-plugins/trunk/debian/changelog
===================================================================
--- kde-extras/kipi-plugins/trunk/debian/changelog 2007-05-07 13:49:05 UTC (rev 6071)
+++ kde-extras/kipi-plugins/trunk/debian/changelog 2007-05-08 20:26:43 UTC (rev 6072)
@@ -1,13 +1,15 @@
-kipi-plugins (0.1.3-5) UNRELEASED; urgency=low
+kipi-plugins (0.1.3-5) unstable; urgency=low
- * NOT RELEASED YET
-
[ Achim Bohnet ]
* debian/control: set kipi-plugins-doc section to doc. Fixes override
disparity on uploads.
- -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org> Tue, 3 Apr 2007 23:14:16 +0200
+ [ Mark Purcell ]
+ * Include gcc4.3 patch from Martin (Closes: #417297)
+ * Include icedove patch from Gonéri (Closes: #410479)
+ -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org> Tue, 08 May 2007 21:16:51 +0100
+
kipi-plugins (0.1.3-4) unstable; urgency=low
[ Mark Purcell ]
Added: kde-extras/kipi-plugins/trunk/debian/patches/Bug#417297-GCC4.3.diff
===================================================================
--- kde-extras/kipi-plugins/trunk/debian/patches/Bug#417297-GCC4.3.diff 2007-05-07 13:49:05 UTC (rev 6071)
+++ kde-extras/kipi-plugins/trunk/debian/patches/Bug#417297-GCC4.3.diff 2007-05-08 20:26:43 UTC (rev 6072)
@@ -0,0 +1,172 @@
+From tbm at cyrius.com Mon Apr 2 19:44:07 2007
+Return-path: <pkg-kde-extras-bounces+msp=debian.org at lists.alioth.debian.org>
+Envelope-to: debian at purcell.id.au
+Delivery-date: Mon, 02 Apr 2007 10:49:43 +0100
+Received: from master.debian.org ([70.103.162.29])
+ by bristol.purcell.id.au with esmtp (Exim 4.63)
+ (envelope-from <pkg-kde-extras-bounces+msp=debian.org at lists.alioth.debian.org>)
+ id 1HYJAH-0004xL-Vb
+ for debian at purcell.id.au; Mon, 02 Apr 2007 10:49:43 +0100
+Received: from alioth.debian.org ([217.196.43.134])
+ by master.debian.org with esmtp (Exim 4.50)
+ id 1HYJAG-0005sZ-1R
+ for debian at purcell.id.au; Mon, 02 Apr 2007 09:49:28 +0000
+Received: from localhost ([127.0.0.1] helo=alioth.debian.org)
+ by alioth.debian.org with esmtp (Exim 4.50)
+ id 1HYJAF-0005Ac-DR
+ for msp at debian.org; Mon, 02 Apr 2007 09:49:27 +0000
+Received: from rietz.debian.org ([140.211.166.43])
+ by alioth.debian.org with esmtp (Exim 4.50) id 1HYJA8-0005AA-E0
+ for pkg-kde-extras at lists.alioth.debian.org;
+ Mon, 02 Apr 2007 09:49:26 +0000
+Received: from debbugs by rietz.debian.org with local (Exim 4.50)
+ id 1HYJ64-0002qs-Cv; Mon, 02 Apr 2007 09:45:08 +0000
+X-Loop: owner at bugs.debian.org
+Resent-From: Martin Michlmayr <tbm at cyrius.com>
+Resent-To: debian-bugs-dist at lists.debian.org
+Resent-CC: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
+Resent-Date: Mon, 02 Apr 2007 09:45:05 +0000
+Resent-Message-ID: <handler.417297.B.11755070639614 at bugs.debian.org>
+X-Debian-PR-Message: report 417297
+X-Debian-PR-Package: kipi-plugins
+X-Debian-PR-Keywords: patch
+X-Debian-PR-Source: kipi-plugins
+Received: via spool by submit at bugs.debian.org id=B.11755070639614
+ (code B ref -1); Mon, 02 Apr 2007 09:45:05 +0000
+Received: (at submit) by bugs.debian.org; 2 Apr 2007 09:44:23 +0000
+Received: from sorrow.cyrius.com ([65.19.161.204])
+ by rietz.debian.org with esmtp (Exim 4.50) id 1HYJ5I-0002TY-6c
+ for submit at bugs.debian.org; Mon, 02 Apr 2007 09:44:21 +0000
+Received: by sorrow.cyrius.com (Postfix, from userid 10)
+ id B7C3664D3D; Mon, 2 Apr 2007 09:44:19 +0000 (UTC)
+Received: by deprecation.cyrius.com (Postfix, from userid 1000)
+ id 89C4754373; Mon, 2 Apr 2007 10:44:07 +0100 (BST)
+Date: Mon, 2 Apr 2007 10:44:07 +0100
+From: Martin Michlmayr <tbm at cyrius.com>
+To: submit at bugs.debian.org
+Message-ID: <20070402094407.GP10714 at deprecation.cyrius.com>
+References: <20070329121202.644FA460DE at em64t.snowman.net>
+MIME-Version: 1.0
+Content-Type: text/plain;
+ charset=us-ascii
+Content-Disposition: inline
+In-Reply-To: <20070329121202.644FA460DE at em64t.snowman.net>
+User-Agent: Mutt/1.5.13 (2006-08-11)
+Delivered-To: submit at bugs.debian.org
+Resent-Sender: Debian BTS <debbugs at bugs.debian.org>
+Resent-Date: Mon, 02 Apr 2007 09:45:08 +0000
+X-BeenThere: pkg-kde-extras at lists.alioth.debian.org
+X-Mailman-Version: 2.1.5
+Precedence: list
+Reply-To: Martin Michlmayr <tbm at cyrius.com>,
+ 417297 at bugs.debian.org
+List-Id: "List for the maintainers of stuff under pkd-kde/kde-extras."
+ <pkg-kde-extras.lists.alioth.debian.org>
+List-Unsubscribe: <http://lists.alioth.debian.org/mailman/listinfo/pkg-kde-extras>,
+ <mailto:pkg-kde-extras-request at lists.alioth.debian.org?subject=unsubscribe>
+List-Archive: <http://lists.alioth.debian.org/pipermail/pkg-kde-extras>
+List-Post: <mailto:pkg-kde-extras at lists.alioth.debian.org>
+List-Help: <mailto:pkg-kde-extras-request at lists.alioth.debian.org?subject=help>
+List-Subscribe: <http://lists.alioth.debian.org/mailman/listinfo/pkg-kde-extras>,
+ <mailto:pkg-kde-extras-request at lists.alioth.debian.org?subject=subscribe>
+Sender: pkg-kde-extras-bounces+msp=debian.org at lists.alioth.debian.org
+Errors-To: pkg-kde-extras-bounces+msp=debian.org at lists.alioth.debian.org
+X-SA-Exim-Connect-IP: 70.103.162.29
+X-SA-Exim-Rcpt-To: debian at purcell.id.au
+X-SA-Exim-Mail-From: pkg-kde-extras-bounces+msp=debian.org at lists.alioth.debian.org
+X-Spam-Checker-Version: SpamAssassin 3.1.7-deb (2006-10-05) on debian
+X-Spam-Level:
+X-Spam-Status: No, score=-2.6 required=1.0 tests=AWL,BAYES_00,
+ UNPARSEABLE_RELAY autolearn=ham version=3.1.7-deb
+X-Spam-Report:
+ * 0.0 UNPARSEABLE_RELAY Informational: message has unparseable relay
+ * lines
+ * -2.6 BAYES_00 BODY: Bayesian spam probability is 0 to 1%
+ * [score: 0.0000]
+ * -0.0 AWL AWL: From: address is in the auto white-list
+Subject: [Pkg-kde-extras] Bug#417297: FTBFS with GCC 4.3: missing #includes
+X-SA-Exim-Version: 4.2.1 (built Tue, 09 Jan 2007 17:23:22 +0000)
+X-SA-Exim-Scanned: Yes (on bristol.purcell.id.au)
+X-Length: 9217
+X-KMail-EncryptionState:
+X-KMail-SignatureState:
+X-KMail-MDN-Sent:
+X-UID: 2341
+Status: RO
+X-Status: OC
+
+Package: kipi-plugins
+Verion: 0.1.2-3
+Usertags: ftbfs-gcc-4.3
+Tags: patch
+
+Your package fails to build with GCC 4.3. Version 4.3 has not been
+released yet but I'm building with a snapshot in order to find errors
+and give people an advance warning. In GCC 4.3, the C++ header
+dependencies have been cleaned up. The advantage of this is that
+programs will compile faster. The downside is that you actually
+need to directly #include everything you use (but you really should
+do this anyway, otherwise your program won't work with any compiler
+other than GCC). Some background of this can be found at
+http://gcc.gnu.org/PR28080
+
+You can reproduce this problem with gcc-snapshot from unstable.
+
+> Automatic build of kipi-plugins_0.1.2-3 on em64t by sbuild/amd64 0.53
+...
+> /build/tbm/kipi-plugins-0.1.2/./kipi-plugins/flickrexport/flickrtalker.cpp: In member function 'void KIPIFlickrExportPlugin::FlickrTalker::data(KIO::Job*, const QByteArray&)':
+> /build/tbm/kipi-plugins-0.1.2/./kipi-plugins/flickrexport/flickrtalker.cpp:372: warning: conversion to 'int' from 'uint' may alter its value
+> /build/tbm/kipi-plugins-0.1.2/./kipi-plugins/flickrexport/flickrtalker.cpp: In member function 'void KIPIFlickrExportPlugin::FlickrTalker::slotError(const QString&)':
+> /build/tbm/kipi-plugins-0.1.2/./kipi-plugins/flickrexport/flickrtalker.cpp:379: error: 'atoi' was not declared in this scope
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+> In file included from ./flickrtalker.moc:144,
+> from /build/tbm/kipi-plugins-0.1.2/./kipi-plugins/flickrexport/flickrtalker.cpp:757:
+> /usr/share/qt3/include/qsignalslotimp.h: In constructor 'QSignalVec::QSignalVec(int)':
+> /usr/share/qt3/include/qsignalslotimp.h:76: warning: conversion to 'unsigned int' from 'int' may alter its value
+> In file included from /build/tbm/kipi-plugins-0.1.2/./kipi-plugins/flickrexport/flickrtalker.cpp:757:
+> /usr/share/qt3/include/qmemarray.h: In member function 'uint QMemArray<type>::size() const [with type = char]':
+> /usr/share/qt3/include/qcstring.h:123: instantiated from here
+> /usr/share/qt3/include/qmemarray.h:66: warning: conversion to 'uint' from 'long unsigned int' may alter its value
+> /usr/share/qt3/include/qmemarray.h: In member function 'QMemArray<type>& QMemArray<type>::duplicate(const type*, uint) [with type = char]':
+> /usr/share/qt3/include/qcstring.h:252: instantiated from here
+> /usr/share/qt3/include/qmemarray.h:85: warning: conversion to 'uint' from 'long unsigned int' may alter its value
+> /usr/share/qt3/include/qmemarray.h: In member function 'bool QMemArray<type>::resize(uint) [with type = char]':
+> /build/tbm/kipi-plugins-0.1.2/./kipi-plugins/flickrexport/flickrtalker.cpp:111: instantiated from here
+> /usr/share/qt3/include/qmemarray.h:70: warning: conversion to 'uint' from 'long unsigned int' may alter its value
+> /usr/share/qt3/include/qmap.h: In member function 'size_t QMap<Key, T>::size() const [with Key = QString, T = QString]':
+> /usr/share/qt3/include/qmap.h:821: instantiated from 'typename QMap<Key, T>::iterator QMap<Key, T>::insert(const Key&, const T&, bool) [with Key = QString, T = QString]'
+> /usr/share/qt3/include/qmap.h:670: instantiated from 'QMapIterator<K, T> QMap<Key, T>::replace(const Key&, const T&) [with Key = QString, T = QString]'
+> /usr/include/kde/kio/global.h:537: instantiated from here
+> /usr/share/qt3/include/qmap.h:675: warning: conversion to 'size_t' from 'int' may alter its value
+> make[4]: *** [flickrtalker.lo] Error 1
+> make[4]: Leaving directory `/build/tbm/kipi-plugins-0.1.2/obj-x86_64-linux-gnu/kipi-plugins/flickrexport'
+> make[3]: *** [all-recursive] Error 1
+> make[3]: Leaving directory `/build/tbm/kipi-plugins-0.1.2/obj-x86_64-linux-gnu/kipi-plugins'
+> make[2]: *** [all-recursive] Error 1
+> make[2]: Leaving directory `/build/tbm/kipi-plugins-0.1.2/obj-x86_64-linux-gnu'
+> make[1]: *** [all] Error 2
+> make[1]: Leaving directory `/build/tbm/kipi-plugins-0.1.2/obj-x86_64-linux-gnu'
+> make: *** [debian/stamp-makefile-build] Error 2
+
+
+--- kipi-plugins/flickrexport/flickrtalker.cpp~ 2007-04-02 09:32:20.000000000 +0000
++++ kipi-plugins/flickrexport/flickrtalker.cpp 2007-04-02 09:32:31.000000000 +0000
+@@ -38,6 +38,7 @@
+ #include <qdom.h>
+ #include <cstring>
+ #include <cstdio>
++#include <cstdlib>
+
+ #include <string>
+ #include "flickritem.h"
+
+--
+Martin Michlmayr
+http://www.cyrius.com/
+
+
+_______________________________________________
+pkg-kde-extras mailing list
+pkg-kde-extras at lists.alioth.debian.org
+http://lists.alioth.debian.org/mailman/listinfo/pkg-kde-extras
+
Added: kde-extras/kipi-plugins/trunk/debian/patches/use-icedove-instead-of-thunderbird.diff
===================================================================
--- kde-extras/kipi-plugins/trunk/debian/patches/use-icedove-instead-of-thunderbird.diff 2007-05-07 13:49:05 UTC (rev 6071)
+++ kde-extras/kipi-plugins/trunk/debian/patches/use-icedove-instead-of-thunderbird.diff 2007-05-08 20:26:43 UTC (rev 6072)
@@ -0,0 +1,11 @@
+--- ./kipi-plugins/sendimages/sendimagesdialog.cpp.orig 2007-02-10 23:58:53.000000000 +0100
++++ ./kipi-plugins/sendimages/sendimagesdialog.cpp 2007-02-10 23:59:07.000000000 +0100
+@@ -193,7 +193,7 @@
+ if (t == "Kmail") t = "Default";
+ m_mailAgentName->setCurrentText(t);
+
+- m_ThunderbirdBinPath->setURL( config.readEntry("ThunderbirdBinPath", "/usr/bin/mozilla-thunderbird"));
++ m_ThunderbirdBinPath->setURL( config.readEntry("ThunderbirdBinPath", "/usr/bin/icedove"));
+
+ if (m_config->readEntry("ImagesChangeProp", "true") == "true")
+ m_changeImagesProp->setChecked( true );
More information about the pkg-kde-commits
mailing list