[arch-commits] Commit in qcad/repos (12 files)

Sergej Pupykin spupykin at nymeria.archlinux.org
Mon Apr 29 15:31:57 UTC 2013


    Date: Monday, April 29, 2013 @ 17:31:56
  Author: spupykin
Revision: 89498

archrelease: copy trunk to community-staging-i686, community-staging-x86_64

Added:
  qcad/repos/community-staging-i686/
  qcad/repos/community-staging-i686/PKGBUILD
    (from rev 89497, qcad/trunk/PKGBUILD)
  qcad/repos/community-staging-i686/QCad.desktop
    (from rev 89497, qcad/trunk/QCad.desktop)
  qcad/repos/community-staging-i686/qcad-intptr.patch
    (from rev 89497, qcad/trunk/qcad-intptr.patch)
  qcad/repos/community-staging-i686/qcad.patch
    (from rev 89497, qcad/trunk/qcad.patch)
  qcad/repos/community-staging-i686/qcad.xpm
    (from rev 89497, qcad/trunk/qcad.xpm)
  qcad/repos/community-staging-x86_64/
  qcad/repos/community-staging-x86_64/PKGBUILD
    (from rev 89497, qcad/trunk/PKGBUILD)
  qcad/repos/community-staging-x86_64/QCad.desktop
    (from rev 89497, qcad/trunk/QCad.desktop)
  qcad/repos/community-staging-x86_64/qcad-intptr.patch
    (from rev 89497, qcad/trunk/qcad-intptr.patch)
  qcad/repos/community-staging-x86_64/qcad.patch
    (from rev 89497, qcad/trunk/qcad.patch)
  qcad/repos/community-staging-x86_64/qcad.xpm
    (from rev 89497, qcad/trunk/qcad.xpm)

--------------------------------------------+
 community-staging-i686/PKGBUILD            |   57 +++++++++++
 community-staging-i686/QCad.desktop        |    9 +
 community-staging-i686/qcad-intptr.patch   |   24 ++++
 community-staging-i686/qcad.patch          |   52 ++++++++++
 community-staging-i686/qcad.xpm            |  132 +++++++++++++++++++++++++++
 community-staging-x86_64/PKGBUILD          |   57 +++++++++++
 community-staging-x86_64/QCad.desktop      |    9 +
 community-staging-x86_64/qcad-intptr.patch |   24 ++++
 community-staging-x86_64/qcad.patch        |   52 ++++++++++
 community-staging-x86_64/qcad.xpm          |  132 +++++++++++++++++++++++++++
 10 files changed, 548 insertions(+)

Copied: qcad/repos/community-staging-i686/PKGBUILD (from rev 89497, qcad/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD	                        (rev 0)
+++ community-staging-i686/PKGBUILD	2013-04-29 15:31:56 UTC (rev 89498)
@@ -0,0 +1,57 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Stefan Husmann <stefan-husmann at t-online.de>
+# Contributor: Giovanni Scafora <linuxmania at gmail.com>
+# Maintainer: Daniel J Griffiths <ghost1227 at archlinux.us>
+
+pkgname=qcad
+pkgver=2.0.5.0
+pkgrel=12
+pkgdesc="A 2D CAD package based upon Qt"
+arch=('i686' 'x86_64')
+url="http://www.ribbonsoft.com/qcad.html"
+license=('GPL2')
+depends=('qt3')
+makedepends=('glu')
+options=(libtool)
+source=(http://www.ribbonsoft.com/archives/$pkgname/$pkgname-$pkgver-1-community.src.tar.gz
+        qcad.xpm
+        QCad.desktop
+        qcad-intptr.patch
+        qcad.patch)
+md5sums=('96b6a56027782aec953c9c4e64c5998c'
+         'da32fec0d2fb85d96126bf28bb0ab9ff'
+         'b4d1eb6724b4b41f191f1ab6fd859c39'
+         '92f900fe1fd3a8f841232b587b49c7da'
+         '7e6779b1e3b10da1eb4daf36d93f8479')
+# http://ghost1227.com/files/misc/qm.tar.gz)
+
+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
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-2.0.5.0-1-community.src/qcad
+
+  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/
+}

