Date: Wednesday, February 8, 2017 @ 03:13:04 Author: bgyorgy Revision: 211094
upgpkg: qcad 3.16.4.4-1 - Update to new version. - Remove unused qtwebkit dependency. - Install files under /usr/lib instead of /usr/share, because the directory contains binaries. - Use desktop file provided by upstream. Modified: qcad/trunk/PKGBUILD Deleted: qcad/trunk/QCad.desktop --------------+ PKGBUILD | 39 +++++++++++++++++++-------------------- QCad.desktop | 9 --------- 2 files changed, 19 insertions(+), 29 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-02-08 02:35:42 UTC (rev 211093) +++ PKGBUILD 2017-02-08 03:13:04 UTC (rev 211094) @@ -5,28 +5,29 @@ # Contributor: Daniel J Griffiths <[email protected]> pkgname=qcad -pkgver=3.16.0.0 +pkgver=3.16.4.4 pkgrel=1 pkgdesc="A 2D CAD package based upon Qt" arch=('i686' 'x86_64') url="http://www.qcad.org"; license=('GPL3') -depends=('qtwebkit') -makedepends=('glu' 'gdb') -options=('libtool') -source=($pkgname-$pkgver.tar.gz::https://github.com/qcad/qcad/archive/v${pkgver}.tar.gz - QCad.desktop) -sha256sums=('4563a2909415fe19e66a9304316be3ba31bc632cfc3d9c971795a7af84720a4d' - '1e194dcf59122098be0219fa220a0a3f33cf8919f0a778b6cd888da009efc6d5') +depends=('qt4') +makedepends=('glu') +source=($pkgname-$pkgver.tar.gz::https://github.com/qcad/qcad/archive/v${pkgver}.tar.gz) +sha256sums=('47adfbadff4b00dea4640d67d8db40f7933213d3201488e8abb439615c1faf91') prepare() { cd "$srcdir"/qcad-$pkgver + + # remove unused qtwebkit dependency + sed -i '/QT += webkit/d' shared.pri + sed -i '/webkit/d' src/3rdparty/qt-labs-qtscriptgenerator-4.*/qtbindings/qtbindings.pro } build() { cd "$srcdir"/qcad-$pkgver - qmake-qt4 -r - make all -j1 + qmake-qt4 qcad.pro + make } package() { @@ -36,29 +37,27 @@ find . \( -name '*.pri' -or -name '.pro' -or -name '*.ts' \) -delete find . \( -name 'Makefile' -name '.gitignore' \) -delete - install -dm755 "$pkgdir"/usr/share/{qcad,pixmaps,applications} - cp -r examples fonts libraries linetypes patterns plugins scripts ts "$pkgdir"/usr/share/qcad - cp debug/* "$pkgdir"/usr/share/qcad + install -dm755 "$pkgdir"/usr/lib/qcad + cp -r examples fonts libraries linetypes patterns plugins scripts ts "$pkgdir"/usr/lib/qcad + cp release/* "$pkgdir"/usr/lib/qcad - install -m755 readme.txt "$pkgdir"/usr/share/qcad/readme.txt + install -m755 readme.txt "$pkgdir"/usr/lib/qcad/readme.txt - # qtwebkit - ln -sf /usr/lib/qt4/plugins/designer/libqwebview.so "$pkgdir"/usr/share/qcad/plugins/designer/libqwebview.so # qt for sofiles in /usr/lib/qt4/plugins/imageformats/*.so do - ln -sf ${sofiles} "$pkgdir"/usr/share/qcad/plugins/imageformats/${sofiles##/*/} + ln -sf ${sofiles} "$pkgdir"/usr/lib/qcad/plugins/imageformats/${sofiles##/*/} done for sofiles in /usr/lib/qt4/plugins/sqldrivers/*.so do - ln -sf ${sofiles} "$pkgdir"/usr/share/qcad/plugins/sqldrivers/${sofiles##/*/} + ln -sf ${sofiles} "$pkgdir"/usr/lib/qcad/plugins/sqldrivers/${sofiles##/*/} done install -Dm644 scripts/qcad_icon.png "$pkgdir"/usr/share/pixmaps/qcad_icon.png - install -Dm644 "$srcdir"/QCad.desktop "$pkgdir"/usr/share/applications/QCad.desktop + install -Dm644 qcad.desktop "$pkgdir"/usr/share/applications/qcad.desktop install -dm0755 "$pkgdir"/usr/bin - echo -e '#!/bin/sh\nLD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}"/usr/share/qcad" exec /usr/share/qcad/qcad-bin "$@"' >"$pkgdir"/usr/bin/qcad + echo -e '#!/bin/sh\nLD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}"/usr/lib/qcad" exec /usr/lib/qcad/qcad-bin "$@"' >"$pkgdir"/usr/bin/qcad chmod 0755 "$pkgdir"/usr/bin/qcad } Deleted: QCad.desktop =================================================================== --- QCad.desktop 2017-02-08 02:35:42 UTC (rev 211093) +++ QCad.desktop 2017-02-08 03:13:04 UTC (rev 211094) @@ -1,9 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Exec=/usr/bin/qcad -Icon=/usr/share/pixmaps/qcad_icon.png -Name=QCad -StartupNotify=true -Terminal=false -Type=Application -Categories=Application;Development;Electronics;Engineering;
