summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Reimer2019-02-01 18:54:45 +0100
committerChristopher Reimer2019-02-01 18:55:02 +0100
commit531d37b2e93e92a6cb39fec54213a0f25cd25336 (patch)
treef81154d78186d4a125cf4df0ae820740bb85c83e
parentcd96fdd3e750cc613e2920a2a27b9d46273c0494 (diff)
downloadaur-531d37b2e93e92a6cb39fec54213a0f25cd25336.tar.gz
Add ctag's fix for GCodeSender Error
-rw-r--r--.SRCINFO4
-rw-r--r--GCodeSender.hpp.patch12
-rw-r--r--PKGBUILD12
3 files changed, 22 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e42f032d2587..04c6b748385b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = slic3r-prusa3d
pkgdesc = Updated Slic3r by Prusa3D with many bugfixes and new features
pkgver = 1.41.2
- pkgrel = 1
+ pkgrel = 2
url = http://www.prusa3d.com/
arch = i686
arch = x86_64
@@ -41,10 +41,12 @@ pkgbase = slic3r-prusa3d
source = Move-Slic3r-data-to-usr-share-slic3r.patch
source = https://raw.githubusercontent.com/PointCloudLibrary/pcl/79c184cc4dbe82d296bb37390064e4a0149234ec/cmake/Modules/FindQhull.cmake
source = slic3r.desktop
+ source = GCodeSender.hpp.patch
md5sums = SKIP
md5sums = aceb830f2fbe12ef5659e73164ea733b
md5sums = 60163025c9bd3d80f2d51a9566f1deab
md5sums = 1941c1ede2f03774ffb77f68a7c33572
+ md5sums = ef9c296e9fc3579979d984f3193ca733
pkgname = slic3r-prusa3d
diff --git a/GCodeSender.hpp.patch b/GCodeSender.hpp.patch
new file mode 100644
index 000000000000..74e379051741
--- /dev/null
+++ b/GCodeSender.hpp.patch
@@ -0,0 +1,12 @@
+*** Slic3r/xs/src/libslic3r/GCodeSender.hpp.orig 2019-01-18 14:44:59.937080503 -0600
+--- Slic3r/xs/src/libslic3r/GCodeSender.hpp 2019-01-18 14:51:05.906064638 -0600
+***************
+*** 8,13 ****
+--- 8,14 ----
+ #include <boost/asio.hpp>
+ #include <boost/bind.hpp>
+ #include <boost/thread.hpp>
++ #include <boost/core/noncopyable.hpp>
+
+ namespace Slic3r {
+
diff --git a/PKGBUILD b/PKGBUILD
index 88035ebaba53..45fe522ded4b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,3 @@
-
# Maintainer: Christopher Reimer <mail+aur[at]c-reimer[dot]de>
# Contributor: Swift Geek <swifgeek ɐ google m č0m>
# Contributor: Nick Østergaard <oe.nick at gmail dot com>
@@ -7,7 +6,7 @@
_pkgname=slic3r-prusa3d
pkgname=${_pkgname}
pkgver=1.41.2
-pkgrel=1
+pkgrel=2
pkgdesc="Updated Slic3r by Prusa3D with many bugfixes and new features"
arch=('i686' 'x86_64')
url="http://www.prusa3d.com/"
@@ -23,21 +22,24 @@ optdepends=('perl-net-dbus: notifications support via any dbus-based notifier'
source=("git+https://github.com/prusa3d/Slic3r.git#tag=version_${pkgver}"
"Move-Slic3r-data-to-usr-share-slic3r.patch"
"https://raw.githubusercontent.com/PointCloudLibrary/pcl/79c184cc4dbe82d296bb37390064e4a0149234ec/cmake/Modules/FindQhull.cmake"
- 'slic3r.desktop')
+ 'slic3r.desktop'
+ 'GCodeSender.hpp.patch')
md5sums=('SKIP'
'aceb830f2fbe12ef5659e73164ea733b'
'60163025c9bd3d80f2d51a9566f1deab'
- '1941c1ede2f03774ffb77f68a7c33572')
+ '1941c1ede2f03774ffb77f68a7c33572'
+ 'ef9c296e9fc3579979d984f3193ca733')
prepare() {
cd "${srcdir}/Slic3r"
patch -p1 -i "$srcdir/Move-Slic3r-data-to-usr-share-slic3r.patch"
+ patch -p1 -b -i "$srcdir/GCodeSender.hpp.patch"
mkdir -p build
}
build() {
cd "${srcdir}/Slic3r"
-
+
# Moved this here from prepare(). Because prepare() runs before pkgver() we always set the wrong version.
sed -i "s/define SLIC3R_VERSION .*/define SLIC3R_VERSION \"$pkgver\"/" xs/src/libslic3r/libslic3r.h