Copied: qcad/repos/community-staging-i686/QCad.desktop (from rev 89497, qcad/trunk/QCad.desktop)
===================================================================
--- community-staging-i686/QCad.desktop	                        (rev 0)
+++ community-staging-i686/QCad.desktop	2013-04-29 15:31:56 UTC (rev 89498)
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+Exec=/usr/bin/qcad
+Icon=/usr/share/pixmaps/qcad.xpm
+Name=QCad
+StartupNotify=true
+Terminal=false
+Type=Application
+Categories=Application;Office;

Copied: qcad/repos/community-staging-i686/qcad-intptr.patch (from rev 89497, qcad/trunk/qcad-intptr.patch)
===================================================================
--- community-staging-i686/qcad-intptr.patch	                        (rev 0)
+++ community-staging-i686/qcad-intptr.patch	2013-04-29 15:31:56 UTC (rev 89498)
@@ -0,0 +1,24 @@
+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.000000000 -0500
++++ qcad-2.0.4.0-1.src.patched/qcadlib/src/engine/rs_entity.cpp	2006-06-23 14:21:40.000000000 -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.cpp	2004-09-14 15:13:02.000000000 -0500
++++ qcad-2.0.4.0-1.src.patched/qcadlib/src/engine/rs_layer.cpp	2006-06-23 14:21:23.000000000 -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;
+ }

Copied: qcad/repos/community-staging-i686/qcad.patch (from rev 89497, qcad/trunk/qcad.patch)
===================================================================
--- community-staging-i686/qcad.patch	                        (rev 0)
+++ community-staging-i686/qcad.patch	2013-04-29 15:31:56 UTC (rev 89498)
@@ -0,0 +1,52 @@
+diff -aur qcad-2.0.5.0-1-community.src.orig/dxflib/src/dl_writer.h qcad-2.0.5.0-1-community.src.new/dxflib/src/dl_writer.h
+--- qcad-2.0.5.0-1-community.src.orig/dxflib/src/dl_writer.h	2008-12-11 22:28:20.000000000 +0100
++++ qcad-2.0.5.0-1-community.src.new/dxflib/src/dl_writer.h	2008-12-11 22:29:51.000000000 +0100
+@@ -37,6 +37,7 @@
+ #endif
+ 
+ #include <iostream>
++#include <cstring>
+ 
+ #include "dl_attributes.h"
+ #include "dl_codes.h"
+diff -aur qcad-2.0.5.0-1-community.src.orig/qcadactions/src/rs_actionzoompan.cpp qcad-2.0.5.0-1-community.src.new/qcadactions/src/rs_actionzoompan.cpp
+--- qcad-2.0.5.0-1-community.src.orig/qcadactions/src/rs_actionzoompan.cpp	2008-12-11 22:28:20.000000000 +0100
++++ qcad-2.0.5.0-1-community.src.new/qcadactions/src/rs_actionzoompan.cpp	2008-12-11 22:29:51.000000000 +0100
+@@ -23,7 +23,7 @@
+ ** not clear to you.
+ **
+ **********************************************************************/
+-
++#include <cstdlib>
+ #include "rs_actionzoompan.h"
+ #include "rs_snapper.h"
+ #include "rs_point.h"
+Nur in qcad-2.0.5.0-1-community.src.new/qcadlib/src/engine: rs_entity.cpp.orig.rej.
+Nur in qcad-2.0.5.0-1-community.src.new/qcadlib/src/engine: rs_entity.cpp.rej.
+Nur in qcad-2.0.5.0-1-community.src.new/qcadlib/src/engine: rs_layer.cpp.orig.rej.
+Nur in qcad-2.0.5.0-1-community.src.new/qcadlib/src/engine: rs_layer.cpp.rej.
+diff -aur qcad-2.0.5.0-1-community.src.orig/qcadlib/src/information/rs_information.cpp qcad-2.0.5.0-1-community.src.new/qcadlib/src/information/rs_information.cpp
+--- qcad-2.0.5.0-1-community.src.orig/qcadlib/src/information/rs_information.cpp	2008-12-11 22:28:20.000000000 +0100
++++ qcad-2.0.5.0-1-community.src.new/qcadlib/src/information/rs_information.cpp	2008-12-11 22:30:18.000000000 +0100
+@@ -25,7 +25,7 @@
+ **********************************************************************/
+ 
+ #include "rs_information.h"
+-
++#include <cstdlib>
+ #include "rs_constructionline.h"
+ 
+ 
+diff -aur qcad-2.0.5.0-1-community.src.orig/scripts/build_qcad.sh qcad-2.0.5.0-1-community.src.new/scripts/build_qcad.sh
+--- qcad-2.0.5.0-1-community.src.orig/scripts/build_qcad.sh	2008-12-11 22:28:20.000000000 +0100
++++ qcad-2.0.5.0-1-community.src.new/scripts/build_qcad.sh	2008-12-11 22:31:37.000000000 +0100
+@@ -16,9 +16,6 @@
+ echo "  distcc      use distcc for distributed compilation. DISTCC_HOSTS must be set."
+ echo
+ 
+-echo "QTDIR is: $QTDIR"
+-echo "QMAKESPEC is: $QMAKESPEC"
+-
+ # detect system:
+ if [ "x$OS" == "xWindows_NT" ]
+ then

