rev 20300 - in kde-extras/kmplayer/trunk/debian: . patches

[Pino Toscano]

Author: pino
Date: 2016-01-17 16:59:55 +0000 (Sun, 17 Jan 2016)
New Revision: 20300

Added:
   kde-extras/kmplayer/trunk/debian/patches/
   kde-extras/kmplayer/trunk/debian/patches/aarch64.diff
   kde-extras/kmplayer/trunk/debian/patches/gcc5.diff
   kde-extras/kmplayer/trunk/debian/patches/series
Modified:
   kde-extras/kmplayer/trunk/debian/changelog
Log:
import NMU 1:0.11.3d-2.1


Modified: kde-extras/kmplayer/trunk/debian/changelog
===================================================================
--- kde-extras/kmplayer/trunk/debian/changelog	2016-01-17 16:37:24 UTC (rev 20299)
+++ kde-extras/kmplayer/trunk/debian/changelog	2016-01-17 16:59:55 UTC (rev 20300)
@@ -1,3 +1,11 @@
+kmplayer (1:0.11.3d-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix build with GCC 5. Closes: #777928.
+  * Fix build on AArch64. Closes: #770966.
+
+ -- Matthias Klose <doko at debian.org>  Tue, 14 Jul 2015 18:08:14 +0200
+
 kmplayer (1:0.11.3d-2) unstable; urgency=low
 
   * Upload to unstable

Added: kde-extras/kmplayer/trunk/debian/patches/aarch64.diff
===================================================================
--- kde-extras/kmplayer/trunk/debian/patches/aarch64.diff	                        (rev 0)
+++ kde-extras/kmplayer/trunk/debian/patches/aarch64.diff	2016-01-17 16:59:55 UTC (rev 20300)
@@ -0,0 +1,57 @@
+Index: b/src/moz-sdk/prcpucfg.h
+===================================================================
+--- a/src/moz-sdk/prcpucfg.h
++++ b/src/moz-sdk/prcpucfg.h
+@@ -288,6 +288,52 @@
+ #define PR_BYTES_PER_WORD_LOG2  3
+ #define PR_BYTES_PER_DWORD_LOG2 3
+ 
++#elif defined(__aarch64__)
++
++#define IS_LITTLE_ENDIAN 1
++#undef  IS_BIG_ENDIAN
++#define IS_64
++
++#define PR_BYTES_PER_BYTE   1
++#define PR_BYTES_PER_SHORT  2
++#define PR_BYTES_PER_INT    4
++#define PR_BYTES_PER_INT64  8
++#define PR_BYTES_PER_LONG   8
++#define PR_BYTES_PER_FLOAT  4
++#define PR_BYTES_PER_DOUBLE 8
++#define PR_BYTES_PER_WORD   8
++#define PR_BYTES_PER_DWORD  8
++
++#define PR_BITS_PER_BYTE    8
++#define PR_BITS_PER_SHORT   16
++#define PR_BITS_PER_INT     32
++#define PR_BITS_PER_INT64   64
++#define PR_BITS_PER_LONG    64
++#define PR_BITS_PER_FLOAT   32
++#define PR_BITS_PER_DOUBLE  64
++#define PR_BITS_PER_WORD    64
++
++#define PR_BITS_PER_BYTE_LOG2   3
++#define PR_BITS_PER_SHORT_LOG2  4
++#define PR_BITS_PER_INT_LOG2    5
++#define PR_BITS_PER_INT64_LOG2  6
++#define PR_BITS_PER_LONG_LOG2   6
++#define PR_BITS_PER_FLOAT_LOG2  5
++#define PR_BITS_PER_DOUBLE_LOG2 6
++#define PR_BITS_PER_WORD_LOG2   6
++
++#define PR_ALIGN_OF_SHORT   2
++#define PR_ALIGN_OF_INT     4
++#define PR_ALIGN_OF_LONG    8
++#define PR_ALIGN_OF_INT64   8
++#define PR_ALIGN_OF_FLOAT   4
++#define PR_ALIGN_OF_DOUBLE  8
++#define PR_ALIGN_OF_POINTER 8
++#define PR_ALIGN_OF_WORD    8
++
++#define PR_BYTES_PER_WORD_LOG2  3
++#define PR_BYTES_PER_DWORD_LOG2 3
++
+ #elif defined(__mc68000__)
+ 
+ #undef  IS_LITTLE_ENDIAN

Added: kde-extras/kmplayer/trunk/debian/patches/gcc5.diff
===================================================================
--- kde-extras/kmplayer/trunk/debian/patches/gcc5.diff	                        (rev 0)
+++ kde-extras/kmplayer/trunk/debian/patches/gcc5.diff	2016-01-17 16:59:55 UTC (rev 20300)
@@ -0,0 +1,13 @@
+Index: b/src/kmplayerplaylist.cpp
+===================================================================
+--- a/src/kmplayerplaylist.cpp
++++ b/src/kmplayerplaylist.cpp
+@@ -371,7 +371,7 @@ void TreeNode<Node>::appendChild (Node *
+ }
+ 
+ template <>
+-KDE_NO_EXPORT void TreeNode<Node>::insertBefore (Node *c, Node *b) {
++void TreeNode<Node>::insertBefore (Node *c, Node *b) {
+     ASSERT (!c->parentNode ());
+     static_cast <Node *> (this)->document()->m_tree_version++;
+     insertBeforeImpl (c, b);

Added: kde-extras/kmplayer/trunk/debian/patches/series
===================================================================
--- kde-extras/kmplayer/trunk/debian/patches/series	                        (rev 0)
+++ kde-extras/kmplayer/trunk/debian/patches/series	2016-01-17 16:59:55 UTC (rev 20300)
@@ -0,0 +1,2 @@
+gcc5.diff
+aarch64.diff