summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoy Marples <uberlord@gentoo.org>2007-10-26 09:32:14 +0000
committerRoy Marples <uberlord@gentoo.org>2007-10-26 09:32:14 +0000
commit24bc175a8dc314a8e49195cbe66105a29b9ebefd (patch)
tree30df85ca7c4a0fb664f4582529ccdf0ff8ef993a /app-cdr/dvd+rw-tools
parentUpdated WebDAV check for newer subversion ebuilds. Submitted by A. F. T. (diff)
downloadgentoo-2-24bc175a8dc314a8e49195cbe66105a29b9ebefd.tar.gz
gentoo-2-24bc175a8dc314a8e49195cbe66105a29b9ebefd.tar.bz2
gentoo-2-24bc175a8dc314a8e49195cbe66105a29b9ebefd.zip
Include limits.h to compile against newer headers, #195912 thanks to Sedorox
(Portage version: 2.1.3.16)
Diffstat (limited to 'app-cdr/dvd+rw-tools')
-rw-r--r--app-cdr/dvd+rw-tools/ChangeLog6
-rw-r--r--app-cdr/dvd+rw-tools/dvd+rw-tools-7.0.ebuild12
-rw-r--r--app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.0-limits.patch69
3 files changed, 84 insertions, 3 deletions
diff --git a/app-cdr/dvd+rw-tools/ChangeLog b/app-cdr/dvd+rw-tools/ChangeLog
index 141da7210a9a..6089de992c9c 100644
--- a/app-cdr/dvd+rw-tools/ChangeLog
+++ b/app-cdr/dvd+rw-tools/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-cdr/dvd+rw-tools
# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/dvd+rw-tools/ChangeLog,v 1.52 2007/05/05 03:56:38 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/dvd+rw-tools/ChangeLog,v 1.53 2007/10/26 09:32:13 uberlord Exp $
+
+ 26 Oct 2007; Roy Marples <uberlord@gentoo.org>
+ +files/dvd+rw-tools-7.0-limits.patch, dvd+rw-tools-7.0.ebuild:
+ Include limits.h to compile against newer headers, #195912 thanks to Sedorox
05 May 2007; Jeroen Roovers <jer@gentoo.org> dvd+rw-tools-7.0.ebuild:
Stable for HPPA (bug #156770).
diff --git a/app-cdr/dvd+rw-tools/dvd+rw-tools-7.0.ebuild b/app-cdr/dvd+rw-tools/dvd+rw-tools-7.0.ebuild
index 53c8990ecc16..e3b00ed23bce 100644
--- a/app-cdr/dvd+rw-tools/dvd+rw-tools-7.0.ebuild
+++ b/app-cdr/dvd+rw-tools/dvd+rw-tools-7.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/dvd+rw-tools/dvd+rw-tools-7.0.ebuild,v 1.11 2007/05/05 03:56:38 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/dvd+rw-tools/dvd+rw-tools-7.0.ebuild,v 1.12 2007/10/26 09:32:13 uberlord Exp $
inherit eutils toolchain-funcs
@@ -15,11 +15,19 @@ IUSE=""
DEPEND="virtual/cdrtools"
-src_compile() {
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+
+ epatch "${FILESDIR}/${P}"-limits.patch
+
sed -i \
-e "s:^CFLAGS=\$(WARN).*:CFLAGS=${CFLAGS}:" \
-e "s:^CXXFLAGS=\$(WARN).*:CXXFLAGS=${CXXFLAGS} -fno-exceptions:" \
Makefile.m4 || die
+}
+
+src_compile() {
emake CC=$(tc-getCC) CXX=$(tc-getCXX) || die
}
diff --git a/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.0-limits.patch b/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.0-limits.patch
new file mode 100644
index 000000000000..9657b2e3d465
--- /dev/null
+++ b/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.0-limits.patch
@@ -0,0 +1,69 @@
+diff -urNd dvd+rw-tools-7.0/dvd+rw-booktype.cpp dvd+rw-tools-7.0-changed/dvd+rw-booktype.cpp
+--- dvd+rw-tools-7.0/dvd+rw-booktype.cpp 2006-06-24 05:21:48.000000000 -0400
++++ dvd+rw-tools-7.0-changed/dvd+rw-booktype.cpp 2007-10-19 23:40:25.000000000 -0400
+@@ -27,7 +27,7 @@
+ EOS
+ exit
+ #endif
+-
++#include <limits.h>
+ #include <stdio.h>
+ #include <stddef.h>
+ #include <stdlib.h>
+diff -urNd dvd+rw-tools-7.0/dvd+rw-format.cpp dvd+rw-tools-7.0-changed/dvd+rw-format.cpp
+--- dvd+rw-tools-7.0/dvd+rw-format.cpp 2006-09-18 07:41:13.000000000 -0400
++++ dvd+rw-tools-7.0-changed/dvd+rw-format.cpp 2007-10-19 23:40:50.000000000 -0400
+@@ -70,7 +70,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+-
++#include <limits.h>
+ #if defined(__unix) || defined(__unix__)
+ #include <sys/types.h>
+ #include <sys/stat.h>
+diff -urNd dvd+rw-tools-7.0/dvd+rw-mediainfo.cpp dvd+rw-tools-7.0-changed/dvd+rw-mediainfo.cpp
+--- dvd+rw-tools-7.0/dvd+rw-mediainfo.cpp 2006-09-23 13:46:57.000000000 -0400
++++ dvd+rw-tools-7.0-changed/dvd+rw-mediainfo.cpp 2007-10-19 23:40:58.000000000 -0400
+@@ -3,7 +3,7 @@
+ *
+ * This code is in public domain.
+ */
+-
++#include <limits.h>
+ #include <stdio.h>
+ #include <stddef.h>
+ #include <stdlib.h>
+diff -urNd dvd+rw-tools-7.0/dvd-ram-control.cpp dvd+rw-tools-7.0-changed/dvd-ram-control.cpp
+--- dvd+rw-tools-7.0/dvd-ram-control.cpp 2004-07-08 07:05:56.000000000 -0400
++++ dvd+rw-tools-7.0-changed/dvd-ram-control.cpp 2007-10-19 23:42:01.000000000 -0400
+@@ -1,3 +1,4 @@
++#include <limits.h>
+ #include "transport.hxx"
+
+ int main (int argc,char *argv[])
+diff -urNd dvd+rw-tools-7.0/growisofs.c dvd+rw-tools-7.0-changed/growisofs.c
+--- dvd+rw-tools-7.0/growisofs.c 2006-09-24 13:28:53.000000000 -0400
++++ dvd+rw-tools-7.0-changed/growisofs.c 2007-10-19 23:41:28.000000000 -0400
+@@ -558,8 +558,8 @@
+
+
+ #if defined(__linux)
+-
+ #include <linux/types.h>
++#include <limits.h>
+ #include <linux/cdrom.h>
+ #include <sys/ioctl.h>
+ #include <sys/prctl.h>
+diff -urNd dvd+rw-tools-7.0/growisofs_mmc.cpp dvd+rw-tools-7.0-changed/growisofs_mmc.cpp
+--- dvd+rw-tools-7.0/growisofs_mmc.cpp 2006-09-23 08:45:49.000000000 -0400
++++ dvd+rw-tools-7.0-changed/growisofs_mmc.cpp 2007-10-19 23:41:39.000000000 -0400
+@@ -13,7 +13,7 @@
+ #define _GNU_SOURCE
+ #endif
+ #endif
+-
++#include <limits.h>
+ #include "transport.hxx"
+
+ #include <time.h>