Copied: qcad/repos/community-staging-i686/qcad.xpm (from rev 89497, qcad/trunk/qcad.xpm)
===================================================================
--- community-staging-i686/qcad.xpm	                        (rev 0)
+++ community-staging-i686/qcad.xpm	2013-04-29 15:31:56 UTC (rev 89498)
@@ -0,0 +1,132 @@
+/* XPM */
+static const char * qcad_xpm[] = {
+"32 32 97 2",
+"  	c None",
+". 	c #3F3F3F",
+"+ 	c #010180",
+"@ 	c #FFFFFF",
+"# 	c #E0E0EF",
+"$ 	c #41419F",
+"% 	c #4545A1",
+"& 	c #4949A3",
+"* 	c #4D4DA5",
+"= 	c #5151A7",
+"- 	c #5555A9",
+"; 	c #5959AB",
+"> 	c #4444A2",
+", 	c #3C3C9D",
+"' 	c #40409F",
+") 	c #4444A1",
+"! 	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 #000000",
+"9 	c #7C7CBD",
+"0 	c #8080BF",
+"a 	c #4747A2",
+"b 	c #4B4BA4",
+"c 	c #4F4FA6",
+"d 	c #7B7BBD",
+"e 	c #7F7FBF",
+"f 	c #8383C1",
+"g 	c #5353A8",
+"h 	c #8787C3",
+"i 	c #5757AA",
+"j 	c #8B8BC5",
+"k 	c #4E4EA6",
+"l 	c #5252A8",
+"m 	c #5656AA",
+"n 	c #5A5AAC",
+"o 	c #8787C2",
+"p 	c #8F8FC7",
+"q 	c #5E5EAE",
+"r 	c #8B8BC4",
+"s 	c #8F8FC6",
+"t 	c #9393C8",
+"u 	c #6262B0",
+"v 	c #8E8EC6",
+"w 	c #9292C8",
+"x 	c #9696CA",
+"y 	c #6666B2",
+"z 	c #9A9ACC",
+"A 	c #6A6AB4",
+"B 	c #9E9ECE",
+"C 	c #6565B2",
+"D 	c #6969B4",
+"E 	c #6D6DB6",
+"F 	c #7171B8",
+"G 	c #7575BA",
+"H 	c #9D9DCE",
+"I 	c #A1A1D0",
+"J 	c #7171B7",
+"K 	c #7575B9",
+"L 	c #7979BC",
+"M 	c #7D7DBE",
+"N 	c #8181C0",
+"O 	c #8585C2",
+"P 	c #8989C4",
+"Q 	c #8D8DC6",
+"R 	c #9191C8",
+"S 	c #9595CA",
+"T 	c #9999CC",
+"U 	c #A5A5D2",
+"V 	c #7979BB",
+"W 	c #7D7DBD",
+"X 	c #8181BF",
+"Y 	c #8585C1",
+"Z 	c #8989C3",
+"` 	c #A9A9D4",
+" .	c #8D8DC5",
+"..	c #9191C7",
+"+.	c #9595C9",
+"@.	c #9999CB",
+"#.	c #ADADD6",
+"                                                                ",
+"    . . . . . . . . . . . . . . . . . . . . . . . . . . . . .   ",
+"    .       .       .       .       .       .       .       .   ",
+"    .       .       .   + + + + + + +       .       .       .   ",
+"    .     @ .     @ + + # # # # # # # + + @ .     @ .     @ .   ",
+"    . . . . . . . + # # $ % & * = - ; > > + . . . . . . . . .   ",
+"    .       .   + # , ' ) ! ~ { ] ^ / ( _ > +       .       .   ",
+"    .       . + # , ' ) ! ~ { ] ^ : < [ } | > +     .       .   ",
+"    .     @ + # , ' ) ! ~ { ] ^ : < [ } | 1 2 > + @ .     @ .   ",
+"    . . . . + # ' ) ! . . . . . . . . . 1 2 3 > + . . . . . .   ",
+"    .     + # 4 5 6 7 . @ @ @ @ @ @ @ . 8 3 9 0 > + .       .   ",
+"    .     + # 5 a b c . @ @ @ @ @ @ @ . 8 d e f > + .       .   ",
+"    .     + # a b c g . @ @ @ @ @ @ @ . 8 e f h > + .     @ .   ",
+"    . . . + # b c g i . @ @ @ @ @ @ @ . 8 f h j > + . . . . .   ",
+"    .     + # k l m n . @ @ @ @ @ @ @ . 8 o j p > + .       .   ",
+"    .     + # l m n q . @ @ @ @ @ @ @ . 8 r s t > + .       .   ",
+"    .     + # m n q u . @ @ @ @ @ @ @ . 8 v w x > + .     @ .   ",
+"    . . . + # n q u y . @ @ @ @ @ @ @ . 8 w x z > + . . . . .   ",
+"    .     + # q u y A . @ @ @ @ @ @ @ . 8 x z B > + .       .   ",
+"    .       + > C D E . . . . . . . . . 8 z B > +   .       .   ",
+"    .     @ + > D E F G 8 8 8 8 8 8 8 8 8 H I > + @ .     @ .   ",
+"    . . . . . + > J K L M N O P Q R S T H I U + . . . . . . .   ",
+"    .       .   + > V W X Y Z Q R S T H I U ` > +   .       .   ",
+"    .       .     + > > Y Z  ...+. at .H > U ` #.#.> + .       .   ",
+"    .     @ .     @ + + > > > > > > > + > #.#.#.> + .     @ .   ",
+"    . . . . . . . . . . + + + + + + + . + > #.#.> + . . . . .   ",
+"    .       .       .       .       .     + > > +   .       .   ",
+"    .       .       .       .       .       + +     .       .   ",
+"    .     @ .     @ .     @ .     @ .     @ .     @ .     @ .   ",
+"    . . . . . . . . . . . . . . . . . . . . . . . . . . . . .   ",
+"                                                                ",
+"                                                                "};

