Package: pose
Version: 3.5-9
Severity: normal
Tags: patch
Hi,
Attached is the diff for my pose 3.5-9.1 NMU.
diff -u pose-3.5/debian/patches/00list pose-3.5/debian/patches/00list
--- pose-3.5/debian/patches/00list
+++ pose-3.5/debian/patches/00list
@@ -6,6 +6,7 @@
10_va_list
10_pen_events
10_gcc34
+10_gcc41
10_serial
15_autoconfmake_adjust
20_autoconfmake_update
diff -u pose-3.5/debian/control pose-3.5/debian/control
--- pose-3.5/debian/control
+++ pose-3.5/debian/control
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Lucas Wall <[EMAIL PROTECTED]>
Standards-Version: 3.6.2
-Build-Depends: debhelper (>= 4.0.0), autotools-dev, dpatch, libfltk1.1-dev,
fluid, zlib1g-dev, gcc-3.4, g++-3.4, libxt-dev
+Build-Depends: debhelper (>= 4.0.0), autotools-dev, dpatch, libfltk1.1-dev,
fluid, zlib1g-dev, libxt-dev
Package: pose
Architecture: any
diff -u pose-3.5/debian/changelog pose-3.5/debian/changelog
--- pose-3.5/debian/changelog
+++ pose-3.5/debian/changelog
@@ -1,3 +1,17 @@
+pose (3.5-9.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Make package build with gcc 4.1. (Closes: #343015, #385827)
+ * In MAKE_ONE_SCALAR_ALIAS_ASSIGNMENT_OPERATOR and
+ MAKE_ONE_SCALAR_PROXY_ASSIGNMENT_OPERATOR, always cast the value via
+ long, since gcc no longer accepts a direct cast from void * to, say,
+ char. (It is not likely that any of these code paths are actually ever
+ getting touched, but they still need to compile.)
+ * Don't set CC=gcc-3.4 CXX=g++-3.4 when building.
+ * Remove build-dependency on gcc-3.4 and g++-3.4.
+
+ -- Steinar H. Gunderson <[EMAIL PROTECTED]> Fri, 8 Sep 2006 18:49:39 +0200
+
pose (3.5-9) unstable; urgency=low
* Removed dependancy on xlibs-dev. (closes: #346850)
diff -u pose-3.5/debian/rules pose-3.5/debian/rules
--- pose-3.5/debian/rules
+++ pose-3.5/debian/rules
@@ -39,10 +39,8 @@
Gzip/Makefile.am Gzip/Makefile.in jpeg/Makefile.am
jpeg/Makefile.in \
espws-2.0/Makefile.am espws-2.0/Makefile.in )
( mkdir _build && cd _build && CFLAGS="$(CFLAGS)" \
- CC=gcc-3.4 CXX=g++-3.4 \
../BuildUnix/configure $(CONFIGOPTS) )
( mkdir _profile && cd _profile && CFLAGS="$(CFLAGS)" \
- CC=gcc-3.4 CXX=g++-3.4 \
../BuildUnix/configure $(CONFIGOPTS) --enable-palm-profile )
touch configure-stamp
only in patch2:
unchanged:
--- pose-3.5.orig/debian/patches/10_gcc41.dpatch
+++ pose-3.5/debian/patches/10_gcc41.dpatch
@@ -0,0 +1,35 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+# vim: ft=diff
+## 10_gcc41.dpatch by Steinar H. Gunderson <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Compile with gcc 4.1
+diff -ur pose-3.5/SrcShared/EmPalmStructs.h
pose-3.5.patched/SrcShared/EmPalmStructs.h
+--- pose-3.5/SrcShared/EmPalmStructs.h 2002-03-29 14:11:14.000000000 +0100
++++ pose-3.5.patched/SrcShared/EmPalmStructs.h 2006-09-08 19:33:44.000000000
+0200
+@@ -577,9 +577,9 @@
+ template <class A>
\
+ INLINE_ EmAlias##type<A>& EmAlias##type<A>::operator= (rhs_type val)
\
+ {
\
+- if (sizeof (asType) == 1) A::PutByte
(this->GetPtr (), (unsigned char) (asType) val); \
+- else if (sizeof (asType) == 2) A::PutWord (this->GetPtr (),
(unsigned short) (asType) val); \
+- else if (sizeof (asType) == 4) A::PutLong (this->GetPtr (),
(unsigned long) (asType) val); \
++ if (sizeof (asType) == 1) A::PutByte
(this->GetPtr (), (unsigned char) (asType) (long) val); \
++ else if (sizeof (asType) == 2) A::PutWord (this->GetPtr (),
(unsigned short) (asType) (long) val); \
++ else if (sizeof (asType) == 4) A::PutLong (this->GetPtr (),
(unsigned long) (asType) (long) val); \
+ else BadSetter ();
\
+
\
+ return *this;
\
+@@ -589,9 +589,9 @@
+
\
+ INLINE_ EmProxy##type& EmProxy##type::operator= (rhs_type val)
\
+ {
\
+- if (sizeof (asType) == 1) LAS::PutByte
(this->GetPtr (), (unsigned char) (asType) val); \
+- else if (sizeof (asType) == 2) LAS::PutWord (this->GetPtr (),
(unsigned short) (asType) val); \
+- else if (sizeof (asType) == 4) LAS::PutLong (this->GetPtr (),
(unsigned long) (asType) val); \
++ if (sizeof (asType) == 1) LAS::PutByte
(this->GetPtr (), (unsigned char) (asType) (long) val); \
++ else if (sizeof (asType) == 2) LAS::PutWord (this->GetPtr (),
(unsigned short) (asType) (long) val); \
++ else if (sizeof (asType) == 4) LAS::PutLong (this->GetPtr (),
(unsigned long) (asType) (long) val); \
+ else BadSetter ();
\
+
\
+ return *this;
\
