[Pkg-owncloud-commits] [owncloud-client] 01/02: Added upstream patch for build on 32bit systems

Sandro Knauß hefee-guest at moszumanska.debian.org
Mon Aug 24 18:22:54 UTC 2015


This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit eeb34ae130b37159d5844ad7efc5177177f90f88
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Mon Aug 24 19:24:12 2015 +0200

    Added upstream patch for build on 32bit systems
---
 debian/patches/series                              |  1 +
 .../patches/upstream_fix_constants_for_32bit.patch | 29 ++++++++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/debian/patches/series b/debian/patches/series
index 4893992..689dfdd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@
 0006-move-configfile.patch
 0007-move-translations.patch
 0008-make-reproducable.patch
+upstream_fix_constants_for_32bit.patch
diff --git a/debian/patches/upstream_fix_constants_for_32bit.patch b/debian/patches/upstream_fix_constants_for_32bit.patch
new file mode 100644
index 0000000..c463b06
--- /dev/null
+++ b/debian/patches/upstream_fix_constants_for_32bit.patch
@@ -0,0 +1,29 @@
+commit 6c5328e4cacc9aa8fbc6f96b5781266a84a1cbdc
+Author: Christian Kamm <mail at ckamm.de>
+Date:   Mon Aug 24 13:56:10 2015 +0200
+
+    Utility: Fix constants for 32-bit arch #3670
+
+diff --git a/src/libsync/utility.cpp b/src/libsync/utility.cpp
+index 9504ca7..5babf16 100644
+--- a/src/libsync/utility.cpp
++++ b/src/libsync/utility.cpp
+@@ -301,12 +301,12 @@ QString Utility::durationToDescriptiveString(quint64 msecs)
+ {
+     struct Period { const char *name; quint64 msec; };
+     Q_DECL_CONSTEXPR Period periods[] = {
+-        { QT_TRANSLATE_NOOP("Utility", "%Ln year(s)") , 365*24*3600*1000L },
+-        { QT_TRANSLATE_NOOP("Utility", "%Ln month(s)") , 30*24*3600*1000L },
+-        { QT_TRANSLATE_NOOP("Utility", "%Ln day(s)") , 24*3600*1000L },
+-        { QT_TRANSLATE_NOOP("Utility", "%Ln hour(s)") , 3600*1000L },
+-        { QT_TRANSLATE_NOOP("Utility", "%Ln minute(s)") , 60*1000L },
+-        { QT_TRANSLATE_NOOP("Utility", "%Ln second(s)") , 1000L },
++        { QT_TRANSLATE_NOOP("Utility", "%Ln year(s)") , 365*24*3600*1000LL },
++        { QT_TRANSLATE_NOOP("Utility", "%Ln month(s)") , 30*24*3600*1000LL },
++        { QT_TRANSLATE_NOOP("Utility", "%Ln day(s)") , 24*3600*1000LL },
++        { QT_TRANSLATE_NOOP("Utility", "%Ln hour(s)") , 3600*1000LL },
++        { QT_TRANSLATE_NOOP("Utility", "%Ln minute(s)") , 60*1000LL },
++        { QT_TRANSLATE_NOOP("Utility", "%Ln second(s)") , 1000LL },
+         { 0, 0 }
+     };
+ 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git



More information about the Pkg-owncloud-commits mailing list