From 1601dfdd974c1e80be99f8cdcdbd76ad7fb12dd9 Mon Sep 17 00:00:00 2001 From: Fabien Valthier Date: Thu, 14 Apr 2011 15:32:26 +0200 Subject: [PATCH] update convertall and patch to use default qt style --- convertall/PKGBUILD | 11 +++++++---- convertall/use-default-qt-style.patch | 11 +++++++++++ 2 files changed, 18 insertions(+), 4 deletions(-) create mode 100644 convertall/use-default-qt-style.patch diff --git a/convertall/PKGBUILD b/convertall/PKGBUILD index 9e789c2e5..0d9e2a3fd 100644 --- a/convertall/PKGBUILD +++ b/convertall/PKGBUILD @@ -7,22 +7,25 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf pkgname=convertall -pkgver=0.5.0 -pkgrel=2 +pkgver=0.5.1 +pkgrel=1 pkgdesc="Unit conversion program (Qt)" arch=('i686' 'x86_64') url="http://convertall.bellz.org/" license=('GPL') depends=('pyqt') source=(http://download.berlios.de/$pkgname/$pkgname-$pkgver.tar.gz \ - correctpaths.patch convertall.desktop) -md5sums=('96ea0910af63d2056fe87cee3aa7031e' + correctpaths.patch use-default-qt-style.patch convertall.desktop) +md5sums=('4f19e4f027c6cec590f842569b1ae7a0' 'e4f5c5d58f728b292f625c38771d2779' + '595e958ffa448334becf73940d6303d9' 'aae44cb1f36847340411d77b1a6d00cd') build() { # patch executable to have the correct paths patch -Np0 < $srcdir/correctpaths.patch || return 1 +#patch to correct the qt style used +patch -Np0 < ${srcdir}/use-default-qt-style.patch || return 1 # create install directories install -d $pkgdir/usr/{bin,share/pixmaps} diff --git a/convertall/use-default-qt-style.patch b/convertall/use-default-qt-style.patch new file mode 100644 index 000000000..6f186975a --- /dev/null +++ b/convertall/use-default-qt-style.patch @@ -0,0 +1,11 @@ +--- ConvertAll/source/convertall.py.old 2011-04-14 15:21:48.409861085 +0200 ++++ ConvertAll/source/convertall.py 2011-04-14 15:22:56.159494054 +0200 +@@ -151,8 +151,6 @@ + setupTranslator(app) # must be before importing any convertall modules + setLocalEncoding() + import convertdlg +- if not userStyle and not sys.platform.startswith('win'): +- QtGui.QApplication.setStyle('plastique') + win = convertdlg.ConvertDlg() + win.show() + signal.signal(signal.SIGINT, signal.SIG_IGN)