[SCM] kdelibs4support packaging branch, master, updated. debian/5.28.0-2-12-g437d3e5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kdelibs4support.git;a=commitdiff;h=b9f36b4

The following commit has been merged in the master branch:
commit b9f36b46247bc89ed724913535558078de85bfb4
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Sat Jul 8 06:59:22 2017 +0200

    Add new patch: kmimetypetest-accept-application-x-sharedlib-for-executab.patch
---
 debian/patches/incomplete_header                   |  2 +-
 ...cept-application-x-sharedlib-for-executab.patch | 58 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 debian/patches/standarddirs_test                   |  2 +-
 4 files changed, 61 insertions(+), 2 deletions(-)

diff --git a/debian/patches/incomplete_header b/debian/patches/incomplete_header
index ed16d83..a1da8b8 100644
--- a/debian/patches/incomplete_header
+++ b/debian/patches/incomplete_header
@@ -8,7 +8,7 @@ Subject: incomplete_header
  1 file changed, 6 deletions(-)
 
 diff --git a/src/includes/CMakeLists.txt b/src/includes/CMakeLists.txt
-index 56bb1006..8abef221 100644
+index 56bb100..8abef22 100644
 --- a/src/includes/CMakeLists.txt
 +++ b/src/includes/CMakeLists.txt
 @@ -467,12 +467,6 @@ if (UNIX)
diff --git a/debian/patches/kmimetypetest-accept-application-x-sharedlib-for-executab.patch b/debian/patches/kmimetypetest-accept-application-x-sharedlib-for-executab.patch
new file mode 100644
index 0000000..b36b166
--- /dev/null
+++ b/debian/patches/kmimetypetest-accept-application-x-sharedlib-for-executab.patch
@@ -0,0 +1,58 @@
+From: Maximiliano Curia <maxy at gnuservers.com.ar>
+Date: Sat, 8 Jul 2017 06:49:19 +0200
+Subject: kmimetypetest: accept application/x-sharedlib for executables
+
+When the binaries are compiled with -pie the executables may report
+"application/x-sharedlib" as their mimetype.
+
+Also, move the executable test to the by content.
+---
+ autotests/kmimetypetest.cpp | 28 ++++++++++++++++++++--------
+ 1 file changed, 20 insertions(+), 8 deletions(-)
+
+diff --git a/autotests/kmimetypetest.cpp b/autotests/kmimetypetest.cpp
+index 5341a20..b5ceba6 100644
+--- a/autotests/kmimetypetest.cpp
++++ b/autotests/kmimetypetest.cpp
+@@ -254,14 +254,6 @@ void KMimeTypeTest::testFindByPathUsingFileName_data()
+     QTest::newRow("doesn't exist but has known extension") << "IDontExist.txt" << "text/plain";
+     QTest::newRow("png image") << QFINDTESTDATA("image.png") << "image/png";
+ 
+-    const QString exePath = QStandardPaths::findExecutable("cmake");
+-    QVERIFY2(!exePath.isEmpty(), "cmake not found. Isn't it in your $PATH?");
+-#ifdef Q_OS_WIN
+-    const QString executableType = QString::fromLatin1("application/x-ms-dos-executable");
+-#else
+-    const QString executableType = QString::fromLatin1("application/x-executable");
+-#endif
+-    QTest::newRow("executable") << exePath << executableType;
+ }
+ 
+ void KMimeTypeTest::testFindByPathUsingFileName()
+@@ -348,6 +340,26 @@ void KMimeTypeTest::testFindByPathWithContent()
+         QVERIFY(mime);
+         QCOMPARE(mime->name(), QString::fromLatin1("text/plain"));
+     }
++
++    {
++        const QString fileName = QStandardPaths::findExecutable("cmake");
++        QVERIFY2(!fileName.isEmpty(), "cmake not found. Isn't it in your $PATH?");
++
++        KMimeType::Ptr mime = KMimeType::findByPath(fileName);
++        QVERIFY(mime);
++
++#ifdef Q_OS_WIN
++        QCOMPARE(mime->name(), QString::fromLatin1("application/x-ms-dos-executable"));
++#else
++        // The mime type can be application/x-sharedlib when the binaries
++        // compiled with -pie
++        if (mime->name() == QString::fromLatin1("application/x-sharedlib")) {
++            QCOMPARE(mime->name(), QString::fromLatin1("application/x-sharedlib"));
++        } else {
++            QCOMPARE(mime->name(), QString::fromLatin1("application/x-executable"));
++        }
++#endif
++    }
+ }
+ 
+ void KMimeTypeTest::testFindByUrl()
diff --git a/debian/patches/series b/debian/patches/series
index ab1aa54..13de454 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 incomplete_header
 standarddirs_test
+kmimetypetest-accept-application-x-sharedlib-for-executab.patch
diff --git a/debian/patches/standarddirs_test b/debian/patches/standarddirs_test
index 7866510..22333b0 100644
--- a/debian/patches/standarddirs_test
+++ b/debian/patches/standarddirs_test
@@ -8,7 +8,7 @@ Subject: standarddirs_test
  1 file changed, 25 insertions(+), 11 deletions(-)
 
 diff --git a/autotests/kstandarddirstest.cpp b/autotests/kstandarddirstest.cpp
-index 30301163..38519714 100644
+index de6150d..14bb5ac 100644
 --- a/autotests/kstandarddirstest.cpp
 +++ b/autotests/kstandarddirstest.cpp
 @@ -108,9 +108,10 @@ void KStandarddirsTest::testResourceDirs()

-- 
kdelibs4support packaging