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

2017-02-07 Thread Balló György 
Date: Wednesday, February 8, 2017 @ 03:13:04
  Author: bgyorgy
Revision: 211094

upgpkg: qcad 3.16.4.4-1

- Update to new version.
- Remove unused qtwebkit dependency.
- Install files under /usr/lib instead of /usr/share, because the directory 
contains binaries.
- Use desktop file provided by upstream.

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

--+
 PKGBUILD |   39 +++
 QCad.desktop |9 -
 2 files changed, 19 insertions(+), 29 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-02-08 02:35:42 UTC (rev 211093)
+++ PKGBUILD2017-02-08 03:13:04 UTC (rev 211094)
@@ -5,28 +5,29 @@
 # Contributor: Daniel J Griffiths 
 
 pkgname=qcad
-pkgver=3.16.0.0
+pkgver=3.16.4.4
 pkgrel=1
 pkgdesc="A 2D CAD package based upon Qt"
 arch=('i686' 'x86_64')
 url="http://www.qcad.org;
 license=('GPL3')
-depends=('qtwebkit')
-makedepends=('glu' 'gdb')
-options=('libtool')
-source=($pkgname-$pkgver.tar.gz::https://github.com/qcad/qcad/archive/v${pkgver}.tar.gz
-QCad.desktop)
-sha256sums=('4563a2909415fe19e66a9304316be3ba31bc632cfc3d9c971795a7af84720a4d'
-'1e194dcf59122098be0219fa220a0a3f33cf8919f0a778b6cd888da009efc6d5')
+depends=('qt4')
+makedepends=('glu')
+source=($pkgname-$pkgver.tar.gz::https://github.com/qcad/qcad/archive/v${pkgver}.tar.gz)
+sha256sums=('47adfbadff4b00dea4640d67d8db40f7933213d3201488e8abb439615c1faf91')
 
 prepare() {
   cd "$srcdir"/qcad-$pkgver
+
+  # remove unused qtwebkit dependency
+  sed -i '/QT += webkit/d' shared.pri
+  sed -i '/webkit/d' 
src/3rdparty/qt-labs-qtscriptgenerator-4.*/qtbindings/qtbindings.pro
 }
 
 build() {
   cd "$srcdir"/qcad-$pkgver
-  qmake-qt4 -r
-  make all -j1
+  qmake-qt4 qcad.pro
+  make
 }
 
 package() {
@@ -36,29 +37,27 @@
   find . \( -name '*.pri' -or -name '.pro' -or -name '*.ts' \) -delete
   find . \( -name 'Makefile' -name '.gitignore' \) -delete
 
-  install -dm755 "$pkgdir"/usr/share/{qcad,pixmaps,applications}
-  cp -r examples fonts libraries linetypes patterns plugins scripts ts 
"$pkgdir"/usr/share/qcad
-  cp debug/* "$pkgdir"/usr/share/qcad
+  install -dm755 "$pkgdir"/usr/lib/qcad
+  cp -r examples fonts libraries linetypes patterns plugins scripts ts 
"$pkgdir"/usr/lib/qcad
+  cp release/* "$pkgdir"/usr/lib/qcad
 
-  install -m755 readme.txt "$pkgdir"/usr/share/qcad/readme.txt
+  install -m755 readme.txt "$pkgdir"/usr/lib/qcad/readme.txt
 
-  # qtwebkit
-  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 -sf ${sofiles} 
"$pkgdir"/usr/share/qcad/plugins/imageformats/${sofiles##/*/}
+ln -sf ${sofiles} 
"$pkgdir"/usr/lib/qcad/plugins/imageformats/${sofiles##/*/}
   done
   for sofiles in /usr/lib/qt4/plugins/sqldrivers/*.so
   do
-ln -sf ${sofiles} 
"$pkgdir"/usr/share/qcad/plugins/sqldrivers/${sofiles##/*/}
+ln -sf ${sofiles} "$pkgdir"/usr/lib/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 -Dm644 qcad.desktop "$pkgdir"/usr/share/applications/qcad.desktop
 
   install -dm0755 "$pkgdir"/usr/bin
-  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
+  echo -e 
'#!/bin/sh\nLD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}"/usr/lib/qcad"
 exec /usr/lib/qcad/qcad-bin "$@"' >"$pkgdir"/usr/bin/qcad
 
   chmod 0755 "$pkgdir"/usr/bin/qcad
 }

Deleted: QCad.desktop
===
--- QCad.desktop2017-02-08 02:35:42 UTC (rev 211093)
+++ QCad.desktop2017-02-08 03:13:04 UTC (rev 211094)
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Exec=/usr/bin/qcad
-Icon=/usr/share/pixmaps/qcad_icon.png
-Name=QCad
-StartupNotify=true
-Terminal=false
-Type=Application
-Categories=Application;Development;Electronics;Engineering;

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