Removed mime patch due to upstream fix.

3 files changed, 3 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e20ac27a6798..90c5be5681f9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = camotics-git
 	pkgdesc = 3-axis NC machining simulation software
-	pkgver = r954.c0072b6
+	pkgver = r956.57c1268
 	pkgrel = 1
 	url = http://camotics.org/
 	arch = x86_64
@@ -17,8 +17,6 @@ pkgbase = camotics-git
 	provides = camotics
 	conflicts = camotics
 	source = camotics::git+https://github.com/CauldronDevelopmentLLC/CAMotics.git#commit=master
-	source = 0001_mime.patch
 	sha256sums = SKIP
-	sha256sums = 162df92ac2523d561cdd82c87360b17ee2d715cfd567bcb8d00ae528994151e9
 
 pkgname = camotics-git
diff --git a/0001_mime.patch b/0001_mime.patch
deleted file mode 100644
index 8a1a9b2f617b..000000000000
--- a/0001_mime.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/SConstruct b/SConstruct
-index 369949a..bbe2f42 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -282,7 +282,7 @@ for target in docs + ['examples', 'machines']:
- env.Install(prefix + '/share/camotics/', 'tpl_lib')
- env.Install(prefix + '/share/pixmaps', 'images/camotics.png')
- env.Install(prefix + '/share/applications', 'CAMotics.desktop')
--env.Install(prefix + '/share/mime/packages/camotics.xml', 'mime.xml')
-+env.InstallAs(prefix + '/share/mime/packages/camotics.xml', 'mime.xml')
- 
- description = '''CAMotics is an Open-Source software which can simulate
- 3-axis NC machining. It is a fast, flexible and user friendly simulation
diff --git a/PKGBUILD b/PKGBUILD
index 096ea29b27f1..727606080a6e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Paul Hentschel <aur at hpminc dot com>
 
 pkgname=camotics-git
-pkgver=r954.c0072b6
+pkgver=r956.57c1268
 pkgrel=1
 pkgdesc="3-axis NC machining simulation software"
 arch=('x86_64')
@@ -25,21 +25,14 @@ conflicts=('camotics')
 _commit="master"
 source=(
   "${pkgname%-*}::git+https://github.com/CauldronDevelopmentLLC/CAMotics.git#commit=$_commit"
-  "0001_mime.patch"
 )
-sha256sums=('SKIP'
-            '162df92ac2523d561cdd82c87360b17ee2d715cfd567bcb8d00ae528994151e9')
+sha256sums=('SKIP')
 
 pkgver() {
 	cd "${pkgname%-*}"
 	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
-prepare() {
-	cd "${pkgname%-*}"
-  patch -p1 -i "../0001_mime.patch"
-}
-
 build() {
   cd "${pkgname%-*}"
   mkdir -p build