Date: Thursday, July 30, 2020 @ 19:00:19 Author: arojas Revision: 665963
archrelease: copy trunk to community-x86_64 Added: qcad/repos/community-x86_64/PKGBUILD (from rev 665962, qcad/trunk/PKGBUILD) qcad/repos/community-x86_64/qt5.15.patch (from rev 665962, qcad/trunk/qt5.15.patch) Deleted: qcad/repos/community-x86_64/PKGBUILD --------------+ PKGBUILD | 185 ++++++++++++++++++++++++++++----------------------------- qt5.15.patch | 12 +++ 2 files changed, 106 insertions(+), 91 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2020-07-30 19:00:05 UTC (rev 665962) +++ PKGBUILD 2020-07-30 19:00:19 UTC (rev 665963) @@ -1,91 +0,0 @@ -# Maintainer: BlackIkeEagle <ike DOT devolder AT gmail DOT com> -# Contributor: Sergej Pupykin <pupykin.s+a...@gmail.com> -# Contributor: Stefan Husmann <stefan-husm...@t-online.de> -# Contributor: Giovanni Scafora <linuxma...@gmail.com> -# Contributor: Daniel J Griffiths <ghost1...@archlinux.us> - -pkgname=qcad -pkgver=3.24.3.8 -pkgrel=1 -pkgdesc='A 2D CAD package based upon Qt' -arch=('x86_64') -url="https://www.qcad.org" -license=('GPL3') -depends=('qt5-script' 'qt5-svg' 'gcc-libs' 'qt5-xmlpatterns' 'qt5-tools') -makedepends=('glu') -source=("$pkgname-$pkgver.tar.gz::https://github.com/qcad/qcad/archive/v${pkgver}.tar.gz") -sha512sums=('2291b11dfade15d0a8f6702e65c1ef7f998279c90edb0271b31da3023f2c7aa1a66803473dd78a89e3ba4e9428922e0eda18f638234dc53105ab1b6c37af3305') - -prepare() { - rm *.tar.gz - cd qcad-$pkgver - sed -e 's|$${QT_VERSION}|5.5.0|g' \ - -i src/3rdparty/3rdparty.pro # Don't require specific Qt version -} - -build() { - cd qcad-$pkgver - qmake-qt5 qcad.pro - make -} - -package() { - cd qcad-$pkgver - - # remove project files - find . \( -name '*.pri' -or -name '.pro' -or -name '*.ts' \) -delete - find . \( -name 'Makefile' -name '.gitignore' \) -delete - - install -dm755 "$pkgdir"/usr/lib/qcad - cp -r examples fonts libraries linetypes patterns scripts themes ts \ - "$pkgdir"/usr/lib/qcad - cp release/{*.so,qcad-bin} "$pkgdir"/usr/lib/qcad - - # install man - install -Dm644 qcad.1 "$pkgdir"/usr/share/man/man1/qcad.1 - - # readme - install -Dm644 readme.txt "$pkgdir"/usr/lib/qcad/readme.txt - - # qt - cp -r plugins platforminputcontexts platforms xcbglintegrations \ - "$pkgdir"/usr/lib/qcad - #install -dm755 "$pkgdir"/usr/lib/qcad/plugins/{designer,imageformats,printsupport,sqldrivers} - #for sofiles in /usr/lib/qt/plugins/designer/*.so - #do - #ln -sf ${sofiles} "$pkgdir"/usr/lib/qcad/plugins/designer/${sofiles##/*/} - #done - #for sofiles in /usr/lib/qt/plugins/imageformats/*.so - #do - #ln -sf ${sofiles} "$pkgdir"/usr/lib/qcad/plugins/imageformats/${sofiles##/*/} - #done - #for sofiles in /usr/lib/qt/plugins/printsupport/*.so - #do - #ln -sf ${sofiles} "$pkgdir"/usr/lib/qcad/plugins/printsupport/${sofiles##/*/} - #done - #for sofiles in /usr/lib/qt/plugins/sqldrivers/*.so - #do - #ln -sf ${sofiles} "$pkgdir"/usr/lib/qcad/plugins/sqldrivers/${sofiles##/*/} - #done - #install -dm755 "$pkgdir"/usr/lib/qcad/{platforminputcontexts,platforms,xcbglintegrations} - #for sofiles in /usr/lib/qt/plugins/platforminputcontexts/*.so - #do - #ln -sf ${sofiles} "$pkgdir"/usr/lib/qcad/platforminputcontexts/${sofiles##/*/} - #done - #for sofiles in /usr/lib/qt/plugins/platforms/*.so - #do - #ln -sf ${sofiles} "$pkgdir"/usr/lib/qcad/platforms/${sofiles##/*/} - #done - #for sofiles in /usr/lib/qt/plugins/xcbglintegrations/*.so - #do - #ln -sf ${sofiles} "$pkgdir"/usr/lib/qcad/xcbglintegrations/${sofiles##/*/} - #done - - install -Dm644 scripts/qcad_icon.png "$pkgdir"/usr/share/pixmaps/qcad_icon.png - install -Dm644 qcad.desktop "$pkgdir"/usr/share/applications/qcad.desktop - - install -dm755 "$pkgdir"/usr/bin - 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 -} Copied: qcad/repos/community-x86_64/PKGBUILD (from rev 665962, qcad/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2020-07-30 19:00:19 UTC (rev 665963) @@ -0,0 +1,94 @@ +# Maintainer: BlackIkeEagle <ike DOT devolder AT gmail DOT com> +# Contributor: Sergej Pupykin <pupykin.s+a...@gmail.com> +# Contributor: Stefan Husmann <stefan-husm...@t-online.de> +# Contributor: Giovanni Scafora <linuxma...@gmail.com> +# Contributor: Daniel J Griffiths <ghost1...@archlinux.us> + +pkgname=qcad +pkgver=3.24.3.8 +pkgrel=2 +pkgdesc='A 2D CAD package based upon Qt' +arch=('x86_64') +url="https://www.qcad.org" +license=('GPL3') +depends=('qt5-script' 'qt5-svg' 'gcc-libs' 'qt5-xmlpatterns' 'qt5-tools') +makedepends=('glu') +source=("$pkgname-$pkgver.tar.gz::https://github.com/qcad/qcad/archive/v${pkgver}.tar.gz" + qt5.15.patch) +sha512sums=('2291b11dfade15d0a8f6702e65c1ef7f998279c90edb0271b31da3023f2c7aa1a66803473dd78a89e3ba4e9428922e0eda18f638234dc53105ab1b6c37af3305' + 'e7bf6df5535c34836366110e2550d4a89210e14d86593c1dab498360d4f32e3e0e9c4f3c5f796e05d0dad1d39bded2ab74a8f679725f8c03798f1fbb15dd5d69') + +prepare() { + rm *.tar.gz + cd qcad-$pkgver + sed -e 's|$${QT_VERSION}|5.5.0|g' \ + -i src/3rdparty/3rdparty.pro # Don't require specific Qt version + patch -p1 -i ../qt5.15.patch # Fix build with Qt 5.15 +} + +build() { + cd qcad-$pkgver + qmake-qt5 qcad.pro + make +} + +package() { + cd qcad-$pkgver + + # remove project files + find . \( -name '*.pri' -or -name '.pro' -or -name '*.ts' \) -delete + find . \( -name 'Makefile' -name '.gitignore' \) -delete + + install -dm755 "$pkgdir"/usr/lib/qcad + cp -r examples fonts libraries linetypes patterns scripts themes ts \ + "$pkgdir"/usr/lib/qcad + cp release/{*.so,qcad-bin} "$pkgdir"/usr/lib/qcad + + # install man + install -Dm644 qcad.1 "$pkgdir"/usr/share/man/man1/qcad.1 + + # readme + install -Dm644 readme.txt "$pkgdir"/usr/lib/qcad/readme.txt + + # qt + cp -r plugins platforminputcontexts platforms xcbglintegrations \ + "$pkgdir"/usr/lib/qcad + #install -dm755 "$pkgdir"/usr/lib/qcad/plugins/{designer,imageformats,printsupport,sqldrivers} + #for sofiles in /usr/lib/qt/plugins/designer/*.so + #do + #ln -sf ${sofiles} "$pkgdir"/usr/lib/qcad/plugins/designer/${sofiles##/*/} + #done + #for sofiles in /usr/lib/qt/plugins/imageformats/*.so + #do + #ln -sf ${sofiles} "$pkgdir"/usr/lib/qcad/plugins/imageformats/${sofiles##/*/} + #done + #for sofiles in /usr/lib/qt/plugins/printsupport/*.so + #do + #ln -sf ${sofiles} "$pkgdir"/usr/lib/qcad/plugins/printsupport/${sofiles##/*/} + #done + #for sofiles in /usr/lib/qt/plugins/sqldrivers/*.so + #do + #ln -sf ${sofiles} "$pkgdir"/usr/lib/qcad/plugins/sqldrivers/${sofiles##/*/} + #done + #install -dm755 "$pkgdir"/usr/lib/qcad/{platforminputcontexts,platforms,xcbglintegrations} + #for sofiles in /usr/lib/qt/plugins/platforminputcontexts/*.so + #do + #ln -sf ${sofiles} "$pkgdir"/usr/lib/qcad/platforminputcontexts/${sofiles##/*/} + #done + #for sofiles in /usr/lib/qt/plugins/platforms/*.so + #do + #ln -sf ${sofiles} "$pkgdir"/usr/lib/qcad/platforms/${sofiles##/*/} + #done + #for sofiles in /usr/lib/qt/plugins/xcbglintegrations/*.so + #do + #ln -sf ${sofiles} "$pkgdir"/usr/lib/qcad/xcbglintegrations/${sofiles##/*/} + #done + + install -Dm644 scripts/qcad_icon.png "$pkgdir"/usr/share/pixmaps/qcad_icon.png + install -Dm644 qcad.desktop "$pkgdir"/usr/share/applications/qcad.desktop + + install -dm755 "$pkgdir"/usr/bin + 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 +} Copied: qcad/repos/community-x86_64/qt5.15.patch (from rev 665962, qcad/trunk/qt5.15.patch) =================================================================== --- qt5.15.patch (rev 0) +++ qt5.15.patch 2020-07-30 19:00:19 UTC (rev 665963) @@ -0,0 +1,12 @@ +diff --git a/src/gui/RRulerQt.h b/src/gui/RRulerQt.h +index 5c1cdd910..8f250461c 100644 +--- a/src/gui/RRulerQt.h ++++ b/src/gui/RRulerQt.h +@@ -24,6 +24,7 @@ + + #include <QFrame> + #include <QMetaType> ++#include <QPainterPath> + + #include "RCoordinateListener.h" + #include "RRuler.h"