diff options
| author | Paul Hentschel (hpmachining) | 2022-03-12 18:05:35 -0500 |
|---|---|---|
| committer | Paul Hentschel (hpmachining) | 2022-03-12 18:05:35 -0500 |
| commit | d155f889b008f0184197dd3fb31494b1a8eae88f (patch) | |
| tree | 383405736b6df95009c27626269304395f634464 | |
| parent | 106d43a00c91914e73e6c726fe9af876701ea84e (diff) | |
| download | aur-d155f889b008f0184197dd3fb31494b1a8eae88f.tar.gz | |
Added patch for latest scons version (4.3.0)
| -rw-r--r-- | .SRCINFO | 5 | ||||
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | 0001_config_qt.patch | 13 | ||||
| -rw-r--r-- | PKGBUILD | 11 |
4 files changed, 26 insertions, 4 deletions
@@ -1,6 +1,6 @@ pkgbase = camotics-git pkgdesc = 3-axis NC machining simulation software - pkgver = r924.8f4a5a1 + pkgver = r952.ac722dd pkgrel = 1 url = http://camotics.org/ arch = x86_64 @@ -17,7 +17,8 @@ pkgbase = camotics-git provides = camotics conflicts = camotics source = camotics::git+https://github.com/CauldronDevelopmentLLC/CAMotics.git#commit=master + source = 0001_config_qt.patch sha256sums = SKIP + sha256sums = 0612d74ac26a00c21dd924bb92c2cc94f53168702cb870625d0711904556f487 pkgname = camotics-git - diff --git a/.gitignore b/.gitignore index 018a3de08144..7735b4612827 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ !PKGBUILD !.SRCINFO !.gitignore +!*.patch diff --git a/0001_config_qt.patch b/0001_config_qt.patch new file mode 100644 index 000000000000..87a89abebc65 --- /dev/null +++ b/0001_config_qt.patch @@ -0,0 +1,13 @@ +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,7 +1,7 @@ # Maintainer: Paul Hentschel <aur at hpminc dot com> pkgname=camotics-git -pkgver=r924.8f4a5a1 +pkgver=r952.ac722dd pkgrel=1 pkgdesc="3-axis NC machining simulation software" arch=('x86_64') @@ -25,14 +25,21 @@ conflicts=('camotics') _commit="master" source=( "${pkgname%-*}::git+https://github.com/CauldronDevelopmentLLC/CAMotics.git#commit=$_commit" + "0001_config_qt.patch" ) -sha256sums=('SKIP') +sha256sums=('SKIP' + '0612d74ac26a00c21dd924bb92c2cc94f53168702cb870625d0711904556f487') pkgver() { cd "${pkgname%-*}" printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" } +prepare() { + cd "${pkgname%-*}" + patch -p1 -i "../0001_config_qt.patch" +} + build() { cd "${pkgname%-*}" mkdir -p build |