Date: Monday, August 1, 2022 @ 11:40:49 Author: idevolder Revision: 1259649
archrelease: copy trunk to community-x86_64 Added: qcad/repos/community-x86_64/PKGBUILD (from rev 1259648, qcad/trunk/PKGBUILD) qcad/repos/community-x86_64/RRulerQt.patch (from rev 1259648, qcad/trunk/RRulerQt.patch) qcad/repos/community-x86_64/qt5.15.patch (from rev 1259648, qcad/trunk/qt5.15.patch) Deleted: qcad/repos/community-x86_64/PKGBUILD qcad/repos/community-x86_64/RRulerQt.patch qcad/repos/community-x86_64/qt5.15.patch ----------------+ PKGBUILD | 185 +++++++++++++++++++++++++++---------------------------- RRulerQt.patch | 40 +++++------ qt5.15.patch | 24 +++---- 3 files changed, 125 insertions(+), 124 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2022-08-01 11:40:42 UTC (rev 1259648) +++ PKGBUILD 2022-08-01 11:40:49 UTC (rev 1259649) @@ -1,92 +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.27.6.7 -pkgrel=2 -pkgdesc='A 2D CAD package based upon Qt' -arch=('x86_64') -url="https://www.qcad.org" -license=('GPL3') -options=(debug) -depends=('qt5-script' 'qt5-svg' 'gcc-libs' 'qt5-xmlpatterns' 'qt5-tools' 'qt5-wayland') -makedepends=('glu') -source=("$pkgname-$pkgver.tar.gz::https://github.com/qcad/qcad/archive/v${pkgver}.tar.gz") -sha512sums=('120234870c3dcb328edeee0744cb0388fc128bac99e4ada0bd87a48c7b4cbd62238f9ca14d8d59ce0995aa7c64a7c63dd402c68e253b18952b847ab61d462c5a') - -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 1259648, qcad/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2022-08-01 11:40:49 UTC (rev 1259649) @@ -0,0 +1,93 @@ +# 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.27.6.7 +pkgrel=3 +pkgdesc='A 2D CAD package based upon Qt' +arch=('x86_64') +url="https://www.qcad.org" +license=('GPL3') +options=(debug) +depends=('qt5-script' 'qt5-svg' 'gcc-libs' 'qt5-xmlpatterns' 'qt5-tools' 'qt5-wayland') +makedepends=('glu') +source=("$pkgname-$pkgver.tar.gz::https://github.com/qcad/qcad/archive/v${pkgver}.tar.gz") +sha512sums=('120234870c3dcb328edeee0744cb0388fc128bac99e4ada0bd87a48c7b4cbd62238f9ca14d8d59ce0995aa7c64a7c63dd402c68e253b18952b847ab61d462c5a') + +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 + cp -r /usr/lib/qt/plugins/{wayland-decoration-client,wayland-graphics-integration-client,wayland-graphics-integration-server,wayland-shell-integration} "$pkgdir/usr/lib/qcad/plugins/" + #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 +} Deleted: RRulerQt.patch =================================================================== --- RRulerQt.patch 2022-08-01 11:40:42 UTC (rev 1259648) +++ RRulerQt.patch 2022-08-01 11:40:49 UTC (rev 1259649) @@ -1,20 +0,0 @@ -diff --git a/src/gui/RRulerQt.h b/src/gui/RRulerQt.h -index 5c1cdd910..48817da0b 100644 ---- a/src/gui/RRulerQt.h -+++ b/src/gui/RRulerQt.h -@@ -1,6 +1,6 @@ - /** - * Copyright (c) 2011-2018 by Andrew Mustun. All rights reserved. -- * -+ * - * This file is part of the QCAD project. - * - * QCAD is free software: you can redistribute it and/or modify -@@ -24,6 +24,7 @@ - - #include <QFrame> - #include <QMetaType> -+#include <QPainterPath> - - #include "RCoordinateListener.h" - #include "RRuler.h" Copied: qcad/repos/community-x86_64/RRulerQt.patch (from rev 1259648, qcad/trunk/RRulerQt.patch) =================================================================== --- RRulerQt.patch (rev 0) +++ RRulerQt.patch 2022-08-01 11:40:49 UTC (rev 1259649) @@ -0,0 +1,20 @@ +diff --git a/src/gui/RRulerQt.h b/src/gui/RRulerQt.h +index 5c1cdd910..48817da0b 100644 +--- a/src/gui/RRulerQt.h ++++ b/src/gui/RRulerQt.h +@@ -1,6 +1,6 @@ + /** + * Copyright (c) 2011-2018 by Andrew Mustun. All rights reserved. +- * ++ * + * This file is part of the QCAD project. + * + * QCAD is free software: you can redistribute it and/or modify +@@ -24,6 +24,7 @@ + + #include <QFrame> + #include <QMetaType> ++#include <QPainterPath> + + #include "RCoordinateListener.h" + #include "RRuler.h" Deleted: qt5.15.patch =================================================================== --- qt5.15.patch 2022-08-01 11:40:42 UTC (rev 1259648) +++ qt5.15.patch 2022-08-01 11:40:49 UTC (rev 1259649) @@ -1,12 +0,0 @@ -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" Copied: qcad/repos/community-x86_64/qt5.15.patch (from rev 1259648, qcad/trunk/qt5.15.patch) =================================================================== --- qt5.15.patch (rev 0) +++ qt5.15.patch 2022-08-01 11:40:49 UTC (rev 1259649) @@ -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"