Update to 1.6.2

Complete overhaul of build process and packaging

5 files changed, 108 insertions, 66 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4ae3363cf1a6..bd1d8bd0621f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,8 @@
-# Generated by mksrcinfo v8
-# Mon Feb 22 13:04:18 UTC 2016
 pkgbase = repetier-host
 	pkgdesc = almost complete 3d-printing workflow
-	pkgver = 1.6.1
+	pkgver = 1.6.2
 	pkgrel = 1
 	url = http://www.repetier.com/
-	install = repetier-host.install
 	arch = x86_64
 	arch = i686
 	license = custom
@@ -13,8 +10,12 @@ pkgbase = repetier-host
 	depends = mono
 	optdepends = slic3r
 	optdepends = skeinforge
-	source = http://download.repetier.com/files/host/linux/repetierHostLinux_1_6_1.tgz
-	md5sums = c07fab367995f16847fbeb167042e845
+	source = http://download.repetier.com/files/host/linux/repetierHostLinux_1_6_2.tgz
+	source = repetier-host_buildfix.diff
+	source = repetier-host_fix-desktop-file.diff
+	md5sums = bc455ac8ebfbe88c2fd0f9eef0f6dcb4
+	md5sums = 971ee8f825963df09be4470f268cfe89
+	md5sums = 9862b0f96ee420233b92b936d131707d
 
 pkgname = repetier-host
 
diff --git a/PKGBUILD b/PKGBUILD
index 058b2f5325f8..9f1ae1c267f1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: der_ronny <ronnymichaelradke[at]web[dot]de>
-# Co-Maintainer: Christopher Reimer <mail+vdr4arch[at]c-reimer[dot]de>
+# Co-Maintainer: Christopher Reimer <mail+aur[at]c-reimer[dot]de>
 pkgname=repetier-host
-pkgver=1.6.1
+pkgver=1.6.2
 pkgrel=1
 pkgdesc="almost complete 3d-printing workflow"
 url='http://www.repetier.com/'
@@ -9,69 +9,65 @@ arch=('x86_64' 'i686')
 license=('custom')
 depends=('desktop-file-utils' 'mono')
 optdepends=('slic3r' 'skeinforge')
-_pkgver="${pkgver//./_}"
-source=("http://download.repetier.com/files/host/linux/repetierHostLinux_$_pkgver.tgz")
-md5sums=('c07fab367995f16847fbeb167042e845')
-install=$pkgname.install
+source=("http://download.repetier.com/files/host/linux/repetierHostLinux_${pkgver//./_}.tgz"
+        "${pkgname}_buildfix.diff"
+        "${pkgname}_fix-desktop-file.diff")
+md5sums=('bc455ac8ebfbe88c2fd0f9eef0f6dcb4'
+         '971ee8f825963df09be4470f268cfe89'
+         '9862b0f96ee420233b92b936d131707d')
 
