diff options
| author | Paul Hentschel (hpmachining) | 2022-03-28 22:57:52 -0400 |
|---|---|---|
| committer | Paul Hentschel (hpmachining) | 2022-03-28 22:57:52 -0400 |
| commit | c8332631397503efd5d14d9b03d414306d274804 (patch) | |
| tree | 8a1359034ce3fe9ef8a84cbdbde0e421ee9ebbd3 | |
| parent | 4d28bfafef5c4cded9ec32ccbdc7f4adbcbc6e53 (diff) | |
| download | aur-c8332631397503efd5d14d9b03d414306d274804.tar.gz | |
Fixed package function and removed old patch file.
Removed the linkflags from the package function.
Remove the prepare function and old patch file.
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | 0001_config_qt.patch | 13 | ||||
| -rw-r--r-- | PKGBUILD | 11 |
3 files changed, 5 insertions, 23 deletions
@@ -1,7 +1,7 @@ pkgbase = camotics-git pkgdesc = 3-axis NC machining simulation software - pkgver = r953.9963b38 - pkgrel = 2 + pkgver = r954.c0072b6 + pkgrel = 1 url = http://camotics.org/ arch = x86_64 license = GPL2 diff --git a/0001_config_qt.patch b/0001_config_qt.patch deleted file mode 100644 index 87a89abebc65..000000000000 --- a/0001_config_qt.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/config/qt5/__init__.py b/config/qt5/__init__.py -index cb369bf..574c5aa 100644 ---- a/config/qt5/__init__.py -+++ b/config/qt5/__init__.py -@@ -763,7 +763,7 @@ def generate(env): - QT5_MOCDEFPREFIX = '-D', - QT5_MOCDEFSUFFIX = '', - QT5_MOCDEFINES = '${_defines(QT5_MOCDEFPREFIX, CPPDEFINES, ' -- 'QT5_MOCDEFSUFFIX, __env__)}', -+ 'QT5_MOCDEFSUFFIX, __env__, TARGET, SOURCE)}', - QT5_MOCCPPPATH = [], - QT5_MOCINCFLAGS = '$( ${_concat(QT5_MOCINCPREFIX, QT5_MOCCPPPATH, ' - 'INCSUFFIX, __env__, RDirs)} $)', @@ -1,8 +1,8 @@ # Maintainer: Paul Hentschel <aur at hpminc dot com> pkgname=camotics-git -pkgver=r953.9963b38 -pkgrel=2 +pkgver=r954.c0072b6 +pkgrel=1 pkgdesc="3-axis NC machining simulation software" arch=('x86_64') url="http://camotics.org/" @@ -33,11 +33,6 @@ pkgver() { printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" } -prepare() { - cd "${pkgname%-*}" -# patch -p1 -i "../patch.patch" -} - build() { cd "${pkgname%-*}" mkdir -p build @@ -46,7 +41,7 @@ build() { package() { cd "${pkgname%-*}" - CBANG_HOME=/opt/cbang scons install cxxstd="c++14" install_prefix="$pkgdir/usr" linkflags=$LDFLAGS + CBANG_HOME=/opt/cbang scons install cxxstd="c++14" install_prefix="$pkgdir/usr" } # vim:set ts=2 sw=2 et: |