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

Sergej Pupykin spupykin at nymeria.archlinux.org
Tue May 21 12:22:01 EDT 2013


    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
===================================================================
--- PKGBUILD	2013-05-21 15:39:20 UTC (rev 91391)
+++ PKGBUILD	2013-05-21 16:22:00 UTC (rev 91392)
@@ -5,53 +5,41 @@
 # Maintainer: Daniel J Griffiths <ghost1227 at 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.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;
- }

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 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



More information about the arch-commits mailing list