Copied: qcad/repos/community-staging-x86_64/PKGBUILD (from rev 89497, qcad/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD	                        (rev 0)
+++ community-staging-x86_64/PKGBUILD	2013-04-29 15:31:56 UTC (rev 89498)
@@ -0,0 +1,57 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Stefan Husmann <stefan-husmann at t-online.de>
+# Contributor: Giovanni Scafora <linuxmania at gmail.com>
+# Maintainer: Daniel J Griffiths <ghost1227 at archlinux.us>
+
+pkgname=qcad
+pkgver=2.0.5.0
+pkgrel=12
+pkgdesc="A 2D CAD package based upon Qt"
+arch=('i686' 'x86_64')
+url="http://www.ribbonsoft.com/qcad.html"
+license=('GPL2')
+depends=('qt3')
+makedepends=('glu')
+options=(libtool)
+source=(http://www.ribbonsoft.com/archives/$pkgname/$pkgname-$pkgver-1-community.src.tar.gz
+        qcad.xpm
+        QCad.desktop
+        qcad-intptr.patch
+        qcad.patch)
+md5sums=('96b6a56027782aec953c9c4e64c5998c'
+         'da32fec0d2fb85d96126bf28bb0ab9ff'
+         'b4d1eb6724b4b41f191f1ab6fd859c39'
+         '92f900fe1fd3a8f841232b587b49c7da'
+         '7e6779b1e3b10da1eb4daf36d93f8479')
+# http://ghost1227.com/files/misc/qm.tar.gz)
+
+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
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-2.0.5.0-1-community.src/qcad
+
+  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/
+}

