summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authormaz-12015-12-02 12:33:20 +0800
committermaz-12015-12-02 12:33:20 +0800
commit0c98d21cafd1ead431995724d4b7670b062ac5d3 (patch)
tree108afdcf6040f62a1872aff4274770de793f67fc
parentcb6aab0bfebe35511df074b0cdaf03edc12c17dd (diff)
downloadaur-0c98d21cafd1ead431995724d4b7670b062ac5d3.tar.gz
fix
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD6
-rw-r--r--kndiswrapper.gui.policy20
-rw-r--r--qt5.patch2
4 files changed, 4 insertions, 26 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 437f1c7ac560..7d2a80dfdaf3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -14,8 +14,6 @@ pkgbase = kndiswrapper-qt5
conflicts = kndiswrapper
source = http://ftp.riken.jp/Linux/momonga/development/source/SOURCES/kndiswrapper-0.4.0.tgz
source = qt5.patch
- source = kndiswrapper.gui.policy
- sha1sums = SKIP
sha1sums = SKIP
sha1sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 315198a6a3a9..82516536cbcd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,8 +9,8 @@ depends=('qt5-base' 'ndiswrapper' 'polkit')
makedepends=('qt5-tools')
provides=kndiswrapper
conflicts=kndiswrapper
-source=("http://ftp.riken.jp/Linux/momonga/development/source/SOURCES/kndiswrapper-${pkgver}.tgz" "qt5.patch" "kndiswrapper.gui.policy")
-sha1sums=('SKIP' 'SKIP' 'SKIP')
+source=("http://ftp.riken.jp/Linux/momonga/development/source/SOURCES/kndiswrapper-${pkgver}.tgz" "qt5.patch")
+sha1sums=('SKIP' 'SKIP')
prepare() {
cd "$srcdir/kndiswrapper-${pkgver}"
@@ -20,5 +20,5 @@ prepare() {
package() {
cd "$srcdir/kndiswrapper-${pkgver}"
./install.sh "$pkgdir"
- install -Dm755 "${srcdir}/kndiswrapper.gui.policy" "$pkgdir/usr/share/polkit-1/actions/kndiswrapper.gui.policy"
+ #install -Dm755 "${srcdir}/kndiswrapper.gui.policy" "$pkgdir/usr/share/polkit-1/actions/kndiswrapper.gui.policy"
}
diff --git a/kndiswrapper.gui.policy b/kndiswrapper.gui.policy
deleted file mode 100644
index 61b08e3d6621..000000000000
--- a/kndiswrapper.gui.policy
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE policyconfig PUBLIC
- "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
-<policyconfig>
-
- <action id="org.freedesktop.policykit.pkexec.run-kndiswrapper">
- <description>Run KNDISWrapper</description>
- <description xml:lang="zh_CN">运行KNDISWrapper</description>
- <message>Authentication is required to run KNDISWrapper</message>
- <defaults>
- <allow_any>no</allow_any>
- <allow_inactive>no</allow_inactive>
- <allow_active>auth_admin_keep</allow_active>
- </defaults>
- <annotate key="org.freedesktop.policykit.exec.path">/usr/bin/kndiswrapper</annotate>
- <annotate key="org.freedesktop.policykit.exec.allow_gui">TRUE</annotate>
- </action>
-
-</policyconfig> \ No newline at end of file
diff --git a/qt5.patch b/qt5.patch
index 17a86f8d6454..acb1c99e0b97 100644
--- a/qt5.patch
+++ b/qt5.patch
@@ -80,7 +80,7 @@ diff -Naur a/install.sh b/install.sh
Comment[de]=Eine GUI fuer ndiswrapper.
-Exec=/usr/bin/kndiswrapper
-Icon=/usr/share/kndiswrapper/kndiswrapper.png
-+Exec=pkexec kndiswrapper
++Exec=pkexec env DISPLAY=$DISPLAY XAUTHORITY=$XAUTHORITY kndiswrapper
+Icon=kndiswrapper
Terminal=false
Type=Application