cleanup the package, bump version

7 files changed, 36 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 453a4e63d1f7..c1710ec97d20 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = p4v
 	pkgdesc = Perforce Visual Client
-	pkgver = 2019.1.1830398
+	pkgver = 2019.2.1856742
 	pkgrel = 1
 	url = http://www.perforce.com
 	arch = x86_64
@@ -11,12 +11,12 @@ pkgbase = p4v
 	source = p4admin.desktop
 	source = p4merge.desktop
 	source = LICENSE
-	source = p4v-2019.1.1830398.tgz::http://cdist2.perforce.com/perforce/r19.1/bin.linux26x86_64/p4v.tgz
+	source = p4v-2019.2.1856742.tgz::http://cdist2.perforce.com/perforce/r19.2/bin.linux26x86_64/p4v.tgz
 	sha256sums = 1fc7ea925fdcb38915f191b6a9c85fb46db9ef501dbaa077e8f38876c5e8fda0
 	sha256sums = 10e470c6099459a072565494c4fd21cc1f4198f1024fe6fdeb6c77ea7e594827
 	sha256sums = 139c5e4951ea9ab040912ef1f9705de16a37d32fdf7b8c7116eb5a785829c634
 	sha256sums = c4ed3aef62b1bbf2d16ce4cceb65dc49ab9635b38e2fed0a595fe259283a9f32
-	sha256sums = e3b107ab6362cdd7a093d16e2d0636c63c8fb397bc7f97cc7548ed5a286c75e4
+	sha256sums = 0702a2bfcbbe63ab34a2398535c19413bb60cd9c85d6c6b92e6319c620959521
 
 pkgname = p4v
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..96afcd795775
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,8 @@
+*p4v
+*p4v.asc
+
+src/
+pkg
+
+p4v-*.tar.*
+p4v-*.tgz
diff --git a/LICENSE b/LICENSE
index 35153b94dc6b..35153b94dc6b 100755..100644
--- a/LICENSE
+++ b/LICENSE
diff --git a/PKGBUILD b/PKGBUILD
index 65e5adb5e00d..12dba612f9c6 100755..100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,7 @@
-# Maintainer: John Garland <johnnybg+aur@gmail.com>
-# Contributor: Ben Widawsky <ben@bwidawsk.net>
-# Contributor: Jonathan Arnold <jarnold@buddydog.org>
-# Contributor: Marq Schneider <queueRAM@gmail.com>
+# Maintainer: Joel Shapiro <jshapiro at nvidia dot com>
 
 pkgname=p4v
-pkgver=2019.1.1830398
+pkgver=2019.2.1856742
 pkgrel=1
 pkgdesc="Perforce Visual Client"
 arch=('x86_64')
@@ -12,25 +9,34 @@ url="http://www.perforce.com"
 license=('custom:p4v')
 depends=(libxcb)
 options=('!strip')
-source=(p4v.desktop p4admin.desktop p4merge.desktop LICENSE 
-p4v-${pkgver}.tgz::http://cdist2.perforce.com/perforce/r${pkgver:2:4}/bin.linux26x86_64/${pkgname}.tgz)
+source=(p4v.desktop
+        p4admin.desktop
+        p4merge.desktop
+        LICENSE
+        p4v-${pkgver}.tgz::http://cdist2.perforce.com/perforce/r${pkgver:2:4}/bin.linux26x86_64/${pkgname}.tgz)
 
 sha256sums=('1fc7ea925fdcb38915f191b6a9c85fb46db9ef501dbaa077e8f38876c5e8fda0'
             '10e470c6099459a072565494c4fd21cc1f4198f1024fe6fdeb6c77ea7e594827'
             '139c5e4951ea9ab040912ef1f9705de16a37d32fdf7b8c7116eb5a785829c634'
             'c4ed3aef62b1bbf2d16ce4cceb65dc49ab9635b38e2fed0a595fe259283a9f32'
-            'e3b107ab6362cdd7a093d16e2d0636c63c8fb397bc7f97cc7548ed5a286c75e4')
+            '0702a2bfcbbe63ab34a2398535c19413bb60cd9c85d6c6b92e6319c620959521')
+
+# Perforce Software (Package Signing) <support+packaging@perforce.com>
+# validpgpkeys=('7123CB760FF18869'
+#               'E58131C0AEA7B082C6DC4C937123CB760FF18869')
 
 package() {
-  cd ${pkgname}-${pkgver}/
+  cd "${srcdir}/${pkgname}-${pkgver}/"
 
-  mkdir -p "${pkgdir}"/usr/share/p4v
-  mkdir -p "${pkgdir}"/usr/bin
+  mkdir -p "${pkgdir}"/usr/share/p4v/bin/
 
-  cp -R * "${pkgdir}"/usr/share/p4v
+  install -sm755 bin/{helixmfa,p4admin.bin,p4merge.bin,p4v.bin,p4vc.bin,QtWebEngineProcess} "${pkgdir}/usr/share/p4v/bin"
+  install -m755 bin/{p4admin,p4merge,p4v,p4vc} "${pkgdir}/usr/share/p4v/bin"
+  install -m644 bin/qt.conf "${pkgdir}/usr/share/p4v/bin"
 
+  mkdir -p "${pkgdir}"/usr/bin
   # put a pointer in /usr/bin
-  ln -s /usr/share/p4v/bin/{p4v,p4merge,p4admin,p4vc} "${pkgdir}"/usr/bin
+  ln -s ../share/p4v/bin/{p4v,p4merge,p4admin,p4vc} "${pkgdir}"/usr/bin
 
   # Install icons
   mkdir -p "$pkgdir"/usr/share/icons/hicolor/scalable/apps
@@ -38,14 +44,17 @@ package() {
   install -Dm644 lib/P4VResources/icons/p4merge.svg "$pkgdir"/usr/share/icons/hicolor/scalable/apps/p4merge.svg
   install -Dm644 lib/P4VResources/icons/p4v.svg "$pkgdir"/usr/share/icons/hicolor/scalable/apps/p4v.svg
 
-  mkdir -p "${pkgdir}"/usr/share/applications
+  mkdir -p "${pkgdir}"/usr/share/p4v/lib/
+  # move everything else
+  cp -R lib/* "${pkgdir}/usr/share/p4v/lib"
 
   cd "$srcdir"
   # Install desktop files
+  mkdir -p "${pkgdir}"/usr/share/applications
   install -m644 {p4v,p4merge,p4admin}.desktop "${pkgdir}"/usr/share/applications
 
-  install -d "$pkgdir/usr/share/licenses/$pkgname"
-  install -m 0644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  # Install license
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/p4admin.desktop b/p4admin.desktop
index 29c36487e76b..29c36487e76b 100755..100644
--- a/p4admin.desktop
+++ b/p4admin.desktop
diff --git a/p4merge.desktop b/p4merge.desktop
index f625f54280ab..f625f54280ab 100755..100644
--- a/p4merge.desktop
+++ b/p4merge.desktop
diff --git a/p4v.desktop b/p4v.desktop
index 00bacccc8fae..00bacccc8fae 100755..100644
--- a/p4v.desktop
+++ b/p4v.desktop