Copied: qcad/repos/community-staging-x86_64/QCad.desktop (from rev 89497, qcad/trunk/QCad.desktop)
===================================================================
--- community-staging-x86_64/QCad.desktop	                        (rev 0)
+++ community-staging-x86_64/QCad.desktop	2013-04-29 15:31:56 UTC (rev 89498)
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+Exec=/usr/bin/qcad
+Icon=/usr/share/pixmaps/qcad.xpm
+Name=QCad
+StartupNotify=true
+Terminal=false
+Type=Application
+Categories=Application;Office;

Copied: qcad/repos/community-staging-x86_64/qcad-intptr.patch (from rev 89497, qcad/trunk/qcad-intptr.patch)
===================================================================
--- community-staging-x86_64/qcad-intptr.patch	                        (rev 0)
+++ community-staging-x86_64/qcad-intptr.patch	2013-04-29 15:31:56 UTC (rev 89498)
@@ -0,0 +1,24 @@
+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.000000000 -0500
++++ qcad-2.0.4.0-1.src.patched/qcadlib/src/engine/rs_entity.cpp	2006-06-23 14:21:40.000000000 -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.cpp	2004-09-14 15:13:02.000000000 -0500
++++ qcad-2.0.4.0-1.src.patched/qcadlib/src/engine/rs_layer.cpp	2006-06-23 14:21:23.000000000 -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;
+ }

