[SCM] jovie packaging branch, master, updated. debian/4.10.5-1-3-geedde30

Maximiliano Curia maxy at alioth.debian.org
Tue Sep 3 17:17:11 UTC 2013


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/jovie.git;a=commitdiff;h=eedde30

The following commit has been merged in the master branch:
commit eedde30801b11f8a8a2863ba50a1b247ef9928ee
Author: Maximiliano Curia <maxy at debian.org>
Date:   Mon Jul 15 12:10:26 2013 +0200

    New path: no_MAXPATHLEN_in_hurd.patch to fix build in hurd.
---
 debian/changelog                           |    2 +-
 debian/patches/no_MAXPATHLEN_in_hurd.patch |   28 ++++++++++++++++++++++++++++
 debian/patches/series                      |    1 +
 3 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 20c479c..b32cc9f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 jovie (4:4.10.5-2) UNRELEASED; urgency=low
 
-  * 
+  * New path: no_MAXPATHLEN_in_hurd.patch to fix build in hurd.
 
  -- Maximiliano Curia <maxy at debian.org>  Mon, 15 Jul 2013 11:36:30 +0200
 
diff --git a/debian/patches/no_MAXPATHLEN_in_hurd.patch b/debian/patches/no_MAXPATHLEN_in_hurd.patch
new file mode 100644
index 0000000..3c57dea
--- /dev/null
+++ b/debian/patches/no_MAXPATHLEN_in_hurd.patch
@@ -0,0 +1,28 @@
+Description: Remove MAXPATHLEN dependency
+ This patch uses the POSIX.1-2008 definition of realpath
+Author: Maximiliano Curia <maxy at debian.org>
+Forwarded: no
+Last-Update: 2013-07-15
+Index: jovie/libkttsd/filterconf.cpp
+===================================================================
+--- jovie.orig/libkttsd/filterconf.cpp	2013-07-15 12:02:25.991241599 +0200
++++ jovie/libkttsd/filterconf.cpp	2013-07-15 12:04:12.274929925 +0200
+@@ -153,13 +153,14 @@
+ 
+ /*static*/ QString KttsFilterConf::realFilePath(const QString &filename)
+ {
+-    char realpath_buffer[MAXPATHLEN + 1];
+-    memset(realpath_buffer, 0, MAXPATHLEN + 1);
++    char *realpath_buffer;
+ 
+     /* If the path contains symlinks, get the real name */
+-    if (realpath( QFile::encodeName(filename).data(), realpath_buffer) != 0) {
++    if ((realpath_buffer = realpath( QFile::encodeName(filename).data(), NULL)) != NULL) {
+         //succes, use result from realpath
+-        return QFile::decodeName(realpath_buffer);
++        QString result = QFile::decodeName(realpath_buffer);
++        free(realpath_buffer);
++        return result;
+     }
+     return filename;
+ }
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..f8edbc4
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+no_MAXPATHLEN_in_hurd.patch

-- 
jovie packaging



More information about the pkg-kde-commits mailing list