[SCM] qtbase packaging branch, kubuntu_unstable, updated. debian/5.4.0+dfsg-4-25-g199b71b

[Rohan Garg]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=ef2b09f

The following commit has been merged in the kubuntu_unstable branch:
commit ef2b09f7cd77c4cc167f52669354bd175b946c39
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Mon Feb 9 12:49:42 2015 -0300

    Revert "Update gnukfreebsd.diff."
    
    This reverts commit f67865ce1785477fc8e1dbd001b2887a73195874.
---
 debian/changelog                | 1 -
 debian/patches/gnukfreebsd.diff | 8 ++++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 00cacc4..4b16005 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,7 +24,6 @@ qtbase-opensource-src (5.4.0+dfsg-5) UNRELEASED; urgency=medium
     Thanks Andreas Beckmann for the report.
   * Remove the patches Pino replaced above as they are already present
     in this version of the code.
-  * Update gnukfreebsd.diff to continue applying.
   * Add libinput-dev as build dependency, a test is looking for it.
 
   [ Dmitry Shachnev ]
diff --git a/debian/patches/gnukfreebsd.diff b/debian/patches/gnukfreebsd.diff
index 3dd47c2..63d5951 100644
--- a/debian/patches/gnukfreebsd.diff
+++ b/debian/patches/gnukfreebsd.diff
@@ -2,7 +2,7 @@ Author: Pino Toscano <toscano.pino at tiscali.it>
 Description: Initial GNU/kFreeBSD support
  - add a gnukfreebsd-g++ qmake mkspec, mostly copied from the hurd-g++ one
  - properly use LD_LIBRARY_PATH on GNU/* systems
-Last-Update: 2015-02-07
+Last-Update: 2014-12-31
 Forwarded: no
 
 ---
@@ -157,12 +157,12 @@ Forwarded: no
 +#endif // QPLATFORMDEFS_H
 --- a/mkspecs/features/qt_functions.prf
 +++ b/mkspecs/features/qt_functions.prf
-@@ -266,6 +266,8 @@ defineTest(qtAddTargetEnv) {
+@@ -265,6 +265,8 @@ defineTest(qtAddTargetEnv) {
              deppath.name = PATH
          } else:contains(QMAKE_HOST.os, Linux|FreeBSD|OpenBSD|NetBSD|DragonFly|SunOS|HP-UX|QNX|GNU) {
              deppath.name = LD_LIBRARY_PATH
 +        } else:contains(QMAKE_HOST.os, ^GNU/.*) {
 +            deppath.name = LD_LIBRARY_PATH
-         } else:contains(QMAKE_HOST.os, Haiku) {
-             deppath.name = LIBRARY_PATH
          } else:equals(QMAKE_HOST.os, Darwin) {
+             contains(QT_CONFIG, qt_framework): \
+                 deppath.name = DYLD_FRAMEWORK_PATH

-- 
qtbase packaging