[arch-commits] Commit in qcad/repos/community-x86_64 (5 files)
Ike Devolder
idevolder at archlinux.org
Thu Jul 30 19:18:32 UTC 2020
Date: Thursday, July 30, 2020 @ 19:18:31
Author: idevolder
Revision: 665967
archrelease: copy trunk to community-x86_64
Added:
qcad/repos/community-x86_64/PKGBUILD
(from rev 665966, qcad/trunk/PKGBUILD)
qcad/repos/community-x86_64/RRulerQt.patch
(from rev 665966, qcad/trunk/RRulerQt.patch)
qcad/repos/community-x86_64/qt5.15.patch
(from rev 665966, qcad/trunk/qt5.15.patch)
Deleted:
qcad/repos/community-x86_64/PKGBUILD
qcad/repos/community-x86_64/qt5.15.patch
----------------+
PKGBUILD | 188 +++++++++++++++++++++++++++----------------------------
RRulerQt.patch | 20 +++++
qt5.15.patch | 24 +++----
3 files changed, 126 insertions(+), 106 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-07-30 19:18:24 UTC (rev 665966)
+++ PKGBUILD 2020-07-30 19:18:31 UTC (rev 665967)
@@ -1,94 +0,0 @@
-# Maintainer: BlackIkeEagle <ike DOT devolder AT gmail DOT com>
-# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: Stefan Husmann <stefan-husmann at t-online.de>
-# Contributor: Giovanni Scafora <linuxmania at gmail.com>
-# Contributor: Daniel J Griffiths <ghost1227 at 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/PKGBUILD (from rev 665966, qcad/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-07-30 19:18:31 UTC (rev 665967)
@@ -0,0 +1,94 @@
+# Maintainer: BlackIkeEagle <ike DOT devolder AT gmail DOT com>
+# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Stefan Husmann <stefan-husmann at t-online.de>
+# Contributor: Giovanni Scafora <linuxmania at gmail.com>
+# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
+
+pkgname=qcad
+pkgver=3.24.3.10
+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"
+ "RRulerQt.patch")
+sha512sums=('04c625c3e4900f8c5e2f907b43e9be96ad4f08b553b3b05cd2acbc7e3d8131fb74702b9a6d448fb313dcfbb757aec561f5fcbfa7394ac9d39aa8735907e29135'
+ 'bcb26699aab6d16f9d180553adc17b5698c8a41758fe45820d25c402f41c29543d9293571677165387ba1fb6293ece09ac1814f70972bcb79e1b43b8e092e1a7')
+
+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 "$srcdir/RRulerQt.patch"
+}
+
+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/RRulerQt.patch (from rev 665966, qcad/trunk/RRulerQt.patch)
===================================================================
--- RRulerQt.patch (rev 0)
+++ RRulerQt.patch 2020-07-30 19:18:31 UTC (rev 665967)
@@ -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 2020-07-30 19:18:24 UTC (rev 665966)
+++ qt5.15.patch 2020-07-30 19:18:31 UTC (rev 665967)
@@ -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 665966, qcad/trunk/qt5.15.patch)
===================================================================
--- qt5.15.patch (rev 0)
+++ qt5.15.patch 2020-07-30 19:18:31 UTC (rev 665967)
@@ -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"
More information about the arch-commits
mailing list