[arch-commits] Commit in unetbootin/repos (18 files)
Alexander Rødseth
arodseth at archlinux.org
Tue Jan 13 15:16:20 UTC 2015
Date: Tuesday, January 13, 2015 @ 16:16:20
Author: arodseth
Revision: 125876
archrelease: copy trunk to community-x86_64, community-i686
Added:
unetbootin/repos/community-i686/PKGBUILD
(from rev 125875, unetbootin/trunk/PKGBUILD)
unetbootin/repos/community-i686/org.archlinux.pkexec.unetbootin.policy
(from rev 125875, unetbootin/trunk/org.archlinux.pkexec.unetbootin.policy)
unetbootin/repos/community-i686/unetbootin.install
(from rev 125875, unetbootin/trunk/unetbootin.install)
unetbootin/repos/community-i686/unetbootin.sh
(from rev 125875, unetbootin/trunk/unetbootin.sh)
unetbootin/repos/community-i686/unetbootin_polkit.sh
(from rev 125875, unetbootin/trunk/unetbootin_polkit.sh)
unetbootin/repos/community-x86_64/PKGBUILD
(from rev 125875, unetbootin/trunk/PKGBUILD)
unetbootin/repos/community-x86_64/org.archlinux.pkexec.unetbootin.policy
(from rev 125875, unetbootin/trunk/org.archlinux.pkexec.unetbootin.policy)
unetbootin/repos/community-x86_64/unetbootin.install
(from rev 125875, unetbootin/trunk/unetbootin.install)
unetbootin/repos/community-x86_64/unetbootin.sh
(from rev 125875, unetbootin/trunk/unetbootin.sh)
unetbootin/repos/community-x86_64/unetbootin_polkit.sh
(from rev 125875, unetbootin/trunk/unetbootin_polkit.sh)
Deleted:
unetbootin/repos/community-i686/PKGBUILD
unetbootin/repos/community-i686/org.archlinux.pkexec.unetbootin.policy
unetbootin/repos/community-i686/unetbootin.install
unetbootin/repos/community-i686/unetbootin_polkit
unetbootin/repos/community-x86_64/PKGBUILD
unetbootin/repos/community-x86_64/org.archlinux.pkexec.unetbootin.policy
unetbootin/repos/community-x86_64/unetbootin.install
unetbootin/repos/community-x86_64/unetbootin_polkit
---------------------------------------+
/PKGBUILD | 116 ++++++++++++++++++++++++++++++++
/unetbootin.install | 26 +++++++
community-i686/PKGBUILD | 48 -------------
community-i686/unetbootin.install | 13 ---
community-i686/unetbootin.sh | 3
community-i686/unetbootin_polkit | 6 -
community-i686/unetbootin_polkit.sh | 11 +++
community-x86_64/PKGBUILD | 48 -------------
community-x86_64/unetbootin.install | 13 ---
community-x86_64/unetbootin.sh | 3
community-x86_64/unetbootin_polkit | 6 -
community-x86_64/unetbootin_polkit.sh | 11 +++
12 files changed, 170 insertions(+), 134 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2015-01-13 15:16:04 UTC (rev 125875)
+++ community-i686/PKGBUILD 2015-01-13 15:16:20 UTC (rev 125876)
@@ -1,48 +0,0 @@
-# $Id$
-# Maintainer: Alexander Rødseth <rodseth at gmail.com>
-# Contributor: Det <nimetonmaili at gmail a-dot com>
-# Contributor: Godane aka Christopher Rogers <slaxemulator at gmail.com>
-# Contributor: Michai Coman <mihai at m1x.ro>
-
-pkgname=unetbootin
-pkgver=608
-pkgrel=1
-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')
-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')
-sha256sums=('ce99c5f60b1f66da0ceb41859ce9198d96b3061b949b167fc952d3951b632080'
- 'd7cc55f8d7340be08c33d40443d413f8c15d8d012c29cab98ac5ab5a0fc57fb3'
- 'b662e7082873602e9c224a291752e3c2274fb751018bfa23a7560f79c6ecb88f')
-
-prepare() {
- setconf unetbootin.desktop Exec /usr/bin/unetbootin_polkit
-}
-
-build() {
- ./build-nostatic 1> output.log 2> error.log
-}
-
-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/"
- install -Dm644 "$pkgname.desktop" \
- "$pkgdir/usr/share/applications/$pkgname.desktop"
- for i in 16 22 24 32 48 256; do
- install -Dm644 "${pkgname}_${i}.png" \
- "$pkgdir/usr/share/icons/hicolor/${i}x${i}/apps/$pkgname.png"
- done
- install -Dm644 'org.archlinux.pkexec.unetbootin.policy' \
- "$pkgdir/usr/share/polkit-1/actions/org.archlinux.pkexec.unetbootin.policy"
-}
-
-# vim:set ts=2 sw=2 et:
Copied: unetbootin/repos/community-i686/PKGBUILD (from rev 125875, unetbootin/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2015-01-13 15:16:20 UTC (rev 125876)
@@ -0,0 +1,58 @@
+# $Id$
+# Maintainer: Alexander Rødseth <rodseth at gmail.com>
+# Contributor: Det <nimetonmaili at gmail a-dot com>
+# Contributor: Godane aka Christopher Rogers <slaxemulator at gmail.com>
+# Contributor: Michai Coman <mihai at m1x.ro>
+
+pkgname=unetbootin
+pkgver=608
+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'
+ '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.sh'
+ 'unetbootin.sh')
+sha256sums=('ce99c5f60b1f66da0ceb41859ce9198d96b3061b949b167fc952d3951b632080'
+ 'fa9bb53d90cb10a0ab8dd317ed6a3506b228b0e26ed2ed8b108b5990f641641a'
+ '6399c6a44b270a4ec67a36e3914c7c2f47a9008efb0133a33f92d9ad4284cc57'
+ 'c59c486c0e74fbb23b842c28328937d8c2f8bbf00428711e33dec900a3a7140c')
+
+prepare() {
+ setconf unetbootin.desktop Exec /usr/bin/unetbootin_polkit
+}
+
+build() {
+ ./build-nostatic 1> output.log 2> error.log
+}
+
+package() {
+ install -d "$pkgdir/usr/share/$pkgname"
+ 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
+ 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"
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: community-i686/org.archlinux.pkexec.unetbootin.policy
===================================================================
(Binary files differ)
Copied: unetbootin/repos/community-i686/org.archlinux.pkexec.unetbootin.policy (from rev 125875, unetbootin/trunk/org.archlinux.pkexec.unetbootin.policy)
===================================================================
(Binary files differ)
Deleted: community-i686/unetbootin.install
===================================================================
--- community-i686/unetbootin.install 2015-01-13 15:16:04 UTC (rev 125875)
+++ community-i686/unetbootin.install 2015-01-13 15:16:20 UTC (rev 125876)
@@ -1,13 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
-
-# vim:set ts=2 sw=2 et:
Copied: unetbootin/repos/community-i686/unetbootin.install (from rev 125875, unetbootin/trunk/unetbootin.install)
===================================================================
--- community-i686/unetbootin.install (rev 0)
+++ community-i686/unetbootin.install 2015-01-13 15:16:20 UTC (rev 125876)
@@ -0,0 +1,13 @@
+post_install() {
+ xdg-icon-resource forceupdate
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
+
+# vim:set ts=2 sw=2 et:
Copied: unetbootin/repos/community-i686/unetbootin.sh (from rev 125875, unetbootin/trunk/unetbootin.sh)
===================================================================
--- community-i686/unetbootin.sh (rev 0)
+++ community-i686/unetbootin.sh 2015-01-13 15:16:20 UTC (rev 125876)
@@ -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: community-i686/unetbootin_polkit
===================================================================
--- community-i686/unetbootin_polkit 2015-01-13 15:16:04 UTC (rev 125875)
+++ community-i686/unetbootin_polkit 2015-01-13 15:16:20 UTC (rev 125876)
@@ -1,6 +0,0 @@
-#!/bin/bash
-if [ $(which pkexec) ]; then
- pkexec --disable-internal-agent "/usr/bin/unetbootin" "$@"
-else
- /usr/bin/unetbootin "$@"
-fi
Copied: unetbootin/repos/community-i686/unetbootin_polkit.sh (from rev 125875, unetbootin/trunk/unetbootin_polkit.sh)
===================================================================
--- community-i686/unetbootin_polkit.sh (rev 0)
+++ community-i686/unetbootin_polkit.sh 2015-01-13 15:16:20 UTC (rev 125876)
@@ -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
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2015-01-13 15:16:04 UTC (rev 125875)
+++ community-x86_64/PKGBUILD 2015-01-13 15:16:20 UTC (rev 125876)
@@ -1,48 +0,0 @@
-# $Id$
-# Maintainer: Alexander Rødseth <rodseth at gmail.com>
-# Contributor: Det <nimetonmaili at gmail a-dot com>
-# Contributor: Godane aka Christopher Rogers <slaxemulator at gmail.com>
-# Contributor: Michai Coman <mihai at m1x.ro>
-
-pkgname=unetbootin
-pkgver=608
-pkgrel=1
-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')
-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')
-sha256sums=('ce99c5f60b1f66da0ceb41859ce9198d96b3061b949b167fc952d3951b632080'
- 'd7cc55f8d7340be08c33d40443d413f8c15d8d012c29cab98ac5ab5a0fc57fb3'
- 'b662e7082873602e9c224a291752e3c2274fb751018bfa23a7560f79c6ecb88f')
-
-prepare() {
- setconf unetbootin.desktop Exec /usr/bin/unetbootin_polkit
-}
-
-build() {
- ./build-nostatic 1> output.log 2> error.log
-}
-
-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/"
- install -Dm644 "$pkgname.desktop" \
- "$pkgdir/usr/share/applications/$pkgname.desktop"
- for i in 16 22 24 32 48 256; do
- install -Dm644 "${pkgname}_${i}.png" \
- "$pkgdir/usr/share/icons/hicolor/${i}x${i}/apps/$pkgname.png"
- done
- install -Dm644 'org.archlinux.pkexec.unetbootin.policy' \
- "$pkgdir/usr/share/polkit-1/actions/org.archlinux.pkexec.unetbootin.policy"
-}
-
-# vim:set ts=2 sw=2 et:
Copied: unetbootin/repos/community-x86_64/PKGBUILD (from rev 125875, unetbootin/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2015-01-13 15:16:20 UTC (rev 125876)
@@ -0,0 +1,58 @@
+# $Id$
+# Maintainer: Alexander Rødseth <rodseth at gmail.com>
+# Contributor: Det <nimetonmaili at gmail a-dot com>
+# Contributor: Godane aka Christopher Rogers <slaxemulator at gmail.com>
+# Contributor: Michai Coman <mihai at m1x.ro>
+
+pkgname=unetbootin
+pkgver=608
+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'
+ '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.sh'
+ 'unetbootin.sh')
+sha256sums=('ce99c5f60b1f66da0ceb41859ce9198d96b3061b949b167fc952d3951b632080'
+ 'fa9bb53d90cb10a0ab8dd317ed6a3506b228b0e26ed2ed8b108b5990f641641a'
+ '6399c6a44b270a4ec67a36e3914c7c2f47a9008efb0133a33f92d9ad4284cc57'
+ 'c59c486c0e74fbb23b842c28328937d8c2f8bbf00428711e33dec900a3a7140c')
+
+prepare() {
+ setconf unetbootin.desktop Exec /usr/bin/unetbootin_polkit
+}
+
+build() {
+ ./build-nostatic 1> output.log 2> error.log
+}
+
+package() {
+ install -d "$pkgdir/usr/share/$pkgname"
+ 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
+ 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"
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: community-x86_64/org.archlinux.pkexec.unetbootin.policy
===================================================================
(Binary files differ)
Copied: unetbootin/repos/community-x86_64/org.archlinux.pkexec.unetbootin.policy (from rev 125875, unetbootin/trunk/org.archlinux.pkexec.unetbootin.policy)
===================================================================
(Binary files differ)
Deleted: community-x86_64/unetbootin.install
===================================================================
--- community-x86_64/unetbootin.install 2015-01-13 15:16:04 UTC (rev 125875)
+++ community-x86_64/unetbootin.install 2015-01-13 15:16:20 UTC (rev 125876)
@@ -1,13 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
-
-# vim:set ts=2 sw=2 et:
Copied: unetbootin/repos/community-x86_64/unetbootin.install (from rev 125875, unetbootin/trunk/unetbootin.install)
===================================================================
--- community-x86_64/unetbootin.install (rev 0)
+++ community-x86_64/unetbootin.install 2015-01-13 15:16:20 UTC (rev 125876)
@@ -0,0 +1,13 @@
+post_install() {
+ xdg-icon-resource forceupdate
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
+
+# vim:set ts=2 sw=2 et:
Copied: unetbootin/repos/community-x86_64/unetbootin.sh (from rev 125875, unetbootin/trunk/unetbootin.sh)
===================================================================
--- community-x86_64/unetbootin.sh (rev 0)
+++ community-x86_64/unetbootin.sh 2015-01-13 15:16:20 UTC (rev 125876)
@@ -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: community-x86_64/unetbootin_polkit
===================================================================
--- community-x86_64/unetbootin_polkit 2015-01-13 15:16:04 UTC (rev 125875)
+++ community-x86_64/unetbootin_polkit 2015-01-13 15:16:20 UTC (rev 125876)
@@ -1,6 +0,0 @@
-#!/bin/bash
-if [ $(which pkexec) ]; then
- pkexec --disable-internal-agent "/usr/bin/unetbootin" "$@"
-else
- /usr/bin/unetbootin "$@"
-fi
Copied: unetbootin/repos/community-x86_64/unetbootin_polkit.sh (from rev 125875, unetbootin/trunk/unetbootin_polkit.sh)
===================================================================
--- community-x86_64/unetbootin_polkit.sh (rev 0)
+++ community-x86_64/unetbootin_polkit.sh 2015-01-13 15:16:20 UTC (rev 125876)
@@ -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
More information about the arch-commits
mailing list