Added a desktop entry file, and improved the PKGBUILD.

4 files changed, 72 insertions, 82 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 36c66a8804c1..4198d156141a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = draftsight
-	pkgdesc = Dassault Systemes' freeware CAD software for your DWG files.
-	pkgver = V1R6.2
-	pkgrel = 4
+	pkgdesc = Freeware CAD software for your DWG/DXF files.
+	pkgver = SP3
+	pkgrel = 1
 	url = http://www.3ds.com/products/draftsight/
 	install = draftsight.install
 	arch = x86_64
@@ -22,10 +22,11 @@ pkgbase = draftsight
 	depends = libxrender
 	depends = postgresql-libs
 	depends = mesa
-	depends = util-linux
 	depends = zlib
 	source = http://www.draftsight.com/download-linux-fedora
+	source = draftsight.desktop
 	md5sums = 09b495cc90951625100a22c7f1f0960f
+	md5sums = cfda3b8675a93ccfb768873c1a873199
 
 pkgname = draftsight
 
diff --git a/PKGBUILD b/PKGBUILD
index 9c3bb5dd3806..f286ddfc5c59 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,70 +5,75 @@
 # Contributor: Loui Chang <louipc dot ist at gmail company> (SPAMMERS!)
 
 pkgname=draftsight
-pkgver=V1R6.2
-pkgrel=5
-pkgdesc="Dassault Systemes' freeware CAD software for your DWG files."
+pkgver=SP3
+pkgrel=1
+pkgdesc="Freeware CAD software for your DWG/DXF files."
 arch=('x86_64')
 url="http://www.3ds.com/products/draftsight/"
 license=('custom')
-depends=(
-  'desktop-file-utils'
-  'fontconfig'
-  'gcc-libs'
-  'glib2'
-  'gstreamer0.10-base'
-  'gtk2'
-  'libcups'
-  'libgl'
-  'libice'
-  'libmariadbclient'
-  'libsm'
-  'libx11'
-  'libxext'
-  'libxrender'
-  'postgresql-libs'
-  'mesa'
-  'zlib'
-)
+depends=('desktop-file-utils'
+         'fontconfig'
+         'gcc-libs'
+         'glib2'
+         'gstreamer0.10-base'
+         'gtk2'
+         'libcups'
+         'libgl'
+         'libice'
+         'libmariadbclient'
+         'libsm'
+         'libx11'
+         'libxext'
+         'libxrender'
+         'postgresql-libs'
+         'mesa'
+         'zlib')
 install='draftsight.install'
