diff --git a/convertall/PKGBUILD b/convertall/PKGBUILD index 573b871d5..eab69ae0f 100644 --- a/convertall/PKGBUILD +++ b/convertall/PKGBUILD @@ -1,40 +1,27 @@ pkgname=convertall -pkgver=0.7.2 +pkgver=0.7.5 pkgrel=1 pkgdesc="Unit conversion program (Qt)" arch=('x86_64') -url="http://convertall.bellz.org/" +url="https://convertall.bellz.org/" license=('GPL') -depends=('python3-pyqt5') +depends=('python3-pyqt5' 'desktop-file-utils') categories=('utils') -source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz - "correctpaths.patch" - "convertall.desktop") -sha256sums=('9d465d12fbb45f88359b1d80619658143b203014157f65843917c1f63337c8a4' - '366ea0e23197b469402c2b3d6cdf4a77388813b91254d1ce3603e6cd0787fc3b' - '939c566d8015b6b0ab8dc82ba5161643c25c8619bd81b7d165c03eda33669ccb') +source=(https://downloads.sourceforge.net/sourceforge/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz) +sha1sums=('eefe59873e4fc0d905ca79272796694107b08924') package() { -# patch executable to have the correct paths -patch -Np0 < $srcdir/correctpaths.patch + cd ConvertAll -# create install directories - install -d $pkgdir/usr/{bin,share/pixmaps} + python3 install.py -b "${pkgdir}" -p /usr -i /usr/share/pixmaps/convertall + rm "${pkgdir}/usr/share/doc/${pkgname}"/{INSTALL,LICENSE} -# copy files manually -cp -rf $srcdir/ConvertAll/source $pkgdir/usr/share/$pkgname -cp -rf $srcdir/ConvertAll/icons $pkgdir/usr/share/$pkgname -cp -rf $srcdir/ConvertAll/doc $pkgdir/usr/share/$pkgname/help -cp -rf $srcdir/ConvertAll/data $pkgdir/usr/share/$pkgname - -# create symlink in /usr/bin -ln -s /usr/share/$pkgname/$pkgname.py $pkgdir/usr/bin/$pkgname - -# install desktop file -install -Dm644 $srcdir/$pkgname.desktop \ - $pkgdir/usr/share/applications/$pkgname.desktop - -# symlink icon in /usr/share/pixmaps -ln -s /usr/share/$pkgname/icons/$pkgname.svg \ - $pkgdir/usr/share/pixmaps/$pkgname.svg + install -Dm644 icons/convertall-icon.svg \ + "${pkgdir}/usr/share/icons/hicolor/scalable/apps/convertall.svg" + install -Dm644 icons/convertall_lg.png \ + "${pkgdir}/usr/share/icons/hicolor/64x64/apps/convertall.png" + install -Dm644 icons/convertall_med.png \ + "${pkgdir}/usr/share/icons/hicolor/32x32/apps/convertall.png" + install -Dm644 icons/convertall_sm.png \ + "${pkgdir}/usr/share/icons/hicolor/16x16/apps/convertall.png" } diff --git a/convertall/convertall.desktop b/convertall/convertall.desktop deleted file mode 100644 index b9995b415..000000000 --- a/convertall/convertall.desktop +++ /dev/null @@ -1,14 +0,0 @@ -[Desktop Entry] -Version=1.0 -Name=ConvertAll -Name[it]=ConvertAll -GenericName=Unit Converter -GenericName[it]=Convertitore di Unità -Comment=Convert between many different units -Comment[it]=Convertitore per molte unità di misura -Icon=convertall -Exec=convertall -Terminal=false -Type=Application -Categories=Science - diff --git a/convertall/correctpaths.patch b/convertall/correctpaths.patch deleted file mode 100644 index 759b7f202..000000000 --- a/convertall/correctpaths.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- ConvertAll/source/convertall.py 2008-05-28 12:51:46.000000000 +0200 -+++ ConvertAll/source/convertall.py.new 2008-05-29 11:54:27.000000000 +0200 -@@ -17,9 +17,9 @@ - __version__ = '0.4.2' - __author__ = 'Doug Bell' - --dataFilePath = None # modified by install script if required --helpFilePath = None # modified by install script if required --iconPath = None # modified by install script if required -+dataFilePath = '/usr/share/convertall/data' -+helpFilePath = '/usr/share/convertall/help' -+iconPath = '/usr/share/convertall/icons' - translationPath = 'translations' - lang = '' - diff --git a/convertall/use-default-qt-style.patch b/convertall/use-default-qt-style.patch deleted file mode 100644 index 6f186975a..000000000 --- a/convertall/use-default-qt-style.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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)