From 3d7315790105b56ce8809bd75c302f7723454054 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sun, 26 Dec 2010 15:27:09 +0000
Subject: polkit-qt-1-0.99.0

svn path=/nixpkgs/trunk/; revision=25283
---
 .../kde-4.6/support/polkit-qt-1/default.nix        |  6 ++++--
 .../kde-4.6/support/polkit-qt-1/policy-files.patch | 25 ++++++++++++++++++++++
 2 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/desktops/kde-4.6/support/polkit-qt-1/policy-files.patch

(limited to 'pkgs/desktops')

diff --git a/pkgs/desktops/kde-4.6/support/polkit-qt-1/default.nix b/pkgs/desktops/kde-4.6/support/polkit-qt-1/default.nix
index 9ff43ef5f9b..2d528c84542 100644
--- a/pkgs/desktops/kde-4.6/support/polkit-qt-1/default.nix
+++ b/pkgs/desktops/kde-4.6/support/polkit-qt-1/default.nix
@@ -7,11 +7,13 @@ kde.package rec {
   src = fetchurl {
     url = with meta.kde;
       "mirror://kde/stable/apps/KDE4.x/admin/${name}-${version}.tar.bz2";
-    sha256 = "1ng5bi1gmr5lg49c5kyqyjzbjhs4w90c2zlnfcyviv9p3wzfgzbr";
+    sha256 = "02m710q34aapbmnz1p6qwgkk5xjmm239zdl3lvjg77dh3j0w5i3r";
   };
 
+  patches = [ ./policy-files.patch ];
+
   meta.kde = {
     name = "polkit-qt-1";
-    version = "0.96.1";
+    version = "0.99.0";
   };
 }
diff --git a/pkgs/desktops/kde-4.6/support/polkit-qt-1/policy-files.patch b/pkgs/desktops/kde-4.6/support/polkit-qt-1/policy-files.patch
new file mode 100644
index 00000000000..f179c962a58
--- /dev/null
+++ b/pkgs/desktops/kde-4.6/support/polkit-qt-1/policy-files.patch
@@ -0,0 +1,25 @@
+From 2791059a4c930c7eb5e4a3233ef997e69187c4d1 Mon Sep 17 00:00:00 2001
+From: Yury G. Kudryashov <urkud.urkud@gmail.com>
+Date: Fri, 24 Dec 2010 16:00:04 +0300
+Subject: [PATCH] Don't let packages install policy files outside of their installation prefix
+
+---
+ PolkitQt-1Config.cmake.in |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/PolkitQt-1Config.cmake.in b/PolkitQt-1Config.cmake.in
+index 1356de7..4c55719 100644
+--- a/PolkitQt-1Config.cmake.in
++++ b/PolkitQt-1Config.cmake.in
+@@ -15,7 +15,7 @@ endif(NOT POLKITQT-1_INSTALL_DIR)
+ 
+ set(POLKITQT-1_INCLUDE_DIR              "@INCLUDE_INSTALL_DIR@/polkit-qt-1")
+ set(POLKITQT-1_LIB_DIR                  "@LIB_INSTALL_DIR@")
+-set(POLKITQT-1_POLICY_FILES_INSTALL_DIR "${POLKITQT-1_INSTALL_DIR}/share/polkit-1/actions")
++set(POLKITQT-1_POLICY_FILES_INSTALL_DIR "share/polkit-1/actions")
+ 
+ # Compatibility
+ if(WIN32)
+-- 
+1.7.3.2
+
-- 
cgit 1.4.1