[metview] 02/03: Re-add patches accidentally dropped
Alastair McKinstry
mckinstry at moszumanska.debian.org
Tue Sep 1 09:19:21 UTC 2015
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to tag debian/4.4.8+dsfg.1-9
in repository metview.
commit 918a44a9d04c5d2e8644394f8fa3a7f86dad0652
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Wed Jul 15 19:31:37 2015 +0100
Re-add patches accidentally dropped
---
debian/patches/fix-colors.patch | 18 ++++++
debian/patches/no-m32.patch | 19 +++++++
debian/patches/socklen-fix.patch | 18 ++++++
debian/patches/syserrlist.patch | 119 +++++++++++++++++++++++++++++++++++++++
4 files changed, 174 insertions(+)
diff --git a/debian/patches/fix-colors.patch b/debian/patches/fix-colors.patch
new file mode 100644
index 0000000..0d697b7
--- /dev/null
+++ b/debian/patches/fix-colors.patch
@@ -0,0 +1,18 @@
+Author: Alastair McKinstyr <mckinstry at debian.org>
+Description: convert now complains that 'snow1' is not a defined color.
+Last-Updated: 2014-09-08
+Forwarded: no
+
+Index: metview-4.4.8+dfsg.1/share/metview/icons/GRIB.xpm
+===================================================================
+--- metview-4.4.8+dfsg.1.orig/share/metview/icons/GRIB.xpm
++++ metview-4.4.8+dfsg.1/share/metview/icons/GRIB.xpm
+@@ -5,7 +5,7 @@ static char * GRIB_icon[] = {
+ "32 32 6 1",
+ " c white",
+ ". s c0 c darkgreen",
+-"X s c4 c snow1",
++"X s c4 c rgb(255,250,250)",
+ "o s c2 c lightblue",
+ "O s c5 c MediumSpringGreen",
+ "+ s c3 c khaki",
diff --git a/debian/patches/no-m32.patch b/debian/patches/no-m32.patch
new file mode 100644
index 0000000..141cd30
--- /dev/null
+++ b/debian/patches/no-m32.patch
@@ -0,0 +1,19 @@
+Author: Alastair McKinstry <mckinstry at debian.org>
+Description: Don't assume all the world is amd53 or i386; don't build !amd64
+ as -m32.
+Last-Updated: 2014-08-31
+Forwarded: no
+
+Index: metview-4.4.7+dfsg.1/configure.ac
+===================================================================
+--- metview-4.4.7+dfsg.1.orig/configure.ac
++++ metview-4.4.7+dfsg.1/configure.ac
+@@ -205,7 +205,7 @@ case "${host}" in
+ fi
+ ;;
+ *)
+- AXX="-m32"
++ AXX=""
+ LIBNAME="lib"
+ MV_ENVIRON="ecm_lnx"
+ CFLAGS="${CFLAGS} -Dlinux"
diff --git a/debian/patches/socklen-fix.patch b/debian/patches/socklen-fix.patch
new file mode 100644
index 0000000..3600bc6
--- /dev/null
+++ b/debian/patches/socklen-fix.patch
@@ -0,0 +1,18 @@
+Author: Alastair McKinstry <mckinstry at debian.org>
+Description: Drop __alpha exception which breaks on Debian GNU/Linux alphas.
+Last-Updated: 2014-09-15
+Forwarded: no
+
+Index: metview-4.4.8+dfsg.1/src/Event/Event.cc
+===================================================================
+--- metview-4.4.8+dfsg.1.orig/src/Event/Event.cc
++++ metview-4.4.8+dfsg.1/src/Event/Event.cc
+@@ -57,7 +57,7 @@ void Event::NewService(int soc)
+ int fromlen;
+
+ fromlen = sizeof(from);
+-#if defined(Sgi) || defined(Hpux) || defined(__alpha)
++#if defined(Sgi) || defined(Hpux)
+ if((snew = accept(soc, (sockaddr*)&from, &fromlen))<0)
+ #else
+ if( (snew = accept(soc, (sockaddr*)&from, (socklen_t *)&fromlen)) < 0 )
diff --git a/debian/patches/syserrlist.patch b/debian/patches/syserrlist.patch
new file mode 100644
index 0000000..656d246
--- /dev/null
+++ b/debian/patches/syserrlist.patch
@@ -0,0 +1,119 @@
+Author: Alastair McKinstry <mckinstry at debian.org>
+Description: Replace sys_errlist[] which causes problems with FreeBSD
+ and is deprecated with strerror()
+Last-Updated: 2014-09-10
+Forwarded: no
+
+Index: metview-4.4.8+dfsg.1/src/Desktop/Log.cc
+===================================================================
+--- metview-4.4.8+dfsg.1.orig/src/Desktop/Log.cc
++++ metview-4.4.8+dfsg.1/src/Desktop/Log.cc
+@@ -12,6 +12,7 @@
+ #include "Folder.h"
+
+ #include <errno.h>
++#include <string.h>
+ #include <inc_iostream.h>
+ #include <time.h>
+
+@@ -19,12 +20,6 @@
+ #include "IconObject.h"
+
+
+-// which platform require this one?
+-// (not SGI, and Linux get compiler errors
+-// because of different types...!)
+-//extern char *sys_errlist[];
+-extern int sys_nerr;
+-
+ //static std::string logTimeStamp();
+
+ Log::Log(IconObject* o):
+@@ -80,12 +75,7 @@ const Path& Log::path()
+
+ ostream& Log::syserr(ostream& s)
+ {
+- int e = errno;
+-
+- if(e>0 && e < sys_nerr)
+- s << " (" << sys_errlist[e] << ") " ;
+- else
+- s << " (errno = " << e << ") ";
++ s << " (" << strerror(errno) << ") " ;
+ return s;
+ }
+
+@@ -138,4 +128,4 @@ ostream& Log::find(IconObject* o)
+ string str;
+ str=string(buf);
+ return str;
+-}*/
+\ No newline at end of file
++}*/
+Index: metview-4.4.8+dfsg.1/src/MetviewUI/Log.cc
+===================================================================
+--- metview-4.4.8+dfsg.1.orig/src/MetviewUI/Log.cc
++++ metview-4.4.8+dfsg.1/src/MetviewUI/Log.cc
+@@ -26,12 +26,7 @@
+ #include "IconObject.h"
+ #endif
+
+-
+-// which platform require this one?
+-// (not SGI, and Linux get compiler errors
+-// because of different types...!)
+-//extern char *sys_errlist[];
+-extern int sys_nerr;
++#include <string.h>
+
+
+ Log::Log(IconObject* o):
+@@ -85,11 +80,7 @@ const Path& Log::path()
+ ostream& Log::syserr(ostream& s)
+ {
+ int e = errno;
+-
+- if(e>0 && e < sys_nerr)
+- s << " (" << sys_errlist[e] << ") " ;
+- else
+- s << " (errno = " << e << ") ";
++ s << " (" << strerror(e) << ") " ;
+ return s;
+ }
+
+Index: metview-4.4.8+dfsg.1/src/libMars-ecregrid/mars.h
+===================================================================
+--- metview-4.4.8+dfsg.1.orig/src/libMars-ecregrid/mars.h
++++ metview-4.4.8+dfsg.1/src/libMars-ecregrid/mars.h
+@@ -61,13 +61,8 @@
+
+
+ #include <errno.h>
+-#if !defined(linux) && !defined(CYGWIN)
+ #ifdef VMS
+ #include <sys/perror.h>
+-#else
+-extern char *sys_errlist[];
+-extern int sys_nerr;
+-#endif
+ #endif
+
+ #ifdef sun
+Index: metview-4.4.8+dfsg.1/src/libMars/mars.h
+===================================================================
+--- metview-4.4.8+dfsg.1.orig/src/libMars/mars.h
++++ metview-4.4.8+dfsg.1/src/libMars/mars.h
+@@ -61,13 +61,8 @@
+
+
+ #include <errno.h>
+-#if !defined(linux) && !defined(CYGWIN)
+ #ifdef VMS
+ #include <sys/perror.h>
+-#else
+-extern char *sys_errlist[];
+-extern int sys_nerr;
+-#endif
+ #endif
+
+ #ifdef sun
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/metview.git
More information about the debian-science-commits
mailing list