[arch-commits] Commit in qcad/trunk (PKGBUILD)

[Sergej Pupykin]

    Date: Monday, June 24, 2013 @ 19:26:06
  Author: spupykin
Revision: 93113

Modified:
  qcad/trunk/PKGBUILD

----------+
 PKGBUILD |   23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-06-24 17:25:57 UTC (rev 93112)
+++ PKGBUILD	2013-06-24 17:26:06 UTC (rev 93113)
@@ -5,8 +5,8 @@
 # Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
 
 pkgname=qcad
-pkgver=3.0.14.0
-pkgrel=2
+pkgver=3.1.2.0
+pkgrel=1
 pkgdesc="A 2D CAD package based upon Qt"
 arch=('i686' 'x86_64')
 url="http://www.ribbonsoft.com/qcad.html"
@@ -14,23 +14,21 @@
 depends=('qtwebkit')
 makedepends=('glu')
 options=(libtool)
-source=($pkgname-$pkgver.zip::https://github.com/qcad/qcad/archive/v${pkgver}.zip
+source=($pkgname-$pkgver.tar.gz::https://github.com/qcad/qcad/archive/v${pkgver}.tar.gz
         QCad.desktop)
-md5sums=('2c460838235a95a4d969e508a75b8206'
+md5sums=('9741d2e4f01b59107a50c0c95af7b972'
          '8c4288986b78b14a813b005e81b6ba53')
 
 prepare() {
   cd ${srcdir}/qcad-$pkgver
-
   sed -i '1,1i#include <unistd.h>' src/core/{RLocalPeer,RS}.cpp
   sed -i '1,1i#include <sys/sysinfo.h>' src/core/{RScriptHandler,RS}.cpp
 }
 
 build() {
   cd ${srcdir}/qcad-$pkgver
-
   qmake-qt4
-  make PREFIX=/usr CXX="g++ -fpermissive"
+  make all
 }
 
 package() {
@@ -42,27 +40,26 @@
 
   install -dm755 ${pkgdir}/usr/share/{qcad,pixmaps,applications}
   cp -r examples fonts libraries patterns plugins scripts ts ${pkgdir}/usr/share/qcad
-  cp release/* ${pkgdir}/usr/share/qcad
+  cp debug/* ${pkgdir}/usr/share/qcad
 
-  install -m755 qcad ${pkgdir}/usr/share/qcad/qcad
   install -m755 readme.txt ${pkgdir}/usr/share/qcad/readme.txt
 
   # qtwebkit
-  ln -s /usr/lib/qt4/plugins/designer/libqwebview.so ${pkgdir}/usr/share/qcad/plugins/designer/libqwebview.so
+  ln -sf /usr/lib/qt4/plugins/designer/libqwebview.so ${pkgdir}/usr/share/qcad/plugins/designer/libqwebview.so
   # qt
   for sofiles in /usr/lib/qt4/plugins/imageformats/*.so
   do
-    ln -s ${sofiles} ${pkgdir}/usr/share/qcad/plugins/imageformats/${sofiles##/*/}
+    ln -sf ${sofiles} ${pkgdir}/usr/share/qcad/plugins/imageformats/${sofiles##/*/}
   done
   for sofiles in /usr/lib/qt4/plugins/sqldrivers/*.so
   do
-    ln -s ${sofiles} ${pkgdir}/usr/share/qcad/plugins/sqldrivers/${sofiles##/*/}
+    ln -sf ${sofiles} ${pkgdir}/usr/share/qcad/plugins/sqldrivers/${sofiles##/*/}
   done
 
   install -Dm644 scripts/qcad_icon.png ${pkgdir}/usr/share/pixmaps/qcad_icon.png
   install -Dm644 $srcdir/QCad.desktop ${pkgdir}/usr/share/applications/QCad.desktop
 
   install -dm0755 $pkgdir/usr/bin
-  echo -e '#!/bin/sh\ncd /usr/share/qcad\nexec ./qcad' >$pkgdir/usr/bin/qcad
+  echo -e '#!/bin/sh\ncd /usr/share/qcad\nLD_LIBRARY_PATH=`pwd`:$LD_LIBRARY_PATH exec ./qcad-bin' >$pkgdir/usr/bin/qcad
   chmod 0755 $pkgdir/usr/bin/qcad
 }