Copied: qcad/repos/community-staging-x86_64/qcad.patch (from rev 89497, qcad/trunk/qcad.patch)
===================================================================
--- community-staging-x86_64/qcad.patch	                        (rev 0)
+++ community-staging-x86_64/qcad.patch	2013-04-29 15:31:56 UTC (rev 89498)
@@ -0,0 +1,52 @@
+diff -aur qcad-2.0.5.0-1-community.src.orig/dxflib/src/dl_writer.h qcad-2.0.5.0-1-community.src.new/dxflib/src/dl_writer.h
+--- qcad-2.0.5.0-1-community.src.orig/dxflib/src/dl_writer.h	2008-12-11 22:28:20.000000000 +0100
++++ qcad-2.0.5.0-1-community.src.new/dxflib/src/dl_writer.h	2008-12-11 22:29:51.000000000 +0100
+@@ -37,6 +37,7 @@
+ #endif
+ 
+ #include <iostream>
++#include <cstring>
+ 
+ #include "dl_attributes.h"
+ #include "dl_codes.h"
+diff -aur qcad-2.0.5.0-1-community.src.orig/qcadactions/src/rs_actionzoompan.cpp qcad-2.0.5.0-1-community.src.new/qcadactions/src/rs_actionzoompan.cpp
+--- qcad-2.0.5.0-1-community.src.orig/qcadactions/src/rs_actionzoompan.cpp	2008-12-11 22:28:20.000000000 +0100
++++ qcad-2.0.5.0-1-community.src.new/qcadactions/src/rs_actionzoompan.cpp	2008-12-11 22:29:51.000000000 +0100
+@@ -23,7 +23,7 @@
+ ** not clear to you.
+ **
+ **********************************************************************/
+-
++#include <cstdlib>
+ #include "rs_actionzoompan.h"
+ #include "rs_snapper.h"
+ #include "rs_point.h"
+Nur in qcad-2.0.5.0-1-community.src.new/qcadlib/src/engine: rs_entity.cpp.orig.rej.
+Nur in qcad-2.0.5.0-1-community.src.new/qcadlib/src/engine: rs_entity.cpp.rej.
+Nur in qcad-2.0.5.0-1-community.src.new/qcadlib/src/engine: rs_layer.cpp.orig.rej.
+Nur in qcad-2.0.5.0-1-community.src.new/qcadlib/src/engine: rs_layer.cpp.rej.
+diff -aur qcad-2.0.5.0-1-community.src.orig/qcadlib/src/information/rs_information.cpp qcad-2.0.5.0-1-community.src.new/qcadlib/src/information/rs_information.cpp
+--- qcad-2.0.5.0-1-community.src.orig/qcadlib/src/information/rs_information.cpp	2008-12-11 22:28:20.000000000 +0100
++++ qcad-2.0.5.0-1-community.src.new/qcadlib/src/information/rs_information.cpp	2008-12-11 22:30:18.000000000 +0100
+@@ -25,7 +25,7 @@
+ **********************************************************************/
+ 
+ #include "rs_information.h"
+-
++#include <cstdlib>
+ #include "rs_constructionline.h"
+ 
+ 
+diff -aur qcad-2.0.5.0-1-community.src.orig/scripts/build_qcad.sh qcad-2.0.5.0-1-community.src.new/scripts/build_qcad.sh
+--- qcad-2.0.5.0-1-community.src.orig/scripts/build_qcad.sh	2008-12-11 22:28:20.000000000 +0100
++++ qcad-2.0.5.0-1-community.src.new/scripts/build_qcad.sh	2008-12-11 22:31:37.000000000 +0100
+@@ -16,9 +16,6 @@
+ echo "  distcc      use distcc for distributed compilation. DISTCC_HOSTS must be set."
+ echo
+ 
+-echo "QTDIR is: $QTDIR"
+-echo "QMAKESPEC is: $QMAKESPEC"
+-
+ # detect system:
+ if [ "x$OS" == "xWindows_NT" ]
+ then