-build() {
+prepare() {
   cd ${srcdir}/RepetierHost
-  _dir=/usr/share/repetierHost
-  _osbit=`uname -m`
-  echo "System: ${_osbit}"
-
-  if [ ${_osbit} = "i686" ]; then
-    cp plugins/CuraEngine/CuraEngine32 plugins/CuraEngine/CuraEngine
-  else
-    cp plugins/CuraEngine/CuraEngine64 plugins/CuraEngine/CuraEngine
-  fi
-  chmod a+x plugins/CuraEngine/CuraEngine
-
-  chmod a+rx ../RepetierHost
-  chmod -R a+r *
-  chmod -R a+x data
+  patch -p1 -i "${srcdir}/${pkgname}_buildfix.diff"
+  patch -p1 -i "${srcdir}/${pkgname}_fix-desktop-file.diff"
+}
 
+build() {
+  cd ${srcdir}/RepetierHost
   g++ SetBaudrate.cpp -o SetBaudrate
 }
 
 package() {
-  _dir=/usr/share/repetierHost
-  mkdir -p "$pkgdir/usr/bin"
-  echo "#!/bin/sh" > "$pkgdir"/usr/bin/repetierHost
-  echo "cd ${_dir}" >> "$pkgdir"/usr/bin/repetierHost
-  echo "mono RepetierHost.exe -home ${_dir}&" >> "$pkgdir"/usr/bin/repetierHost
-  chmod 755 "$pkgdir"/usr/bin/repetierHost
+  cd ${srcdir}/RepetierHost
+
+  find \
+    ! -name '*.txt' \
+    ! -name '*.cpp' \
+    ! -name '*.sh' \
+    ! -name 'CuraEngine32' \
+    ! -name 'CuraEngine64' \
+    ! -name 'Thumbs.db' \
+    ! -name '.DS_Store' \
+    ! -name '*.application' \
+    ! -name 'repetierHost' \
+    ! -name '*.desktop' \
+    ! -name 'installDependencies*' \
+    ! -name 'repetier-logo.png' \
+    -exec install -Dm644 {} ${pkgdir}/usr/share/RepetierHost/{} \;
 
-  mkdir -p "$pkgdir/usr/share/applications"
-  echo "[Desktop Entry]
-Name=Repetier-Host
-Exec=/usr/bin/mono $_dir/RepetierHost.exe -home $_dir
-Type=Application
-StartupNotify=true
-Comment=Repetier-Host 3d printer host software
-Path=$_dir
-Icon=$_dir/repetier-logo.png
-MimeType=application/sla;text/gcode;application/wavefront-obj;application/x-amf;
-" > "$pkgdir"/usr/share/applications/repetier-RepetierHost.desktop
+  install -Dm755 repetierHost "${pkgdir}/usr/bin/repetierHost"
 
-  mkdir -p "$pkgdir/$_dir"
-  cd "$pkgdir/$_dir"
-  cp -a "$srcdir"/RepetierHost/* .
+  install -Dm644 Repetier-Host.desktop \
+    "${pkgdir}/usr/share/applications/RepetierHost.desktop"
 
-  mkdir -p "$pkgdir/usr/share/licenses/$pkgname"
-  mv Repetier-Host-licence.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  install -Dm644 repetier-logo.png \
+    "${pkgdir}/usr/share/icons/hicolor/128x128/apps/repetierHost.png"
 
-  find -name '*.txt' -delete
-  find -name '*.cpp' -delete
-  find -name '*.sh' -delete
-  find -name 'CuraEngine32' -delete
-  find -name 'CuraEngine64' -delete
-  find -name 'Thumbs.db' -delete
-  find -name '.DS_Store' -delete
-  find -name '*.application' -delete
-  find -name 'repetierHost' -delete
-  find -name '*.desktop' -delete
-  find -name 'installDependencies*' -delete
+  install -Dm644 Repetier-Host-licence.txt \
+    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 
+  case $arch in
+    "i686")
+      install -Dm755 plugins/CuraEngine/CuraEngine32 \
+        "$pkgdir/usr/share/RepetierHost/plugins/CuraEngine/CuraEngine"
+      ;;
+    "x86_64")
+      install -Dm755 plugins/CuraEngine/CuraEngine64 \
+        "$pkgdir/usr/share/RepetierHost/plugins/CuraEngine/CuraEngine"
+      ;;
+    *)
+      exit 1
+      ;;
+  esac
 }
 
diff --git a/repetier-host.install b/repetier-host.install
deleted file mode 100644
index 66a736d00d20..000000000000
--- a/repetier-host.install
+++ /dev/null
@@ -1,6 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-post_upgrade() {
-  update-desktop-database -q
-}
diff --git a/repetier-host_buildfix.diff b/repetier-host_buildfix.diff
new file mode 100644
index 000000000000..df6b8d95f935
--- /dev/null
+++ b/repetier-host_buildfix.diff
@@ -0,0 +1,12 @@
+diff -ruN RepetierHost.orig/SetBaudrate.cpp RepetierHost/SetBaudrate.cpp
+--- RepetierHost.orig/SetBaudrate.cpp	2016-06-27 16:40:57.000000000 +0200
++++ RepetierHost/SetBaudrate.cpp	2016-07-23 23:33:02.218866756 +0200
+@@ -68,7 +68,7 @@
+     exit(-2);
+   }
+   cerr << "actual baud: " << ios.c_ispeed << endl;
+-  if(abs(baud - ios.c_ispeed) * 100 / baud >= 5) {
++  if(abs(baud - (int) ios.c_ispeed) * 100 / baud >= 5) {
+     cerr << "error: couldn't set desired baud rate " << baud << " got " << ios.c_ispeed << endl;
+     exit(-2);
+   }
diff --git a/repetier-host_fix-desktop-file.diff b/repetier-host_fix-desktop-file.diff
new file mode 100644
index 000000000000..932c863df892
--- /dev/null
+++ b/repetier-host_fix-desktop-file.diff
@@ -0,0 +1,39 @@
+diff -ruN RepetierHost.orig/repetierHost RepetierHost/repetierHost
+--- RepetierHost.orig/repetierHost	2014-08-09 20:47:12.000000000 +0200
++++ RepetierHost/repetierHost	2016-07-23 23:49:28.434704198 +0200
+@@ -1,3 +1,3 @@
+ #!/bin/sh
+-cd /rh/linux/RepetierHost
+-mono RepetierHost.exe -home /rh/linux/RepetierHost&
++cd /usr/share/RepetierHost
++mono RepetierHost.exe -home /usr/share/RepetierHost&
+diff -ruN RepetierHost.orig/Repetier-Host.desktop RepetierHost/Repetier-Host.desktop
+--- RepetierHost.orig/Repetier-Host.desktop	2014-08-09 20:47:13.000000000 +0200
++++ RepetierHost/Repetier-Host.desktop	2016-07-23 23:50:08.617085203 +0200
+@@ -1,22 +1,9 @@
+ [Desktop Entry]
+ Name=Repetier-Host
+-Exec=mono RepetierHost.exe -home /rh/linux/RepetierHost&
++Exec=repetierHost
+ Type=Application
+ StartupNotify=true
+ Comment=Repetier-Host 3d printer host software
+-Path=/rh/linux/RepetierHost
+-Icon=/rh/linux/RepetierHost/repetier-logo.png
+-Comment[en_US.UTF-8]=Repetier Host
+-Name[en_US]=Repetier
+-
+-[Desktop Entry]
+-Name=Repetier-Host
+-Exec=mono RepetierHost.exe -home /rh/linux/RepetierHost&
+-Type=Application
+-StartupNotify=true
+-Comment=Repetier-Host 3d printer host software
+-Path=/rh/linux/RepetierHost
+-Icon=/rh/linux/RepetierHost/repetier-logo.png
+-Comment[en_US.UTF-8]=Repetier Host
+-Name[en_US]=Repetier-Host
+-
++Path=/usr/share/RepetierHost
++Icon=repetierHost
++MimeType=application/sla;text/gcode;application/wavefront-obj;application/x-amf;