summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Riley <justin.t.riley@gmail.com>2009-12-12 19:24:46 +0000
committerJustin Riley <justin.t.riley@gmail.com>2009-12-12 19:24:46 +0000
commit65348bf74934ad8c115e905ff90bbcd8245c0d48 (patch)
tree1ddc37e9eb06a5030190d34916163fee20cd1d2d
parentapp-portage/portage-hooks: Fix portage-hooks script, review by Tommy[D] (diff)
downloadsunrise-65348bf74934ad8c115e905ff90bbcd8245c0d48.tar.gz
sunrise-65348bf74934ad8c115e905ff90bbcd8245c0d48.tar.bz2
sunrise-65348bf74934ad8c115e905ff90bbcd8245c0d48.zip
app-misc/gizmod: Added patch for gcc 4.4.2, bug submitted upstream
svn path=/sunrise/; revision=9715
-rw-r--r--app-misc/gizmod/ChangeLog4
-rw-r--r--app-misc/gizmod/Manifest5
-rw-r--r--app-misc/gizmod/files/gizmod-3.5-gcc44.patch10
-rw-r--r--app-misc/gizmod/gizmod-3.5.ebuild2
4 files changed, 19 insertions, 2 deletions
diff --git a/app-misc/gizmod/ChangeLog b/app-misc/gizmod/ChangeLog
index ad46fd32f..a63cea24d 100644
--- a/app-misc/gizmod/ChangeLog
+++ b/app-misc/gizmod/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 12 Dec 2009; Justin Riley <justin.t.riley@gmail.com> gizmod-3.5.ebuild,
+ +files/gizmod-3.5-gcc44.patch:
+ Added patch for gcc 4.4.2, bug submitted upstream
+
27 Nov 2009; Justin Riley <justin.t.riley@gmail.com> gizmod-3.5.ebuild,
+files/gizmod-3.5-libvisual.patch:
Added patch to enforce libvisual USE flag. Thanks to Tommy[D] for the catch
diff --git a/app-misc/gizmod/Manifest b/app-misc/gizmod/Manifest
index 8adb437d8..6fe2dd778 100644
--- a/app-misc/gizmod/Manifest
+++ b/app-misc/gizmod/Manifest
@@ -1,6 +1,7 @@
+AUX gizmod-3.5-gcc44.patch 388 RMD160 a8e73f4114f904fea61aad73675d0fe28258e705 SHA1 9ce83acfd830574df966aa9119f518362df7caa5 SHA256 8972c21af2ea8582198f6dee5889f6a0a12aa047429d771296656a9c6a3f3f58
AUX gizmod-3.5-libvisual.patch 3591 RMD160 e1a76a983a0c2eec3382356256bb5bc24b6ac68f SHA1 df2c4ea56028616382c5d9ac97964e8e12f34e65 SHA256 e130a082336f3ad2fc9f1f69f625c577792145449217e6d4ee481cc96e97967e
AUX gizmod.rc 363 RMD160 1b3f4294b344f0ff2126302c3e8c5c3bfbd7d340 SHA1 a2b9d751a24541e8a0fff403cb31c5c0e3a7ddd0 SHA256 80ed92ee5d0c6d7b574bf58bde29d65b0dfd54d61aab01c7ab69bbec1278f7d9
DIST gizmod-3.5.tar.bz2 115721 RMD160 90bf061e759713cf24629016443fba09eb00131d SHA1 baecf3b493a43836586fbb91001c6e79bd933a18 SHA256 63c7620e14a43719be0302f44597ca6c38f263de1672b9bb58da63db48d6ecef
-EBUILD gizmod-3.5.ebuild 2176 RMD160 db5983c6264990ae71dd383ff071bba184f94bcf SHA1 20594a2b87671bf6ac09b35f7f2900b54b40643f SHA256 d4ec87a78e740abb579294a17e6138dde10188392a950cd69e8032beff7b1cd5
-MISC ChangeLog 2166 RMD160 e6e6f0b774e3ff9d21012cbd6d6631350f94717e SHA1 ad4d5e74e9af525adeca4a8340158a5d44c9b30f SHA256 d7af6153de00f8664cfd5e866865617ce6a8105af90c6f49062722e7de5b776d
+EBUILD gizmod-3.5.ebuild 2237 RMD160 d25b8a982771e5617a6e36b0dd46d7fa00a1b9fe SHA1 8c77befb3bd9a96a3d5dc55112c06d124b14f36f SHA256 74ca837a8234db734d23786235c847cd7aba036fc1321bcd271ebfb3709840f4
+MISC ChangeLog 2326 RMD160 8e054204dd8d15b92e3f4d1e13969b55e4cc1ac9 SHA1 c19e20e4f12d99b1c0d193aab9e85d5662a1d49d SHA256 b7e8cf0e3b78222e4e131c60d74fefd210315902e8729f79030fd74e74ba2287
MISC metadata.xml 277 RMD160 d54adef29a37b47ca08b2194f5e6ebd0f668f4cf SHA1 caca608e4c20dfe264ebad8228ab8294b1f54b02 SHA256 bdb7a5f3eb5a695584b91f703ceae716d54fbadb7d6a329539bb16aac30377fe
diff --git a/app-misc/gizmod/files/gizmod-3.5-gcc44.patch b/app-misc/gizmod/files/gizmod-3.5-gcc44.patch
new file mode 100644
index 000000000..a69603eee
--- /dev/null
+++ b/app-misc/gizmod/files/gizmod-3.5-gcc44.patch
@@ -0,0 +1,10 @@
+--- gizmod-3.5/libGizmod/CPUUsage.cpp.orig 2009-12-05 06:44:39.000000000 +0200
++++ gizmod-3.5/libGizmod/CPUUsage.cpp 2009-12-05 06:44:22.000000000 +0200
+@@ -32,6 +32,7 @@
+ #include "../libH/UtilTime.hpp"
+ #include <fstream>
+ #include <iostream>
++#include <cstring>
+ #include <boost/filesystem/operations.hpp>
+ #include <boost/filesystem/exception.hpp>
+ #include <boost/thread/thread.hpp>
diff --git a/app-misc/gizmod/gizmod-3.5.ebuild b/app-misc/gizmod/gizmod-3.5.ebuild
index c73458062..c2ca8bd0e 100644
--- a/app-misc/gizmod/gizmod-3.5.ebuild
+++ b/app-misc/gizmod/gizmod-3.5.ebuild
@@ -49,6 +49,8 @@ options can only be built directly into the kernel.
src_prepare() {
# patch gizmod to properly obey libvisual use flag
epatch "${FILESDIR}"/${P}-libvisual.patch
+ # patch for gcc-4.4*
+ epatch "${FILESDIR}"/${P}-gcc44.patch
## straighten up the paths
sed -i CMakeLists.txt -e /DefineInstallationPaths/d || die "sed: removal of DefineInstallationPaths failed"
sed -i libGizmod/CMakeLists.txt -e 's:lib$:lib${LIB_SUFFIX}:' || die "sed: replacing lib with LIB_INSTALL_DIR failed"