diff options
| author |   Alin Năstac <mrness@gentoo.org> | 2008-07-01 18:56:51 +0000 |
|---|---|---|
| committer | Alin Năstac <mrness@gentoo.org> | 2008-07-01 18:56:51 +0000 |
| commit | 933fc9a24b457341d574f1c49d21565f27a9dcfd (patch) | |
| tree | 5b6e4ef1e28b2025ad91f007dfcac4ab9f850126 | |
| parent | Fixing musicbrainz deps again, bug #230349 (diff) | |
| download | gentoo-2-933fc9a24b457341d574f1c49d21565f27a9dcfd.tar.gz gentoo-2-933fc9a24b457341d574f1c49d21565f27a9dcfd.tar.bz2 gentoo-2-933fc9a24b457341d574f1c49d21565f27a9dcfd.zip | |
Depend unconditionally on dev-python/apsw (#230363).
Fix broken build when compiled with gcc-4.3 (#230043).
(Portage version: 2.1.4.4)
| -rw-r--r-- | app-mobilephone/bitpim/ChangeLog | 7 | ||||
| -rw-r--r-- | app-mobilephone/bitpim/bitpim-1.0.5.ebuild | 12 | ||||
| -rw-r--r-- | app-mobilephone/bitpim/files/bitpim-1.0.5-gcc43.patch | 22 |
3 files changed, 34 insertions, 7 deletions
diff --git a/app-mobilephone/bitpim/ChangeLog b/app-mobilephone/bitpim/ChangeLog index 1a7de898efd2..fc6bfabbcc5a 100644 --- a/app-mobilephone/bitpim/ChangeLog +++ b/app-mobilephone/bitpim/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-mobilephone/bitpim # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/bitpim/ChangeLog,v 1.25 2008/06/24 20:04:42 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/bitpim/ChangeLog,v 1.26 2008/07/01 18:56:50 mrness Exp $ + + 01 Jul 2008; Alin Năstac <mrness@gentoo.org> + +files/bitpim-1.0.5-gcc43.patch, bitpim-1.0.5.ebuild: + Depend unconditionally on dev-python/apsw (#230363). Fix broken build when + compiled with gcc-4.3 (#230043). 24 Jun 2008; Alin Năstac <mrness@gentoo.org> -files/bitpim-0.9.10-gentoo.patch, -files/bitpim-0.9.13-gentoo.patch, diff --git a/app-mobilephone/bitpim/bitpim-1.0.5.ebuild b/app-mobilephone/bitpim/bitpim-1.0.5.ebuild index 304165bbb75c..4ddddd7a8352 100644 --- a/app-mobilephone/bitpim/bitpim-1.0.5.ebuild +++ b/app-mobilephone/bitpim/bitpim-1.0.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/bitpim/bitpim-1.0.5.ebuild,v 1.4 2008/06/24 20:04:42 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/bitpim/bitpim-1.0.5.ebuild,v 1.5 2008/07/01 18:56:50 mrness Exp $ inherit distutils fdo-mime multilib @@ -13,13 +13,12 @@ SLOT="0" KEYWORDS="~amd64 ~x86" # this needs fixing #KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="crypt evo sqlite usb" +IUSE="crypt evo usb" COMMON_DEPEND="=dev-python/wxpython-2.8.7.1* >=dev-python/python-dsv-1.4.0 >=dev-python/pyserial-2.2 - sqlite? ( >=dev-db/sqlite-3.3.10 - >=dev-python/apsw-3.3.13.1 ) + >=dev-python/apsw-3.3.13.1 crypt? ( >=dev-python/paramiko-1.7.1 >=dev-python/pycrypto-2.0.1 ) usb? ( >=dev-libs/libusb-0.1.10a )" @@ -60,8 +59,9 @@ maketarball() { #For building the tarball. To be used only by ebuild maintainers src_unpack() { unpack ${A} cd "${S}" - epatch "${FILESDIR}/${P}-gentoo.patch" || die "gentoo patch failed" - epatch "${FILESDIR}/${P}-ffmpeg_quality.patch" || die "ffmpeg patch failed" + epatch "${FILESDIR}/${P}-gentoo.patch" + epatch "${FILESDIR}/${P}-ffmpeg_quality.patch" + epatch "${FILESDIR}/${P}-gcc43.patch" sed -i "s/python2.3/${python}/" "${S}/src/native/usb/build.sh" } diff --git a/app-mobilephone/bitpim/files/bitpim-1.0.5-gcc43.patch b/app-mobilephone/bitpim/files/bitpim-1.0.5-gcc43.patch new file mode 100644 index 000000000000..ae77ba1e2bb3 --- /dev/null +++ b/app-mobilephone/bitpim/files/bitpim-1.0.5-gcc43.patch @@ -0,0 +1,22 @@ +diff -ur bitpim-1.0.5.orig/src/native/av/bmp2avi/avi_file.cxx bitpim-1.0.5/src/native/av/bmp2avi/avi_file.cxx +--- bitpim-1.0.5.orig/src/native/av/bmp2avi/avi_file.cxx 2005-02-18 07:55:03.000000000 +0100 ++++ bitpim-1.0.5/src/native/av/bmp2avi/avi_file.cxx 2008-07-01 19:59:57.000000000 +0200 +@@ -9,6 +9,7 @@ + + #include "avi_file.h" + #include "byte_order.h" ++#include <cstring> + + // endian conversion routines + +diff -ur bitpim-1.0.5.orig/src/native/av/bmp2avi/bmp_file.cxx bitpim-1.0.5/src/native/av/bmp2avi/bmp_file.cxx +--- bitpim-1.0.5.orig/src/native/av/bmp2avi/bmp_file.cxx 2005-02-18 07:55:03.000000000 +0100 ++++ bitpim-1.0.5/src/native/av/bmp2avi/bmp_file.cxx 2008-07-01 20:00:48.000000000 +0200 +@@ -11,6 +11,7 @@ + #include <string> + #include "bmp_file.h" + #include "byte_order.h" ++#include <cstring> + + using namespace std; + |