summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris White <chriswhite@gentoo.org>2005-03-30 07:53:37 +0000
committerChris White <chriswhite@gentoo.org>2005-03-30 07:53:37 +0000
commit8eeda2b5b988f074eda465e9cb3a7513ce84630e (patch)
tree504e54fbeb73c99aff26968b883133edb755b303 /media-libs/libgii
parentadded a new patch to make compilation with gcc34 possible, merged the gcc33 p... (diff)
downloadgentoo-2-8eeda2b5b988f074eda465e9cb3a7513ce84630e.tar.gz
gentoo-2-8eeda2b5b988f074eda465e9cb3a7513ce84630e.tar.bz2
gentoo-2-8eeda2b5b988f074eda465e9cb3a7513ce84630e.zip
Fix bug #86941. For what? Conditionals! Again! Now the code is haunting me with conditionals! WHY.. WHY!
(Portage version: 2.0.51.19)
Diffstat (limited to 'media-libs/libgii')
-rw-r--r--media-libs/libgii/ChangeLog6
-rw-r--r--media-libs/libgii/files/libgii-0.9.0-gcc34.patch10
-rw-r--r--media-libs/libgii/libgii-0.9.0.ebuild3
3 files changed, 17 insertions, 2 deletions
diff --git a/media-libs/libgii/ChangeLog b/media-libs/libgii/ChangeLog
index a6b82f15d75b..1f9268b32de2 100644
--- a/media-libs/libgii/ChangeLog
+++ b/media-libs/libgii/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-libs/libgii
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgii/ChangeLog,v 1.14 2005/03/28 03:47:10 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgii/ChangeLog,v 1.15 2005/03/30 07:53:37 chriswhite Exp $
+
+ 30 Mar 2005; Chris White <chriswhite@gentoo.org>
+ +files/libgii-0.9.0-gcc34.patch, libgii-0.9.0.ebuild:
+ Fix bug #86941.
*libgii-0.9.0 (28 Mar 2005)
diff --git a/media-libs/libgii/files/libgii-0.9.0-gcc34.patch b/media-libs/libgii/files/libgii-0.9.0-gcc34.patch
new file mode 100644
index 000000000000..19fe70df5f25
--- /dev/null
+++ b/media-libs/libgii/files/libgii-0.9.0-gcc34.patch
@@ -0,0 +1,10 @@
+--- gg/ptsched.c.old 2005-03-28 10:20:21.000000000 +0200
++++ gg/ptsched.c 2005-03-28 10:20:45.000000000 +0200
+@@ -198,6 +198,7 @@
+ }
+ pthread_cond_wait(&_gg_task_thread.tick, &_gg_task_thread.mtx);
+ skip:
++ ;
+ pthread_cleanup_pop(1);
+ if (done) return myid;
+ if (!_gg_task_thread.running) return myid;
diff --git a/media-libs/libgii/libgii-0.9.0.ebuild b/media-libs/libgii/libgii-0.9.0.ebuild
index 6c1fb76dc9a1..2c3cb1a8c911 100644
--- a/media-libs/libgii/libgii-0.9.0.ebuild
+++ b/media-libs/libgii/libgii-0.9.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgii/libgii-0.9.0.ebuild,v 1.2 2005/03/29 01:52:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgii/libgii-0.9.0.ebuild,v 1.3 2005/03/30 07:53:37 chriswhite Exp $
inherit eutils
@@ -19,6 +19,7 @@ src_unpack() {
unpack ${A}
cd ${S}
epatch ${FILESDIR}/${P}-linux26-headers.patch
+ epatch ${FILESDIR}/${P}-gcc34.patch
}
src_compile() {