[arch-commits] Commit in unetbootin/trunk (5 files)

[Alexander Rødseth]

    Date: Tuesday, January 13, 2015 @ 16:16:04
  Author: arodseth
Revision: 125875

Fix for FS#42030

Added:
  unetbootin/trunk/unetbootin.sh
  unetbootin/trunk/unetbootin_polkit.sh
Modified:
  unetbootin/trunk/PKGBUILD
  unetbootin/trunk/org.archlinux.pkexec.unetbootin.policy
Deleted:
  unetbootin/trunk/unetbootin_polkit

----------------------+
 PKGBUILD             |   24 +++++++++++++++++-------
 unetbootin.sh        |    3 +++
 unetbootin_polkit    |    6 ------
 unetbootin_polkit.sh |   11 +++++++++++
 4 files changed, 31 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-01-13 13:41:23 UTC (rev 125874)
+++ PKGBUILD	2015-01-13 15:16:04 UTC (rev 125875)
@@ -6,21 +6,24 @@
 
 pkgname=unetbootin
 pkgver=608
-pkgrel=1
+pkgrel=2
 arch=('x86_64' 'i686')
 license=('GPL')
 pkgdesc='Create bootable Live USB drives'
 url='http://unetbootin.sourceforge.net/'
 depends=('syslinux' 'p7zip' 'qt4' 'mtools')
-optdepends=('polkit: run unetbootin directly from menu')
+optdepends=('polkit: run unetbootin directly from menu'
+            'zenity: display an error if no authentication agent is found')
 makedepends=('setconf')
 install="$pkgname.install"
 source=("http://downloads.sourceforge.net/project/$pkgname/UNetbootin/$pkgver/$pkgname-source-$pkgver.tar.gz"
         'org.archlinux.pkexec.unetbootin.policy'
-        'unetbootin_polkit')
+        'unetbootin_polkit.sh'
+        'unetbootin.sh')
 sha256sums=('ce99c5f60b1f66da0ceb41859ce9198d96b3061b949b167fc952d3951b632080'
-            'd7cc55f8d7340be08c33d40443d413f8c15d8d012c29cab98ac5ab5a0fc57fb3'
-            'b662e7082873602e9c224a291752e3c2274fb751018bfa23a7560f79c6ecb88f')
+            'fa9bb53d90cb10a0ab8dd317ed6a3506b228b0e26ed2ed8b108b5990f641641a'
+            '6399c6a44b270a4ec67a36e3914c7c2f47a9008efb0133a33f92d9ad4284cc57'
+            'c59c486c0e74fbb23b842c28328937d8c2f8bbf00428711e33dec900a3a7140c')
 
 prepare() {
   setconf unetbootin.desktop Exec /usr/bin/unetbootin_polkit
@@ -32,9 +35,14 @@
 
 package() {
   install -d "$pkgdir/usr/share/$pkgname"
-  install -Dm755 "$pkgname" "$pkgdir/usr/bin/$pkgname"
-  install -m755 "${pkgname}_polkit" "$pkgdir/usr/bin/${pkgname}_polkit"
   install -m644 "$pkgname"_*.qm "$pkgdir/usr/share/$pkgname/"
+
+  # Executables
+  install -Dm755 "$pkgname" "$pkgdir/usr/bin/$pkgname.elf"
+  install -m755 "${pkgname}_polkit.sh" "$pkgdir/usr/bin/${pkgname}_polkit"
+  install -m755 "${pkgname}.sh" "$pkgdir/usr/bin/${pkgname}"
+
+  # Desktop shortcut/icon
   install -Dm644 "$pkgname.desktop" \
     "$pkgdir/usr/share/applications/$pkgname.desktop"
   for i in 16 22 24 32 48 256; do
@@ -41,6 +49,8 @@
     install -Dm644 "${pkgname}_${i}.png" \
       "$pkgdir/usr/share/icons/hicolor/${i}x${i}/apps/$pkgname.png"
   done
+
+  # Polkit policy
   install -Dm644 'org.archlinux.pkexec.unetbootin.policy' \
     "$pkgdir/usr/share/polkit-1/actions/org.archlinux.pkexec.unetbootin.policy"
 }

Modified: org.archlinux.pkexec.unetbootin.policy
===================================================================
(Binary files differ)

Added: unetbootin.sh
===================================================================
--- unetbootin.sh	                        (rev 0)
+++ unetbootin.sh	2015-01-13 15:16:04 UTC (rev 125875)
@@ -0,0 +1,3 @@
+#!/bin/sh
+# See FS#42030 for more information about the QT_X11_NO_MITSHM=1 workaround
+QT_X11_NO_MITSHM=1 /usr/bin/unetbootin.elf "$@"

Deleted: unetbootin_polkit
===================================================================
--- unetbootin_polkit	2015-01-13 13:41:23 UTC (rev 125874)
+++ unetbootin_polkit	2015-01-13 15:16:04 UTC (rev 125875)
@@ -1,6 +0,0 @@
-#!/bin/bash
-if [ $(which pkexec) ]; then
-	pkexec --disable-internal-agent "/usr/bin/unetbootin" "$@"
-else
-	/usr/bin/unetbootin "$@"
-fi

Added: unetbootin_polkit.sh
===================================================================
--- unetbootin_polkit.sh	                        (rev 0)
+++ unetbootin_polkit.sh	2015-01-13 15:16:04 UTC (rev 125875)
@@ -0,0 +1,11 @@
+#!/bin/bash
+export QT_X11_NO_MITSHM=1
+if [ $(which pkexec) ]; then
+  pkexec --disable-internal-agent "/usr/bin/unetbootin.elf" "$@" 2>/tmp/_polkit_error
+  if [ -s /tmp/_polkit_error ]; then
+    zenity --error --text="`cat /tmp/_polkit_error`"
+    rm /tmp/_polkit_error
+  fi
+else
+  /usr/bin/unetbootin.elf "$@"
+fi