Re: Rob Weir in <[EMAIL PROTECTED]> > On Mon, Jan 03, 2005 at 08:49:53PM +0100, Andreas Jochens said > > With the attached patch 'roy' can be compiled > > on amd64 using gcc-4.0. > > Hi Brian, > > now that gcc 4.0 is the default compiler in sid, this bug is now > release-critical; do you think you'll have time to upload a new version > with this patch in the near future, or would you like someone to NMU it > for you?
Hi,
since this has been unadressed for quite a while, I've uploaded an
NMU, patch is below.
debdiff roy_1.0.8-1.dsc roy_1.0.8-1.1.dsc
roy-1.0.8/debian/changelog | 8 ++++++++
roy-1.0.8/debian/control | 2 +-
roy/rbucket.h | 4 ++--
3 files changed, 11 insertions(+), 3 deletions(-)
diff -u roy-1.0.8/debian/changelog roy-1.0.8/debian/changelog
--- roy-1.0.8/debian/changelog
+++ roy-1.0.8/debian/changelog
@@ -1,3 +1,11 @@
+roy (1.0.8-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix gcc-4.0 FTBFS (Closes: #288441).
+ * Build-Depends: libc0.1-prof [kfreebsd-i386] (Closes: #336944).
+
+ -- Christoph Berg <[EMAIL PROTECTED]> Sun, 4 Dec 2005 01:55:36 +0100
+
roy (1.0.8-1) unstable; urgency=low
* New upstream release.
diff -u roy-1.0.8/debian/control roy-1.0.8/debian/control
--- roy-1.0.8/debian/control
+++ roy-1.0.8/debian/control
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Brian Bassett <[EMAIL PROTECTED]>
Standards-Version: 3.6.1
-Build-Depends: debhelper (>= 4), zlib1g-dev, libc6-prof [!alpha !ia64
!hurd-i386], libc6.1-prof [alpha ia64], libc0.3-prof [hurd-i386]
+Build-Depends: debhelper (>= 4), zlib1g-dev, libc6-prof [!alpha !ia64
!hurd-i386 !kfreebsd-i386], libc6.1-prof [alpha ia64], libc0.3-prof
[hurd-i386], libc0.1-prof [kfreebsd-i386]
Package: libroy-dev
Section: libdevel
only in patch2:
unchanged:
--- roy-1.0.8.orig/roy/rbucket.h
+++ roy-1.0.8/roy/rbucket.h
@@ -55,13 +55,13 @@
rbucket_empty (RBucket *bucket);
#define rbucket_alloc(bucket) (bucket->buckets ? \
- (void *) bucket->tmpbucket = bucket->buckets, \
+ bucket->tmpbucket = bucket->buckets, \
bucket->buckets = bucket->buckets->next, \
bucket->tmpbucket : \
rbucket_fill__P(bucket))
#define rbucket_alloc0(bucket) (bucket->buckets ? \
- (void *) bucket->tmpbucket = bucket->buckets, \
+ bucket->tmpbucket = bucket->buckets, \
bucket->buckets = bucket->buckets->next, \
memset (bucket->tmpbucket, 0, bucket->size), \
bucket->tmpbucket : \
Christoph
--
[EMAIL PROTECTED] | http://www.df7cb.de/
signature.asc
Description: Digital signature