-source=("http://www.draftsight.com/download-linux-fedora")
-md5sums=('09b495cc90951625100a22c7f1f0960f')
+source=("http://www.draftsight.com/download-linux-fedora"
+        "draftsight.desktop")
+md5sums=('09b495cc90951625100a22c7f1f0960f'
+         'cfda3b8675a93ccfb768873c1a873199')
 
 _pkgprefix='opt/dassault-systemes/DraftSight'
 
 package()
 {
-  mkdir -p "${pkgdir}"/${_pkgprefix}
+  mkdir -p $pkgdir/usr/bin
+  echo "env vblank_mode=0 /${_pkgprefix}/Linux/DraftSight" > \
+       $pkgdir/usr/bin/draftsight
+  chmod 755 $pkgdir/usr/bin/draftsight
 
-  mkdir -p "${pkgdir}"/etc/profile.d
-  echo "export PATH=\$PATH:/${_pkgprefix}/bin" > $pkgdir/etc/profile.d/$pkgname.sh
-  chmod 755 "${pkgdir}"/etc/profile.d/$pkgname.sh
+  mkdir -p $pkgdir/$_pkgprefix
+  cd $srcdir/$_pkgprefix
+  install -Dm644 Eula/english/eula.htm $pkgdir/usr/share/licenses/draftsight/LICENSE
+  install -Dm644 Resources/pixmaps/128x128/program.png $pkgdir/usr/share/icons/hicolor/128x128/apps/draftsight.png
+  install -Dm644 Resources/pixmaps/64x64/program.png $pkgdir/usr/share/icons/hicolor/64x64/apps/draftsight.png
+  install -Dm644 Resources/pixmaps/48x48/program.png $pkgdir/usr/share/icons/hicolor/48x48/apps/draftsight.png
+  install -Dm644 Resources/pixmaps/32x32/program.png $pkgdir/usr/share/icons/hicolor/32x32/apps/draftsight.png
+  install -Dm644 Resources/pixmaps/16x16/program.png $pkgdir/usr/share/icons/hicolor/16x16/apps/draftsight.png
+  install -Dm644 Resources/pixmaps/128x128/file-dwg.png $pkgdir/usr/share/icons/hicolor/128x128/mimetypes/file-dwg.png
+  install -Dm644 Resources/pixmaps/64x64/file-dwg.png $pkgdir/usr/share/icons/hicolor/64x64/mimetypes/file-dwg.png
+  install -Dm644 Resources/pixmaps/48x48/file-dwg.png $pkgdir/usr/share/icons/hicolor/48x48/mimetypes/file-dwg.png
+  install -Dm644 Resources/pixmaps/32x32/file-dwg.png $pkgdir/usr/share/icons/hicolor/32x32/mimetypes/file-dwg.png
+  install -Dm644 Resources/pixmaps/16x16/file-dwg.png $pkgdir/usr/share/icons/hicolor/16x16/mimetypes/file-dwg.png
+  install -Dm644 Resources/pixmaps/128x128/file-dxf.png $pkgdir/usr/share/icons/hicolor/128x128/mimetypes/file-dxf.png
+  install -Dm644 Resources/pixmaps/64x64/file-dxf.png $pkgdir/usr/share/icons/hicolor/64x64/mimetypes/file-dxf.png
+  install -Dm644 Resources/pixmaps/48x48/file-dxf.png $pkgdir/usr/share/icons/hicolor/48x48/mimetypes/file-dxf.png
+  install -Dm644 Resources/pixmaps/32x32/file-dxf.png $pkgdir/usr/share/icons/hicolor/32x32/mimetypes/file-dxf.png
+  install -Dm644 Resources/pixmaps/16x16/file-dxf.png $pkgdir/usr/share/icons/hicolor/16x16/mimetypes/file-dxf.png
+  install -Dm644 Resources/pixmaps/128x128/file-dwt.png $pkgdir/usr/share/icons/hicolor/128x128/mimetypes/file-dwt.png
+  install -Dm644 Resources/pixmaps/64x64/file-dwt.png $pkgdir/usr/share/icons/hicolor/64x64/mimetypes/file-dwt.png
+  install -Dm644 Resources/pixmaps/48x48/file-dwt.png $pkgdir/usr/share/icons/hicolor/48x48/mimetypes/file-dwt.png
+  install -Dm644 Resources/pixmaps/32x32/file-dwt.png $pkgdir/usr/share/icons/hicolor/32x32/mimetypes/file-dwt.png
+  install -Dm644 Resources/pixmaps/16x16/file-dwt.png $pkgdir/usr/share/icons/hicolor/16x16/mimetypes/file-dwt.png
+  install -Dm644 Resources/dassault-systemes_draftsight-dwg.xml $pkgdir/usr/share/mime/application/dassault-systemes_draftsight-dwg.xml
+  install -Dm644 Resources/dassault-systemes_draftsight-dxf.xml $pkgdir/usr/share/mime/application/dassault-systemes_draftsight-dxf.xml
+  install -Dm644 Resources/dassault-systemes_draftsight-dwt.xml $pkgdir/usr/share/mime/application/dassault-systemes_draftsight-dwt.xml
 
-  install -D "${srcdir}"/${_pkgprefix}/Eula/english/eula.htm "${pkgdir}"/usr/share/licenses/draftsight/LICENSE
-  install -D "${srcdir}"/${_pkgprefix}/Resources/pixmaps/128x128/program.png "${pkgdir}"/usr/share/icons/hicolor/128x128/apps/program.png
-  install -D "${srcdir}"/${_pkgprefix}/Resources/pixmaps/64x64/program.png "${pkgdir}"/usr/share/icons/hicolor/64x64/apps/program.png
-  install -D "${srcdir}"/${_pkgprefix}/Resources/pixmaps/48x48/program.png "${pkgdir}"/usr/share/icons/hicolor/48x48/apps/program.png
-  install -D "${srcdir}"/${_pkgprefix}/Resources/pixmaps/32x32/program.png "${pkgdir}"/usr/share/icons/hicolor/32x32/apps/program.png
-  install -D "${srcdir}"/${_pkgprefix}/Resources/pixmaps/16x16/program.png "${pkgdir}"/usr/share/icons/hicolor/16x16/apps/program.png
-  install -D "${srcdir}"/${_pkgprefix}/Resources/pixmaps/128x128/file-dwg.png "${pkgdir}"/usr/share/icons/hicolor/128x128/mimetypes/file-dwg.png
-  install -D "${srcdir}"/${_pkgprefix}/Resources/pixmaps/64x64/file-dwg.png "${pkgdir}"/usr/share/icons/hicolor/64x64/mimetypes/file-dwg.png
-  install -D "${srcdir}"/${_pkgprefix}/Resources/pixmaps/48x48/file-dwg.png "${pkgdir}"/usr/share/icons/hicolor/48x48/mimetypes/file-dwg.png
-  install -D "${srcdir}"/${_pkgprefix}/Resources/pixmaps/32x32/file-dwg.png "${pkgdir}"/usr/share/icons/hicolor/32x32/mimetypes/file-dwg.png
-  install -D "${srcdir}"/${_pkgprefix}/Resources/pixmaps/16x16/file-dwg.png "${pkgdir}"/usr/share/icons/hicolor/16x16/mimetypes/file-dwg.png
-  install -D "${srcdir}"/${_pkgprefix}/Resources/pixmaps/128x128/file-dxf.png "${pkgdir}"/usr/share/icons/hicolor/128x128/mimetypes/file-dxf.png
-  install -D "${srcdir}"/${_pkgprefix}/Resources/pixmaps/64x64/file-dxf.png "${pkgdir}"/usr/share/icons/hicolor/64x64/mimetypes/file-dxf.png
-  install -D "${srcdir}"/${_pkgprefix}/Resources/pixmaps/48x48/file-dxf.png "${pkgdir}"/usr/share/icons/hicolor/48x48/mimetypes/file-dxf.png
-  install -D "${srcdir}"/${_pkgprefix}/Resources/pixmaps/32x32/file-dxf.png "${pkgdir}"/usr/share/icons/hicolor/32x32/mimetypes/file-dxf.png
-  install -D "${srcdir}"/${_pkgprefix}/Resources/pixmaps/16x16/file-dxf.png "${pkgdir}"/usr/share/icons/hicolor/16x16/mimetypes/file-dxf.png
-  install -D "${srcdir}"/${_pkgprefix}/Resources/pixmaps/128x128/file-dwt.png "${pkgdir}"/usr/share/icons/hicolor/128x128/mimetypes/file-dwt.png
-  install -D "${srcdir}"/${_pkgprefix}/Resources/pixmaps/64x64/file-dwt.png "${pkgdir}"/usr/share/icons/hicolor/64x64/mimetypes/file-dwt.png
-  install -D "${srcdir}"/${_pkgprefix}/Resources/pixmaps/48x48/file-dwt.png "${pkgdir}"/usr/share/icons/hicolor/48x48/mimetypes/file-dwt.png
-  install -D "${srcdir}"/${_pkgprefix}/Resources/pixmaps/32x32/file-dwt.png "${pkgdir}"/usr/share/icons/hicolor/32x32/mimetypes/file-dwt.png
-  install -D "${srcdir}"/${_pkgprefix}/Resources/pixmaps/16x16/file-dwt.png "${pkgdir}"/usr/share/icons/hicolor/16x16/mimetypes/file-dwt.png
-  install -D "${srcdir}"/${_pkgprefix}/Resources/dassault-systemes_draftsight-dwg.xml "${pkgdir}"/usr/share/mime/application/dassault-systemes_draftsight-dwg.xml
-  install -D "${srcdir}"/${_pkgprefix}/Resources/dassault-systemes_draftsight-dxf.xml "${pkgdir}"/usr/share/mime/application/dassault-systemes_draftsight-dxf.xml
-  install -D "${srcdir}"/${_pkgprefix}/Resources/dassault-systemes_draftsight-dwt.xml "${pkgdir}"/usr/share/mime/application/dassault-systemes_draftsight-dwt.xml
-  install -D "${srcdir}"/${_pkgprefix}/Resources/dassault-systemes_draftsight.desktop "${pkgdir}"/usr/share/applications/dassault-systemes_draftsight.desktop
+  install -Dm644 $srcdir/draftsight.desktop $pkgdir/usr/share/applications/draftsight.desktop
+  # The provided .desktop entry is poorly written and does not disable vblank
+  # when called.
+  #install -Dm644 $srcdir/$_pkgprefix/Resources/dassault-systemes_draftsight.desktop $pkgdir/usr/share/applications/dassault-systemes_draftsight.desktop
 
-  cp -pr ${srcdir}/${_pkgprefix}/* ${pkgdir}/${_pkgprefix}/
+  cp -pr $srcdir/$_pkgprefix/* $pkgdir/$_pkgprefix/
 }
diff --git a/draftsight.desktop b/draftsight.desktop
new file mode 100644
index 000000000000..83c55cde7e0f
--- /dev/null
+++ b/draftsight.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=DraftSight
+Comment=Freeware CAD software for your DWG/DXF files.
+Exec=env vblank_mode=0 /opt/dassault-systemes/DraftSight/Linux/DraftSight
+Icon=/usr/share/icons/hicolor/128x128/apps/draftsight.png
+Terminal=false
+Categories=Graphics;2DGraphics;
\ No newline at end of file
diff --git a/draftsight.install b/draftsight.install
index a349e97dfe79..f6de2bbecbc0 100644
--- a/draftsight.install
+++ b/draftsight.install
@@ -3,18 +3,6 @@ post_install()
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
   update-desktop-database -q
   update-mime-database usr/share/mime
-
-  echo
-  echo "ATTENTION Nvidia/Nouveau driver users:"
-  echo "======================================"
-  echo
-  echo 'To fix the mouse lag issue in Draftsight SP3, you may have to turn off synchronization to VBlank and/or page flipping.'
-  echo 'For Nvidia driver users, this can be done through the nvidia-settings tool, and unchecking "Sync to VBlank" and "Allow Flipping" in the "OpenGL Settings"'
-  echo 'For Nouveau driver users, "GLXVBlank" and/or "PageFlip" options must be turned off in your xorg.conf files.'
-  echo
-  echo "Please refer to the comment section of this package in AUR: https://aur.archlinux.org/packages/draftsight/"
-  echo "Or for additional reading, refer to manual pages nv(4), nouveau(4), xorg.conf(5); and the Wiki pages for Nvidia, Nouveau, and Xorg."
-  echo
 }
 
 post_update()
@@ -22,18 +10,6 @@ post_update()
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
   update-desktop-database -q
   update-mime-database usr/share/mime
-
-  echo
-  echo "ATTENTION Nvidia/Nouveau driver users:"
-  echo "======================================"
-  echo
-  echo 'To fix the mouse lag issue in Draftsight SP3, you may have to turn off synchronization to VBlank and/or page flipping.'
-  echo 'For Nvidia driver users, this can be done through the nvidia-settings tool, and unchecking "Sync to VBlank" and "Allow Flipping" in the "OpenGL Settings"'
-  echo 'For Nouveau driver users, "GLXVBlank" and/or "PageFlip" options must be turned off in your xorg.conf files.'
-  echo
-  echo "Please refer to the comment section of this package in AUR: https://aur.archlinux.org/packages/draftsight/"
-  echo "Or for additional reading, refer to manual pages nv(4), nouveau(4), xorg.conf(5); and the Wiki pages for Nvidia, Nouveau, and Xorg."
-  echo
 }
 
 post_remove()