Copied: qcad/repos/community-staging-x86_64/qcad.xpm (from rev 89497, qcad/trunk/qcad.xpm)
===================================================================
--- community-staging-x86_64/qcad.xpm	                        (rev 0)
+++ community-staging-x86_64/qcad.xpm	2013-04-29 15:31:56 UTC (rev 89498)
@@ -0,0 +1,132 @@
+/* XPM */
+static const char * qcad_xpm[] = {
+"32 32 97 2",
+"  	c None",
+". 	c #3F3F3F",
+"+ 	c #010180",
+"@ 	c #FFFFFF",
+"# 	c #E0E0EF",
+"$ 	c #41419F",
+"% 	c #4545A1",
+"& 	c #4949A3",
+"* 	c #4D4DA5",
+"= 	c #5151A7",
+"- 	c #5555A9",
+"; 	c #5959AB",
+"> 	c #4444A2",
+", 	c #3C3C9D",
+"' 	c #40409F",
+") 	c #4444A1",
+"! 	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 #000000",
+"9 	c #7C7CBD",
+"0 	c #8080BF",
+"a 	c #4747A2",
+"b 	c #4B4BA4",
+"c 	c #4F4FA6",
+"d 	c #7B7BBD",
+"e 	c #7F7FBF",
+"f 	c #8383C1",
+"g 	c #5353A8",
+"h 	c #8787C3",
+"i 	c #5757AA",
+"j 	c #8B8BC5",
+"k 	c #4E4EA6",
+"l 	c #5252A8",
+"m 	c #5656AA",
+"n 	c #5A5AAC",
+"o 	c #8787C2",
+"p 	c #8F8FC7",
+"q 	c #5E5EAE",
+"r 	c #8B8BC4",
+"s 	c #8F8FC6",
+"t 	c #9393C8",
+"u 	c #6262B0",
+"v 	c #8E8EC6",
+"w 	c #9292C8",
+"x 	c #9696CA",
+"y 	c #6666B2",
+"z 	c #9A9ACC",
+"A 	c #6A6AB4",
+"B 	c #9E9ECE",
+"C 	c #6565B2",
+"D 	c #6969B4",
+"E 	c #6D6DB6",
+"F 	c #7171B8",
+"G 	c #7575BA",
+"H 	c #9D9DCE",
+"I 	c #A1A1D0",
+"J 	c #7171B7",
+"K 	c #7575B9",
+"L 	c #7979BC",
+"M 	c #7D7DBE",
+"N 	c #8181C0",
+"O 	c #8585C2",
+"P 	c #8989C4",
+"Q 	c #8D8DC6",
+"R 	c #9191C8",
+"S 	c #9595CA",
+"T 	c #9999CC",
+"U 	c #A5A5D2",
+"V 	c #7979BB",
+"W 	c #7D7DBD",
+"X 	c #8181BF",
+"Y 	c #8585C1",
+"Z 	c #8989C3",
+"` 	c #A9A9D4",
+" .	c #8D8DC5",
+"..	c #9191C7",
+"+.	c #9595C9",
+"@.	c #9999CB",
+"#.	c #ADADD6",
+"                                                                ",
+"    . . . . . . . . . . . . . . . . . . . . . . . . . . . . .   ",
+"    .       .       .       .       .       .       .       .   ",
+"    .       .       .   + + + + + + +       .       .       .   ",
+"    .     @ .     @ + + # # # # # # # + + @ .     @ .     @ .   ",
+"    . . . . . . . + # # $ % & * = - ; > > + . . . . . . . . .   ",
+"    .       .   + # , ' ) ! ~ { ] ^ / ( _ > +       .       .   ",
+"    .       . + # , ' ) ! ~ { ] ^ : < [ } | > +     .       .   ",
+"    .     @ + # , ' ) ! ~ { ] ^ : < [ } | 1 2 > + @ .     @ .   ",
+"    . . . . + # ' ) ! . . . . . . . . . 1 2 3 > + . . . . . .   ",
+"    .     + # 4 5 6 7 . @ @ @ @ @ @ @ . 8 3 9 0 > + .       .   ",
+"    .     + # 5 a b c . @ @ @ @ @ @ @ . 8 d e f > + .       .   ",
+"    .     + # a b c g . @ @ @ @ @ @ @ . 8 e f h > + .     @ .   ",
+"    . . . + # b c g i . @ @ @ @ @ @ @ . 8 f h j > + . . . . .   ",
+"    .     + # k l m n . @ @ @ @ @ @ @ . 8 o j p > + .       .   ",
+"    .     + # l m n q . @ @ @ @ @ @ @ . 8 r s t > + .       .   ",
+"    .     + # m n q u . @ @ @ @ @ @ @ . 8 v w x > + .     @ .   ",
+"    . . . + # n q u y . @ @ @ @ @ @ @ . 8 w x z > + . . . . .   ",
+"    .     + # q u y A . @ @ @ @ @ @ @ . 8 x z B > + .       .   ",
+"    .       + > C D E . . . . . . . . . 8 z B > +   .       .   ",
+"    .     @ + > D E F G 8 8 8 8 8 8 8 8 8 H I > + @ .     @ .   ",
+"    . . . . . + > J K L M N O P Q R S T H I U + . . . . . . .   ",
+"    .       .   + > V W X Y Z Q R S T H I U ` > +   .       .   ",
+"    .       .     + > > Y Z  ...+. at .H > U ` #.#.> + .       .   ",
+"    .     @ .     @ + + > > > > > > > + > #.#.#.> + .     @ .   ",
+"    . . . . . . . . . . + + + + + + + . + > #.#.> + . . . . .   ",
+"    .       .       .       .       .     + > > +   .       .   ",
+"    .       .       .       .       .       + +     .       .   ",
+"    .     @ .     @ .     @ .     @ .     @ .     @ .     @ .   ",
+"    . . . . . . . . . . . . . . . . . . . . . . . . . . . . .   ",
+"                                                                ",
+"                                                                "};




More information about the arch-commits mailing list