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

2014-05-08 Thread Sergej Pupykin
Date: Friday, May 9, 2014 @ 00:30:52
  Author: spupykin
Revision: 110870

upgpkg: qcad 3.5.0.0-1

upd

Modified:
  qcad/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-05-08 22:30:45 UTC (rev 110869)
+++ PKGBUILD2014-05-08 22:30:52 UTC (rev 110870)
@@ -5,7 +5,7 @@
 # Contributor: Daniel J Griffiths ghost1...@archlinux.us
 
 pkgname=qcad
-pkgver=3.4.7.1
+pkgver=3.5.0.0
 pkgrel=1
 pkgdesc=A 2D CAD package based upon Qt
 arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@
 options=('libtool')
 
source=($pkgname-$pkgver.tar.gz::https://github.com/qcad/qcad/archive/v${pkgver}.tar.gz
 QCad.desktop)
-md5sums=('b1ac7f138407369089218ce02ef304ed'
+md5sums=('9a7480b75e25c43c8f5d2ca3e79b90b1'
  '84f189dd152e7614a1265659dac6222d')
 
 prepare() {



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

2014-05-07 Thread Sergej Pupykin
Date: Wednesday, May 7, 2014 @ 16:28:26
  Author: spupykin
Revision: 110805

upgpkg: qcad 3.4.7.1-1

upd

Modified:
  qcad/trunk/PKGBUILD

--+
 PKGBUILD |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-05-07 13:56:00 UTC (rev 110804)
+++ PKGBUILD2014-05-07 14:28:26 UTC (rev 110805)
@@ -5,11 +5,11 @@
 # Contributor: Daniel J Griffiths ghost1...@archlinux.us
 
 pkgname=qcad
-pkgver=3.4.6.0
+pkgver=3.4.7.1
 pkgrel=1
 pkgdesc=A 2D CAD package based upon Qt
 arch=('i686' 'x86_64')
-url=http://www.ribbonsoft.com/qcad.html;
+url=http://www.qcad.org;
 license=('GPL3')
 depends=('qtwebkit')
 makedepends=('glu')
@@ -16,12 +16,14 @@
 options=('libtool')
 
source=($pkgname-$pkgver.tar.gz::https://github.com/qcad/qcad/archive/v${pkgver}.tar.gz
 QCad.desktop)
-md5sums=('b446738ba71ee0a0ba1431b95d07a2fd'
+md5sums=('b1ac7f138407369089218ce02ef304ed'
  '84f189dd152e7614a1265659dac6222d')
 
 prepare() {
   cd ${srcdir}/qcad-$pkgver
   sed -i '1,1i#include stdint.h' src/core/RThread.cpp
+  (cd src/3rdparty  cp -a qt-labs-qtscriptgenerator-4.8.5 
qt-labs-qtscriptgenerator-4.8.6)
+  (cd src/3rdparty/qt-labs-qtscriptgenerator-4.8.6/  mv 
qt-labs-qtscriptgenerator-4.8.5.pro qt-labs-qtscriptgenerator-4.8.6.pro)
 }
 
 build() {



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

2014-02-16 Thread Sergej Pupykin
Date: Sunday, February 16, 2014 @ 15:13:36
  Author: spupykin
Revision: 105851

upgpkg: qcad 3.4.6.0-1

upd

Modified:
  qcad/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-02-16 13:46:15 UTC (rev 105850)
+++ PKGBUILD2014-02-16 14:13:36 UTC (rev 105851)
@@ -5,8 +5,8 @@
 # Contributor: Daniel J Griffiths ghost1...@archlinux.us
 
 pkgname=qcad
-pkgver=3.4.5.0
-pkgrel=2
+pkgver=3.4.6.0
+pkgrel=1
 pkgdesc=A 2D CAD package based upon Qt
 arch=('i686' 'x86_64')
 url=http://www.ribbonsoft.com/qcad.html;
@@ -16,7 +16,7 @@
 options=('libtool')
 
source=($pkgname-$pkgver.tar.gz::https://github.com/qcad/qcad/archive/v${pkgver}.tar.gz
 QCad.desktop)
-md5sums=('d7e5a77d05bdc7f6d5762029ec03fc2d'
+md5sums=('b446738ba71ee0a0ba1431b95d07a2fd'
  '84f189dd152e7614a1265659dac6222d')
 
 prepare() {



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

2014-01-08 Thread Sergej Pupykin
Date: Wednesday, January 8, 2014 @ 15:10:27
  Author: spupykin
Revision: 103631

upgpkg: qcad 3.4.5.0-2

upd

Modified:
  qcad/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-01-08 13:34:03 UTC (rev 103630)
+++ PKGBUILD2014-01-08 14:10:27 UTC (rev 103631)
@@ -6,7 +6,7 @@
 
 pkgname=qcad
 pkgver=3.4.5.0
-pkgrel=1
+pkgrel=2
 pkgdesc=A 2D CAD package based upon Qt
 arch=('i686' 'x86_64')
 url=http://www.ribbonsoft.com/qcad.html;
@@ -59,7 +59,7 @@
   install -Dm644 $srcdir/QCad.desktop 
${pkgdir}/usr/share/applications/QCad.desktop
 
   install -dm0755 $pkgdir/usr/bin
-  echo -e '#!/bin/sh\ncd 
/usr/share/qcad\nLD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}/usr/share/qcad
 exec /usr/share/qcad/qcad-bin $@' $pkgdir/usr/bin/qcad
+  echo -e 
'#!/bin/sh\nLD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}/usr/share/qcad
 exec /usr/share/qcad/qcad-bin $@' $pkgdir/usr/bin/qcad
 
   chmod 0755 $pkgdir/usr/bin/qcad
 }



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

2013-12-20 Thread Sergej Pupykin
Date: Friday, December 20, 2013 @ 12:27:45
  Author: spupykin
Revision: 102797

upgpkg: qcad 3.4.5.0-1

upd

Modified:
  qcad/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-12-20 11:11:34 UTC (rev 102796)
+++ PKGBUILD2013-12-20 11:27:45 UTC (rev 102797)
@@ -5,7 +5,7 @@
 # Contributor: Daniel J Griffiths ghost1...@archlinux.us
 
 pkgname=qcad
-pkgver=3.4.4.0
+pkgver=3.4.5.0
 pkgrel=1
 pkgdesc=A 2D CAD package based upon Qt
 arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@
 options=('libtool')
 
source=($pkgname-$pkgver.tar.gz::https://github.com/qcad/qcad/archive/v${pkgver}.tar.gz
 QCad.desktop)
-md5sums=('0363ae9a55d1d8067fa166aade51f973'
+md5sums=('d7e5a77d05bdc7f6d5762029ec03fc2d'
  '84f189dd152e7614a1265659dac6222d')
 
 prepare() {



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

2013-12-17 Thread Sergej Pupykin
Date: Tuesday, December 17, 2013 @ 18:29:31
  Author: spupykin
Revision: 102702

Modified:
  qcad/trunk/PKGBUILD
  qcad/trunk/QCad.desktop

--+
 PKGBUILD |2 +-
 QCad.desktop |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-12-17 17:21:09 UTC (rev 102701)
+++ PKGBUILD2013-12-17 17:29:31 UTC (rev 102702)
@@ -17,7 +17,7 @@
 
source=($pkgname-$pkgver.tar.gz::https://github.com/qcad/qcad/archive/v${pkgver}.tar.gz
 QCad.desktop)
 md5sums=('0363ae9a55d1d8067fa166aade51f973'
- '35100eaedbdf6625f6e6a09b177854cd')
+ '84f189dd152e7614a1265659dac6222d')
 
 prepare() {
   cd ${srcdir}/qcad-$pkgver

Modified: QCad.desktop
===
--- QCad.desktop2013-12-17 17:21:09 UTC (rev 102701)
+++ QCad.desktop2013-12-17 17:29:31 UTC (rev 102702)
@@ -6,4 +6,4 @@
 StartupNotify=true
 Terminal=false
 Type=Application
-Categories=Application;Office;
+Categories=Application;Development;Electronics;Engineering;



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

2013-12-06 Thread Sergej Pupykin
Date: Friday, December 6, 2013 @ 18:41:16
  Author: spupykin
Revision: 102219

Modified:
  qcad/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-12-06 17:03:49 UTC (rev 102218)
+++ PKGBUILD2013-12-06 17:41:16 UTC (rev 102219)
@@ -5,7 +5,7 @@
 # Contributor: Daniel J Griffiths ghost1...@archlinux.us
 
 pkgname=qcad
-pkgver=3.4.3.0
+pkgver=3.4.4.0
 pkgrel=1
 pkgdesc=A 2D CAD package based upon Qt
 arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@
 options=('libtool')
 
source=($pkgname-$pkgver.tar.gz::https://github.com/qcad/qcad/archive/v${pkgver}.tar.gz
 QCad.desktop)
-md5sums=('f3e3499418a6e9bd88c1d3230c598d85'
+md5sums=('0363ae9a55d1d8067fa166aade51f973'
  '35100eaedbdf6625f6e6a09b177854cd')
 
 prepare() {



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

2013-11-28 Thread Sergej Pupykin
Date: Thursday, November 28, 2013 @ 14:57:34
  Author: spupykin
Revision: 101590

upgpkg: qcad 3.4.3.0-1

upd

Modified:
  qcad/trunk/PKGBUILD

--+
 PKGBUILD |9 -
 1 file changed, 4 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-11-28 12:12:26 UTC (rev 101589)
+++ PKGBUILD2013-11-28 13:57:34 UTC (rev 101590)
@@ -5,7 +5,7 @@
 # Contributor: Daniel J Griffiths ghost1...@archlinux.us
 
 pkgname=qcad
-pkgver=3.4.0.0
+pkgver=3.4.3.0
 pkgrel=1
 pkgdesc=A 2D CAD package based upon Qt
 arch=('i686' 'x86_64')
@@ -13,16 +13,15 @@
 license=('GPL3')
 depends=('qtwebkit')
 makedepends=('glu')
-options=(libtool)
+options=('libtool')
 
source=($pkgname-$pkgver.tar.gz::https://github.com/qcad/qcad/archive/v${pkgver}.tar.gz
 QCad.desktop)
-md5sums=('b781fb8dcf8ba2725bbccf315a1da44f'
+md5sums=('f3e3499418a6e9bd88c1d3230c598d85'
  '35100eaedbdf6625f6e6a09b177854cd')
 
 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
+  sed -i '1,1i#include stdint.h' src/core/RThread.cpp
 }
 
 build() {



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

2013-10-24 Thread Sergej Pupykin
Date: Thursday, October 24, 2013 @ 12:41:44
  Author: spupykin
Revision: 99092

upgpkg: qcad 3.4.0.0-1

upd

Modified:
  qcad/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-10-24 10:41:34 UTC (rev 99091)
+++ PKGBUILD2013-10-24 10:41:44 UTC (rev 99092)
@@ -5,7 +5,7 @@
 # Contributor: Daniel J Griffiths ghost1...@archlinux.us
 
 pkgname=qcad
-pkgver=3.3.4.0
+pkgver=3.4.0.0
 pkgrel=1
 pkgdesc=A 2D CAD package based upon Qt
 arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@
 options=(libtool)
 
source=($pkgname-$pkgver.tar.gz::https://github.com/qcad/qcad/archive/v${pkgver}.tar.gz
 QCad.desktop)
-md5sums=('ceec731e034aa2e2e9a1f1669ec55e57'
+md5sums=('b781fb8dcf8ba2725bbccf315a1da44f'
  '35100eaedbdf6625f6e6a09b177854cd')
 
 prepare() {



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

2013-10-21 Thread Sergej Pupykin
Date: Monday, October 21, 2013 @ 14:17:43
  Author: spupykin
Revision: 98919

Modified:
  qcad/trunk/PKGBUILD

--+
 PKGBUILD |   12 
 1 file changed, 4 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-10-21 12:15:57 UTC (rev 98918)
+++ PKGBUILD2013-10-21 12:17:43 UTC (rev 98919)
@@ -5,7 +5,7 @@
 # Contributor: Daniel J Griffiths ghost1...@archlinux.us
 
 pkgname=qcad
-pkgver=3.3.1.0
+pkgver=3.3.4.0
 pkgrel=1
 pkgdesc=A 2D CAD package based upon Qt
 arch=('i686' 'x86_64')
@@ -16,17 +16,13 @@
 options=(libtool)
 
source=($pkgname-$pkgver.tar.gz::https://github.com/qcad/qcad/archive/v${pkgver}.tar.gz
 QCad.desktop)
-md5sums=('e6e469482b40515980c416e61482abc2'
+md5sums=('ceec731e034aa2e2e9a1f1669ec55e57'
  '35100eaedbdf6625f6e6a09b177854cd')
 
 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
-  (cd src/3rdparty 
-cp -a qt-labs-qtscriptgenerator-4.8.4 qt-labs-qtscriptgenerator-4.8.5)
-  (cd src/3rdparty/qt-labs-qtscriptgenerator-4.8.5 
-mv qt-labs-qtscriptgenerator-4.8.4.pro qt-labs-qtscriptgenerator-4.8.5.pro)
+#  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() {



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

2013-09-23 Thread Sergej Pupykin
Date: Monday, September 23, 2013 @ 18:14:45
  Author: spupykin
Revision: 97522

upgpkg: qcad 3.3.1.0-1

upd

Modified:
  qcad/trunk/PKGBUILD

--+
 PKGBUILD |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-09-23 16:14:41 UTC (rev 97521)
+++ PKGBUILD2013-09-23 16:14:45 UTC (rev 97522)
@@ -5,7 +5,7 @@
 # Contributor: Daniel J Griffiths ghost1...@archlinux.us
 
 pkgname=qcad
-pkgver=3.2.2.2
+pkgver=3.3.1.0
 pkgrel=1
 pkgdesc=A 2D CAD package based upon Qt
 arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@
 options=(libtool)
 
source=($pkgname-$pkgver.tar.gz::https://github.com/qcad/qcad/archive/v${pkgver}.tar.gz
 QCad.desktop)
-md5sums=('49c05861b309c48f04ed7910b496e48c'
+md5sums=('e6e469482b40515980c416e61482abc2'
  '35100eaedbdf6625f6e6a09b177854cd')
 
 prepare() {
@@ -64,6 +64,7 @@
   install -Dm644 $srcdir/QCad.desktop 
${pkgdir}/usr/share/applications/QCad.desktop
 
   install -dm0755 $pkgdir/usr/bin
-  echo -e '#!/bin/sh\ncd 
/usr/share/qcad\nLD_LIBRARY_PATH=`pwd`:$LD_LIBRARY_PATH exec ./qcad-bin' 
$pkgdir/usr/bin/qcad
+  echo -e '#!/bin/sh\ncd 
/usr/share/qcad\nLD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}/usr/share/qcad
 exec /usr/share/qcad/qcad-bin $@' $pkgdir/usr/bin/qcad
+
   chmod 0755 $pkgdir/usr/bin/qcad
 }



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

2013-09-06 Thread Sergej Pupykin
Date: Friday, September 6, 2013 @ 20:23:37
  Author: spupykin
Revision: 96851

upgpkg: qcad 3.2.2.2-1

upd

Modified:
  qcad/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-09-06 16:26:13 UTC (rev 96850)
+++ PKGBUILD2013-09-06 18:23:37 UTC (rev 96851)
@@ -5,8 +5,8 @@
 # Contributor: Daniel J Griffiths ghost1...@archlinux.us
 
 pkgname=qcad
-pkgver=3.2.0.0
-pkgrel=2
+pkgver=3.2.2.2
+pkgrel=1
 pkgdesc=A 2D CAD package based upon Qt
 arch=('i686' 'x86_64')
 url=http://www.ribbonsoft.com/qcad.html;
@@ -16,7 +16,7 @@
 options=(libtool)
 
source=($pkgname-$pkgver.tar.gz::https://github.com/qcad/qcad/archive/v${pkgver}.tar.gz
 QCad.desktop)
-md5sums=('6dd9c47742a0193a739d390e81ca67d0'
+md5sums=('49c05861b309c48f04ed7910b496e48c'
  '35100eaedbdf6625f6e6a09b177854cd')
 
 prepare() {



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

2013-08-12 Thread Sergej Pupykin
Date: Monday, August 12, 2013 @ 13:45:04
  Author: spupykin
Revision: 95456

Modified:
  qcad/trunk/PKGBUILD

--+
 PKGBUILD |   10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-08-12 10:25:42 UTC (rev 95455)
+++ PKGBUILD2013-08-12 11:45:04 UTC (rev 95456)
@@ -5,7 +5,7 @@
 # Contributor: Daniel J Griffiths ghost1...@archlinux.us
 
 pkgname=qcad
-pkgver=3.1.2.0
+pkgver=3.2.0.0
 pkgrel=1
 pkgdesc=A 2D CAD package based upon Qt
 arch=('i686' 'x86_64')
@@ -16,18 +16,22 @@
 options=(libtool)
 
source=($pkgname-$pkgver.tar.gz::https://github.com/qcad/qcad/archive/v${pkgver}.tar.gz
 QCad.desktop)
-md5sums=('9741d2e4f01b59107a50c0c95af7b972'
+md5sums=('6dd9c47742a0193a739d390e81ca67d0'
  '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
+  (cd src/3rdparty 
+cp -a qt-labs-qtscriptgenerator-4.8.4 qt-labs-qtscriptgenerator-4.8.5)
+  (cd src/3rdparty/qt-labs-qtscriptgenerator-4.8.5 
+mv qt-labs-qtscriptgenerator-4.8.4.pro qt-labs-qtscriptgenerator-4.8.5.pro)
 }
 
 build() {
   cd ${srcdir}/qcad-$pkgver
-  qmake-qt4
+  qmake-qt4 -r
   make all -j1
 }
 



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

2013-06-25 Thread Sergej Pupykin
Date: Tuesday, June 25, 2013 @ 16:39:44
  Author: spupykin
Revision: 93131

upgpkg: qcad 3.1.2.0-1

upd

Modified:
  qcad/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-06-25 14:39:40 UTC (rev 93130)
+++ PKGBUILD2013-06-25 14:39:44 UTC (rev 93131)
@@ -28,7 +28,7 @@
 build() {
   cd ${srcdir}/qcad-$pkgver
   qmake-qt4
-  make all
+  make all -j1
 }
 
 package() {



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

2013-06-24 Thread 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
===
--- PKGBUILD2013-06-24 17:25:57 UTC (rev 93112)
+++ PKGBUILD2013-06-24 17:26:06 UTC (rev 93113)
@@ -5,8 +5,8 @@
 # Contributor: Daniel J Griffiths ghost1...@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
 }



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

2013-06-03 Thread Sergej Pupykin
Date: Monday, June 3, 2013 @ 15:56:14
  Author: spupykin
Revision: 92282

upgpkg: qcad 3.0.14.0-2

upd

Modified:
  qcad/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-06-03 13:37:54 UTC (rev 92281)
+++ PKGBUILD2013-06-03 13:56:14 UTC (rev 92282)
@@ -6,11 +6,11 @@
 
 pkgname=qcad
 pkgver=3.0.14.0
-pkgrel=1
+pkgrel=2
 pkgdesc=A 2D CAD package based upon Qt
 arch=('i686' 'x86_64')
 url=http://www.ribbonsoft.com/qcad.html;
-license=('GPL2')
+license=('GPL3')
 depends=('qtwebkit')
 makedepends=('glu')
 options=(libtool)



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

2013-05-30 Thread Sergej Pupykin
Date: Thursday, May 30, 2013 @ 11:54:59
  Author: spupykin
Revision: 91960

Modified:
  qcad/trunk/PKGBUILD

--+
 PKGBUILD |   11 +--
 1 file changed, 5 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-05-30 09:44:39 UTC (rev 91959)
+++ PKGBUILD2013-05-30 09:54:59 UTC (rev 91960)
@@ -14,28 +14,27 @@
 depends=('qtwebkit')
 makedepends=('glu')
 options=(libtool)
-#source=(https://github.com/qcad/qcad/archive/v${pkgver}.zip
-source=(http://cl.ly/1u1Y3H290M1S/download/qcad-v${pkgver}.zip
+source=($pkgname-$pkgver.zip::https://github.com/qcad/qcad/archive/v${pkgver}.zip
 QCad.desktop)
-md5sums=('6f52fe016e915850ba942fa760909d4c'
+md5sums=('2c460838235a95a4d969e508a75b8206'
  '8c4288986b78b14a813b005e81b6ba53')
 
 prepare() {
-  cd ${srcdir}
+  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}
+  cd ${srcdir}/qcad-$pkgver
 
   qmake-qt4
   make PREFIX=/usr CXX=g++ -fpermissive
 }
 
 package() {
-  cd ${srcdir}
+  cd ${srcdir}/qcad-$pkgver
 
   # remove project files
   find . \( -name '*.pri' -or -name '.pro' -or -name '*.ts' \) -delete



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

2013-05-30 Thread Sergej Pupykin
Date: Thursday, May 30, 2013 @ 12:14:27
  Author: spupykin
Revision: 91961

Modified:
  qcad/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-05-30 09:54:59 UTC (rev 91960)
+++ PKGBUILD2013-05-30 10:14:27 UTC (rev 91961)
@@ -60,7 +60,7 @@
   done
 
   install -Dm644 scripts/qcad_icon.png 
${pkgdir}/usr/share/pixmaps/qcad_icon.png
-  install -Dm644 QCad.desktop ${pkgdir}/usr/share/applications/QCad.desktop
+  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



[arch-commits] Commit in qcad/trunk (PKGBUILD QCad.desktop qcad.xpm)

2013-05-29 Thread Sergej Pupykin
Date: Wednesday, May 29, 2013 @ 18:33:26
  Author: spupykin
Revision: 91925

Modified:
  qcad/trunk/PKGBUILD
  qcad/trunk/QCad.desktop
Deleted:
  qcad/trunk/qcad.xpm

--+
 PKGBUILD |   56 +---
 QCad.desktop |4 -
 qcad.xpm |  132 -
 3 files changed, 42 insertions(+), 150 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-05-29 11:31:47 UTC (rev 91924)
+++ PKGBUILD2013-05-29 16:33:26 UTC (rev 91925)
@@ -2,44 +2,68 @@
 # Maintainer: Sergej Pupykin pupykin.s+a...@gmail.com
 # Contributor: Stefan Husmann stefan-husm...@t-online.de
 # Contributor: Giovanni Scafora linuxma...@gmail.com
-# Maintainer: Daniel J Griffiths ghost1...@archlinux.us
+# Contributor: Daniel J Griffiths ghost1...@archlinux.us
 
 pkgname=qcad
-pkgver=3.0.14
+pkgver=3.0.14.0
 pkgrel=1
 pkgdesc=A 2D CAD package based upon Qt
 arch=('i686' 'x86_64')
 url=http://www.ribbonsoft.com/qcad.html;
 license=('GPL2')
-depends=('qt4')
+depends=('qtwebkit')
 makedepends=('glu')
 options=(libtool)
-#source=($pkgname-$pkgver::https://github.com/qcad/qcad/archive/v$pkgver.tar.gz
-source=($pkgname::git://github.com/qcad/qcad.git#tag=v$pkgver
-qcad.xpm
+#source=(https://github.com/qcad/qcad/archive/v${pkgver}.zip
+source=(http://cl.ly/1u1Y3H290M1S/download/qcad-v${pkgver}.zip
 QCad.desktop)
-md5sums=('SKIP'
- 'da32fec0d2fb85d96126bf28bb0ab9ff'
- 'b4d1eb6724b4b41f191f1ab6fd859c39')
+md5sums=('6f52fe016e915850ba942fa760909d4c'
+ '8c4288986b78b14a813b005e81b6ba53')
 
 prepare() {
-  cd ${srcdir}/${pkgname}
+  cd ${srcdir}
+
   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}/${pkgname}
+  cd ${srcdir}
+
   qmake-qt4
   make PREFIX=/usr CXX=g++ -fpermissive
 }
 
 package() {
-  cd ${srcdir}/${pkgname}
+  cd ${srcdir}
 
-  install -d ${pkgdir}/usr/share/{qcad,pixmaps,applications}
-  cp -r fonts patterns data library machines ${pkgdir}/usr/share/qcad
+  # remove project files
+  find . \( -name '*.pri' -or -name '.pro' -or -name '*.ts' \) -delete
+  find . \( -name 'Makefile' -name '.gitignore' \) -delete
 
-  install -Dm644 ../../qcad.xpm ${pkgdir}/usr/share/pixmaps/qcad.xpm
-  install -Dm644 ../../QCad.desktop 
${pkgdir}/usr/share/applications/QCad.desktop
+  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
+
+  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
+  # qt
+  for sofiles in /usr/lib/qt4/plugins/imageformats/*.so
+  do
+ln -s ${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##/*/}
+  done
+
+  install -Dm644 scripts/qcad_icon.png 
${pkgdir}/usr/share/pixmaps/qcad_icon.png
+  install -Dm644 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
+  chmod 0755 $pkgdir/usr/bin/qcad
 }

Modified: QCad.desktop
===
--- QCad.desktop2013-05-29 11:31:47 UTC (rev 91924)
+++ QCad.desktop2013-05-29 16:33:26 UTC (rev 91925)
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
-Exec=/usr/bin/qcad
-Icon=/usr/share/pixmaps/qcad.xpm
+Exec=/usr/share/qcad/qcad
+Icon=/usr/share/pixmaps/qcad_icon.png
 Name=QCad
 StartupNotify=true
 Terminal=false

Deleted: qcad.xpm
===
--- qcad.xpm2013-05-29 11:31:47 UTC (rev 91924)
+++ qcad.xpm2013-05-29 16:33:26 UTC (rev 91925)
@@ -1,132 +0,0 @@
-/* XPM */
-static const char * qcad_xpm[] = {
-32 32 97 2,
-  c None,
-. c #3F3F3F,
-+ c #010180,
-@ c #FF,
-# c #E0E0EF,
-$ c #41419F,
-% c #4545A1,
- c #4949A3,
-* c #4D4DA5,
-= c #5151A7,
-- c #A9,
-; c #5959AB,
- c #A2,
-, c #3C3C9D,
-' c #40409F,
-) c #A1,
-! c #4848A3,
-~ c #4C4CA5,
-{ c #5050A7,
-] c #5454A9,
-^ c #5858AB,
-/ c #5D5DAD,
-( c #6161AF,
-_ c #6565B1,
-: c #5C5CAD,
- c #6060AF,
-[ c #6464B1,
-} c #6868B3,
-| c #6C6CB5,
-1 c #7070B7,
-2 c #7474B9,
-3 c #7878BB,
-4 c #3F3F9E,
-5 c #4343A0,
-6 c #4747A3,
-7 c #4B4BA5,
-8 c #00,
-9 c #7C7CBD,
-0 c #8080BF,
-a c #4747A2,
-b c #4B4BA4,
-c c #4F4FA6,
-d c 

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

2013-05-21 Thread Sergej Pupykin
Date: Tuesday, May 21, 2013 @ 18:22:00
  Author: spupykin
Revision: 91392

qcad3 draft

Modified:
  qcad/trunk/PKGBUILD
Deleted:
  qcad/trunk/qcad-intptr.patch
  qcad/trunk/qcad.patch

---+
 PKGBUILD  |   54 
 qcad-intptr.patch |   24 ---
 qcad.patch|   52 --
 3 files changed, 21 insertions(+), 109 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-05-21 15:39:20 UTC (rev 91391)
+++ PKGBUILD2013-05-21 16:22:00 UTC (rev 91392)
@@ -5,53 +5,41 @@
 # Maintainer: Daniel J Griffiths ghost1...@archlinux.us
 
 pkgname=qcad
-pkgver=2.0.5.0
-pkgrel=12
+pkgver=3.0.14
+pkgrel=1
 pkgdesc=A 2D CAD package based upon Qt
 arch=('i686' 'x86_64')
 url=http://www.ribbonsoft.com/qcad.html;
 license=('GPL2')
-depends=('qt3')
+depends=('qt4')
 makedepends=('glu')
 options=(libtool)
-source=(http://www.ribbonsoft.com/archives/$pkgname/$pkgname-$pkgver-1-community.src.tar.gz
+#source=($pkgname-$pkgver::https://github.com/qcad/qcad/archive/v$pkgver.tar.gz
+source=($pkgname::git://github.com/qcad/qcad.git#tag=v$pkgver
 qcad.xpm
-QCad.desktop
-qcad-intptr.patch
-qcad.patch)
-md5sums=('96b6a56027782aec953c9c4e64c5998c'
+QCad.desktop)
+md5sums=('SKIP'
  'da32fec0d2fb85d96126bf28bb0ab9ff'
- 'b4d1eb6724b4b41f191f1ab6fd859c39'
- '92f900fe1fd3a8f841232b587b49c7da'
- '7e6779b1e3b10da1eb4daf36d93f8479')
-# http://ghost1227.com/files/misc/qm.tar.gz)
+ 'b4d1eb6724b4b41f191f1ab6fd859c39')
 
+prepare() {
+  cd ${srcdir}/${pkgname}
+  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}/${pkgname}-2.0.5.0-1-community.src
-
-  [ $CARCH = x86_64 ]  {
-patch -p1  ../qcad-intptr.patch;
-sed -i '1,1i#include stdint.h' qcadlib/src/engine/rs_layer.cpp 
qcadlib/src/engine/rs_entity.cpp;
-  }
-  patch -p1  ../qcad.patch
-  sed -i s:-pedantic::g mkspecs/defs.pro
-
-  cd scripts
-  sed -i s|INCLUDEPATH += ../include|INCLUDEPATH += ../include 
/usr/include/qt3| ../*/src/*.pro
-  sed -i s|../../qcadlib/include|../../qcadlib/include /usr/include/qt3| 
../qcad/src/qcad.pro
-  sed -i s/qmake/qmake-qt3/ build_qcad.sh
-  sed -i 's|eval $MAKE|sed -i s/-lqt/-lqt-mt/ ../qcad/src/Makefile;eval 
$MAKE|'  build_qcad.sh
-  QTDIR=/usr/lib/qt3 ./build_qcad.sh notrans
+  cd ${srcdir}/${pkgname}
+  qmake-qt4
+  make PREFIX=/usr CXX=g++ -fpermissive
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-2.0.5.0-1-community.src/qcad
+  cd ${srcdir}/${pkgname}
 
-  install -D -m755 qcad ${pkgdir}/usr/bin/qcad
   install -d ${pkgdir}/usr/share/{qcad,pixmaps,applications}
-  install -m644 ../../qcad.xpm ${pkgdir}/usr/share/pixmaps/qcad.xpm
-  install -m644 ../../QCad.desktop \
-${pkgdir}/usr/share/applications/QCad.desktop
   cp -r fonts patterns data library machines ${pkgdir}/usr/share/qcad
-  #cp -r ${srcdir}/qm ${pkgdir}/usr/share/qcad/
+
+  install -Dm644 ../../qcad.xpm ${pkgdir}/usr/share/pixmaps/qcad.xpm
+  install -Dm644 ../../QCad.desktop 
${pkgdir}/usr/share/applications/QCad.desktop
 }

Deleted: qcad-intptr.patch
===
--- qcad-intptr.patch   2013-05-21 15:39:20 UTC (rev 91391)
+++ qcad-intptr.patch   2013-05-21 16:22:00 UTC (rev 91392)
@@ -1,24 +0,0 @@
-diff -Naur qcad-2.0.4.0-1.src.orig/qcadlib/src/engine/rs_entity.cpp 
qcad-2.0.4.0-1.src.patched/qcadlib/src/engine/rs_entity.cpp
 qcad-2.0.4.0-1.src.orig/qcadlib/src/engine/rs_entity.cpp   2004-09-14 
15:13:02.0 -0500
-+++ qcad-2.0.4.0-1.src.patched/qcadlib/src/engine/rs_entity.cpp
2006-06-23 14:21:40.0 -0500
-@@ -849,7 +849,7 @@
- os   layer: NULL ;
- } else {
- os   layer:   e.layer-getName().latin1()   ;
--os   layer address:   (int)(e.layer)   ;
-+os   layer address:   (intptr_t)(e.layer)   ;
- }
- 
- os  e.pen  \n;
-diff -Naur qcad-2.0.4.0-1.src.orig/qcadlib/src/engine/rs_layer.cpp 
qcad-2.0.4.0-1.src.patched/qcadlib/src/engine/rs_layer.cpp
 qcad-2.0.4.0-1.src.orig/qcadlib/src/engine/rs_layer.cpp2004-09-14 
15:13:02.0 -0500
-+++ qcad-2.0.4.0-1.src.patched/qcadlib/src/engine/rs_layer.cpp 2006-06-23 
14:21:23.0 -0500
-@@ -57,7 +57,7 @@
- os   name:   l.getName().latin1()
-   pen:   l.getPen()
- frozen:   (int)l.isFrozen()
--address:   (int)(l)
-+address:   (intptr_t)(l)
-  std::endl;
- return os;
- }

Deleted: qcad.patch
===
--- qcad.patch  2013-05-21 15:39:20 UTC (rev 91391)
+++ qcad.patch  2013-05-21 16:22:00 UTC (rev 91392)
@@ -1,52 +0,0 @@
-diff -aur qcad-2.0.5.0-1-community.src.orig/dxflib/src/dl_writer.h 

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

2013-04-29 Thread Sergej Pupykin
Date: Monday, April 29, 2013 @ 17:31:32
  Author: spupykin
Revision: 89497

upgpkg: qcad 2.0.5.0-12

upd

Modified:
  qcad/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-04-29 15:31:24 UTC (rev 89496)
+++ PKGBUILD2013-04-29 15:31:32 UTC (rev 89497)
@@ -6,7 +6,7 @@
 
 pkgname=qcad
 pkgver=2.0.5.0
-pkgrel=11
+pkgrel=12
 pkgdesc=A 2D CAD package based upon Qt
 arch=('i686' 'x86_64')
 url=http://www.ribbonsoft.com/qcad.html;



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

2013-04-09 Thread Eric BĂ©langer
Date: Tuesday, April 9, 2013 @ 23:43:59
  Author: eric
Revision: 88001

Add build fix for qt3 in /usr

Modified:
  qcad/trunk/PKGBUILD

--+
 PKGBUILD |   11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-04-09 21:42:58 UTC (rev 88000)
+++ PKGBUILD2013-04-09 21:43:59 UTC (rev 88001)
@@ -19,17 +19,14 @@
 QCad.desktop
 qcad-intptr.patch
 qcad.patch)
-   # http://ghost1227.com/files/misc/qm.tar.gz)
 md5sums=('96b6a56027782aec953c9c4e64c5998c'
  'da32fec0d2fb85d96126bf28bb0ab9ff'
  'b4d1eb6724b4b41f191f1ab6fd859c39'
  '92f900fe1fd3a8f841232b587b49c7da'
  '7e6779b1e3b10da1eb4daf36d93f8479')
+# http://ghost1227.com/files/misc/qm.tar.gz)
 
 build() {
-  export PATH=/opt/qt/bin:$PATH
-  export QTDIR=/opt/qt
-
   cd ${srcdir}/${pkgname}-2.0.5.0-1-community.src
 
   [ $CARCH = x86_64 ]  {
@@ -40,7 +37,11 @@
   sed -i s:-pedantic::g mkspecs/defs.pro
 
   cd scripts
-  ./build_qcad.sh notrans
+  sed -i s|INCLUDEPATH += ../include|INCLUDEPATH += ../include 
/usr/include/qt3| ../*/src/*.pro
+  sed -i s|../../qcadlib/include|../../qcadlib/include /usr/include/qt3| 
../qcad/src/qcad.pro
+  sed -i s/qmake/qmake-qt3/ build_qcad.sh
+  sed -i 's|eval $MAKE|sed -i s/-lqt/-lqt-mt/ ../qcad/src/Makefile;eval 
$MAKE|'  build_qcad.sh
+  QTDIR=/usr/lib/qt3 ./build_qcad.sh notrans
 }
 
 package() {



<    1   2