No longer set ENABLE_LIBKDEINIT_RUNPATH for kdelibs5-dev (>= 4:4.6.1).

Since kdelibs5-dev 4.6.1, ENABLE_LIBKDEINIT_RUNPATH defaults to ON whenever
CMAKE_BUILD_TYPE is Debian.

4 files changed, 19 insertions, 5 deletions

diff --git a/datalib/kde4_flags b/datalib/kde4_flags
index 55cf51c..1e59860 100644
--- a/datalib/kde4_flags
+++ b/datalib/kde4_flags
@@ -1,2 +1 @@
 -DCMAKE_BUILD_TYPE=Debian
--DENABLE_LIBKDEINIT_RUNPATH:BOOL=ON
diff --git a/debian/changelog b/debian/changelog
index 78d0ac1..69c2505 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ pkg-kde-tools (0.12.0~pre3) UNRELEASED; urgency=low
 
   * Implement and add DebianABIManager. Refer to
     /usr/share/doc/pkg-kde-tools/README.DebianABIManager for more information.
+  * Since kdelibs5-dev 4.6.1, ENABLE_LIBKDEINIT_RUNPATH defaults to ON whenever
+    CMAKE_BUILD_TYPE is Debian.
 
  -- Modestas Vainius <modax@debian.org>  Fri, 25 Mar 2011 23:47:26 +0200
 
diff --git a/makefiles/1/variables.mk b/makefiles/1/variables.mk
index 58dc003..ab8f3c2 100644
--- a/makefiles/1/variables.mk
+++ b/makefiles/1/variables.mk
@@ -14,6 +14,13 @@ DEB_KDELIBS5_DEV_VER_OLD := $(shell dpkg --compare-versions $(DEB_KDELIBS5_DEV_V
 ifeq (yes,$(DEB_KDELIBS5_DEV_VER_OLD))
     DEB_CMAKE_KDE4_FLAGS += -DCMAKE_SKIP_RPATH:BOOL=ON
 endif
+# Manually set ENABLE_LIBKDEINIT_RUNPATH:BOOL=ON if kdelibs5-dev is
+# older than 4:4.6.1. Later kdelibs5-dev revisions enable this
+# automatically whenever CMAKE_BUILD_TYPE is set to Debian (default)
+DEB_KDELIBS5_DEV_VER_OLD := $(shell dpkg --compare-versions $(DEB_KDELIBS5_DEV_VER) lt 4:4.6.1 2>/dev/null && echo yes)
+ifeq (yes,$(DEB_KDELIBS5_DEV_VER_OLD))
+    DEB_CMAKE_KDE4_FLAGS += -DENABLE_LIBKDEINIT_RUNPATH:BOOL=ON
+endif
 
 # Set the DEB_KDE_LINK_WITH_AS_NEEDED to yes to enable linking
 # with --as-needed (off by default)
diff --git a/perllib/Debian/Debhelper/Buildsystem/kde.pm b/perllib/Debian/Debhelper/Buildsystem/kde.pm
index cc4e994..5a4a5bb 100644
--- a/perllib/Debian/Debhelper/Buildsystem/kde.pm
+++ b/perllib/Debian/Debhelper/Buildsystem/kde.pm
@@ -51,11 +51,17 @@ sub configure {
     my $this=shift;
     my @flags = $this->get_kde4_flags();
 
-    # Skip RPATH if kdelibs5-dev is older than 4:4.4.0
     my $kdever = `dpkg-query -f='\${Version}' -W kdelibs5-dev 2>/dev/null`;
-    if ($kdever && Dpkg::Version::version_compare($kdever, "4:4.4.0") < 0)
-    {
-        push @flags, "-DCMAKE_SKIP_RPATH:BOOL=ON";
+    if ($kdever) {
+        if (Dpkg::Version::version_compare($kdever, "4:4.4.0") < 0) {
+            # Skip RPATH if kdelibs5-dev is older than 4:4.4.0
+            push @flags, "-DCMAKE_SKIP_RPATH:BOOL=ON";
+        } elsif (Dpkg::Version::version_compare($kdever, "4:4.6.1") < 0) {
+            # Manually set ENABLE_LIBKDEINIT_RUNPATH:BOOL=ON if kdelibs5-dev is
+            # older than 4:4.6.1. Later kdelibs5-dev revisions enable this
+            # automatically whenever CMAKE_BUILD_TYPE is set to Debian (default)
+            push @flags, "-DENABLE_LIBKDEINIT_RUNPATH:BOOL=ON";
+        }
     }
 
     return $this->SUPER::configure(@flags, @_);