diff options
| author | Michael Biebl <biebl@debian.org> | 2011-02-25 11:16:05 +0100 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2014-02-05 08:38:24 +0100 |
| commit | 5052359cd3ffb2ae94b31f915515609c07233547 (patch) | |
| tree | 7fd86d92ad4c6ab407c5ab278a571c67a968cd99 | |
| parent | 3345ebae1f163a59f601f27b54554b19ecda35e4 (diff) | |
Imported Debian patch 0.4+git.20110124t203624.00b6cce-2debian/0.4+git.20110124t203624.00b6cce-2
| -rw-r--r-- | debian/changelog | 9 | ||||
| -rw-r--r-- | debian/patches/0001-Use-type-glong-for-secs-and-usecs.patch | 33 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 43 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index e357946..33447f9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +modemmanager (0.4+git.20110124t203624.00b6cce-2) unstable; urgency=low + + * debian/patches/0001-Use-type-glong-for-secs-and-usecs.patch + - GVariant defines tv_usec as glong and suseconds_t is not guaranteed to + be of type long on sparc, resulting in a build failure. + So use type glong instead for sec and usecs. + + -- Michael Biebl <biebl@debian.org> Fri, 25 Feb 2011 11:16:05 +0100 + modemmanager (0.4+git.20110124t203624.00b6cce-1) unstable; urgency=low * Upload to unstable. diff --git a/debian/patches/0001-Use-type-glong-for-secs-and-usecs.patch b/debian/patches/0001-Use-type-glong-for-secs-and-usecs.patch new file mode 100644 index 0000000..dc8da09 --- /dev/null +++ b/debian/patches/0001-Use-type-glong-for-secs-and-usecs.patch @@ -0,0 +1,33 @@ +From c9772e14aa0bf4e252213b319b9211d7aef5bf15 Mon Sep 17 00:00:00 2001 +From: Michael Biebl <biebl@debian.org> +Date: Fri, 25 Feb 2011 11:08:18 +0100 +Subject: [PATCH] Use type glong for secs and usecs + +GVariant defines tv_sec and tv_usec as type glong and suseconds_t is not +guaranteed to be of type long on sparc, which results in a build +failure. + +http://lxr.free-electrons.com/source/arch/sparc/include/asm/posix_types.h#L41 +https://buildd.debian.org/fetch.cgi?pkg=modemmanager&arch=sparc&ver=0.4%2Bgit.20110124t203624.00b6cce-1&stamp=1298595733&file=log&as=raw +--- + src/mm-log.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/mm-log.c b/src/mm-log.c +index bcf806a..3e3bd83 100644 +--- a/src/mm-log.c ++++ b/src/mm-log.c +@@ -77,8 +77,8 @@ _mm_log (const char *loc, + g_get_current_time (&tv); + snprintf (&tsbuf[0], sizeof (tsbuf), " [%09ld.%06ld]", tv.tv_sec, tv.tv_usec); + } else if (ts_flags == TS_FLAG_REL) { +- time_t secs; +- suseconds_t usecs; ++ glong secs; ++ glong usecs; + + g_get_current_time (&tv); + secs = tv.tv_sec - rel_start.tv_sec; +-- +1.7.4.1 + diff --git a/debian/patches/series b/debian/patches/series index 235bfb9..68338fc 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ # patches for modemmanager qdl-blacklist.patch +0001-Use-type-glong-for-secs-and-usecs.patch |