summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorSwift Geek2015-01-03 00:00:31 +0000
committerKyle Keen2015-01-03 00:00:31 +0000
commit9cc581614ef6434c84ae8748cc44686474e392ce (patch)
tree79bef0c77730509c33c91b55c1cd089176339520
parentc524b8c8a8b352024ef9ba235f90ff6e7e3f9220 (diff)
downloadaur-9cc581614ef6434c84ae8748cc44686474e392ce.tar.gz
Import from pkgbuild.com service
-rw-r--r--.AURINFO41
-rw-r--r--PKGBUILD8
2 files changed, 7 insertions, 42 deletions
diff --git a/.AURINFO b/.AURINFO
deleted file mode 100644
index 184c74916f22..000000000000
--- a/.AURINFO
+++ /dev/null
@@ -1,41 +0,0 @@
-pkgbase = slic3r-git
- pkgdesc = Slic3r is an STL-to-GCODE translator for RepRap 3D printers, aiming to be a modern and fast alternative to Skeinforge.
- pkgver = a
- pkgrel = 13
- url = http://slic3r.org/
- arch = any
- license = GPL
- makedepends = git
- depends = perl
- depends = perl-moo
- depends = perl-math-clipper
- depends = perl-math-convexhull
- depends = perl-math-geometry-voronoi
- depends = perl-math-planepath
- depends = perl-math-convexhull-monotonechain
- depends = perl-io-stringy
- depends = perl-encode-locale
- depends = perl-extutils-makemaker-aur>=6.82
- depends = perl-extutils-parsexs>=3.22
- optdepends = perl-wx: GUI support
- optdepends = perl-net-dbus: notifications support via any dbus-based notifier
- optdepends = perl-xml-sax-expatxs: make AMF parsing faster
- optdepends = perl-xml-sax: Additive Manufacturing File Format (AMF) support
- optdepends = perl-wx-glcanvas: support for opengl preview
- optdepends = perl-opengl: support for opengl preview
- optdepends = perl-class-xsaccessor: creating faster accessor methods
- provides = slic3r
- provides = slic3r-xs
- provides = slic3r-xs-git
- conflicts = slic3r
- conflicts = slic3r-xs
- conflicts = slic3r-xs-git
- source = git+https://github.com/alexrj/Slic3r.git
- source = slic3r.desktop
- source = slic3r.pl
- md5sums = SKIP
- md5sums = 1b561afff48c79f86889664375d179ed
- md5sums = 1371d698799ee97a43d22f6436a2e619
-
-pkgname = slic3r-git
-
diff --git a/PKGBUILD b/PKGBUILD
index c6ec052aef84..a2adde7d7c7c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -123,7 +123,13 @@ prepare() {
sed -i '/^warn \"Running Slic3r under Perl/,+1 s/^/\#/' ./lib/Slic3r.pm
# Why true? cuz pacman is crazy... and it still doesn't work as intended
- true && pkgver="$(awk 'BEGIN{FS="\""}/VERSION/{gsub(/-dev/,"",$2); print $2 }' ./lib/Slic3r.pm).$(git rev-parse --short HEAD)"
+ if grep -sq '#define SLIC3R_VERSION' ./xs/src/libslic3r/libslic3r.h; then
+ # 6adc3477c9d08d2cfa0e6902b3d241a9193e50d4 intruduces libslic3r.h in that directory BUT
+ # 8b6a8e63079978646cd98a96d6ad178b28f3067c introduces version in that header
+ true && pkgver="$(awk '/#define SLIC3R_VERSION/ {gsub(/"/, "", $3); print $3 }' ./xs/src/libslic3r/libslic3r.h).$(git rev-parse --short HEAD)"
+ else
+ true && pkgver="$(awk 'BEGIN{FS="\""}/VERSION/{gsub(/-dev/,"",$2); print $2 }' ./lib/Slic3r.pm).$(git rev-parse --short HEAD)"
+ fi
export _pkgver="$pkgver"
msg2 "Fetched $_pkgver"
}