fingerprint-gui move to qt5 version #73

fingerprint-gui/PKGBUILD

@@ -1,28 +1,41 @@
 pkgname=fingerprint-gui
 pkgver=1.09
-pkgrel=1
+pkgrel=2
 pkgdesc="Application for fingerprint-based authentication, automatically support UPEK fingerprint readers with non-free library"
 arch=('x86_64')
 url="http://www.ullrich-online.cc/fingerprint/"
 license=('GPL')
-depends=('libfprint' 'libfakekey' 'polkit-qt4' 'qca' 'libusb')
+depends=('libfprint' 'libfakekey' 'polkit-qt5' 'qca-qt5' 'qt5-x11extras')
-source=("http://ullrich-online.cc/nview/Appliance/fingerprint/download/${pkgname}-${pkgver}.tar.gz")
+optdepends=('libusb: for libbsapi')
+source=("https://github.com/maksbotan/${pkgname}/archive/v${pkgver}-qt5.tar.gz"
+        "fingerprint-gui-udev-path.patch"
+        "fingerprint-gui-udev-0050.patch")
 install="${pkgname}.install"
 sha1sums=('02276783cb9d6a36a2aa24e4a981660acd68c0e2')
 
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}-qt5"
+  patch -p1 -i "${srcdir}/fingerprint-gui-udev-path.patch"
+  patch -p1 -i "${srcdir}/fingerprint-gui-udev-0050.patch"
+}
+
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}/${pkgname}-${pkgver}-qt5"
-  qmake PREFIX=/usr LIB=/usr/lib
+  qmake PREFIX=/usr LIB=/usr/lib QMAKE_CFLAGS="${CFLAGS}" QMAKE_CXXFLAGS="${CXXFLAGS}"
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}/${pkgname}-${pkgver}-qt5"
   make INSTALL_ROOT="${pkgdir}/" install
-  install -Dm644 "CHANGELOG" "COPYING" "${pkgdir}/usr/share/doc/${pkgname}/"
+  make INSTALL_ROOT="${pkgdir}/" upek-rules
+  make INSTALL_ROOT="${pkgdir}/" upek-cfg
 
+  # upstream build rule wanna create group/change rights as well
   install -dm770 "${pkgdir}/var/upek_data"
-  install -Dm644 "upek/upek.cfg" "${pkgdir}/etc/"
+  # we are using custom rule to define arch by using our mechanisms
-  install -Dm644 "upek/91-fingerprint-gui-upek.rules" "${pkgdir}/etc/udev/rules.d/"
+  # (e.g. crossplatform build)
   install -Dm644 upek/lib64/libbsapi.so.* "${pkgdir}/usr/lib/"
+
+  install -Dm644 "CHANGELOG" "COPYING" "${pkgdir}/usr/share/doc/${pkgname}/"
 }

fingerprint-gui/fingerprint-gui-udev-0050.patch

@@ -0,0 +1,22 @@
+diff -ruN fingerprint-gui-1.09-orig/upek/91-fingerprint-gui-upek.rules fingerprint-gui-1.09/upek/91-fingerprint-gui-upek.rules
+--- fingerprint-gui-1.09-orig/upek/91-fingerprint-gui-upek.rules        2017-01-12 19:48:38.325444912 +0300
++++ fingerprint-gui-1.09/upek/91-fingerprint-gui-upek.rules     2017-01-12 19:50:35.799120728 +0300
+@@ -7,6 +7,10 @@
+ ATTRS{idVendor}=="147e", ATTRS{idProduct}=="100[0123]", SYMLINK+="input/touchchip-%k", MODE="0664", GROUP="plugdev"
+ ATTRS{idVendor}=="147e", ATTRS{idProduct}=="300[01]",   SYMLINK+="input/touchchip-%k", MODE="0664", GROUP="plugdev"
+ ATTRS{idVendor}=="147e", ATTRS{idProduct}=="500[23]",   SYMLINK+="input/touchchip-%k", MODE="0664", GROUP="plugdev"
++ATTRS{idVendor}=="138a", ATTRS{idProduct}=="0018",      SYMLINK+="input/touchchip-%k", MODE="0664", GROUP="plugdev"
++ATTRS{idVendor}=="138a", ATTRS{idProduct}=="003d",      SYMLINK+="input/touchchip-%k", MODE="0664", GROUP="plugdev"
++ATTRS{idVendor}=="138a", ATTRS{idProduct}=="0050",      SYMLINK+="input/touchchip-%k", MODE="0664", GROUP="plugdev"
++ATTRS{idVendor}=="138a", ATTRS{idProduct}=="0092",      SYMLINK+="input/touchchip-%k", MODE="0664", GROUP="plugdev"
+
+ # enable power saving
+ ATTRS{idVendor}=="0483", ATTRS{idProduct}=="201[56]",   ATTR{power/control}=="*", ATTR{power/control}="auto"
+@@ -15,3 +16,7 @@
+ ATTRS{idVendor}=="147e", ATTRS{idProduct}=="100[0123]", ATTR{power/control}=="*", ATTR{power/control}="auto"
+ ATTRS{idVendor}=="147e", ATTRS{idProduct}=="300[01]",   ATTR{power/control}=="*", ATTR{power/control}="auto"
+ ATTRS{idVendor}=="147e", ATTRS{idProduct}=="500[23]",   ATTR{power/control}=="*", ATTR{power/control}="auto"
++ATTRS{idVendor}=="138a", ATTRS{idProduct}=="0018",      ATTR{power/control}=="*", ATTR{power/control}="auto"
++ATTRS{idVendor}=="138a", ATTRS{idProduct}=="003d",      ATTR{power/control}=="*", ATTR{power/control}="auto"
++ATTRS{idVendor}=="138a", ATTRS{idProduct}=="0050",      ATTR{power/control}=="*", ATTR{power/control}="auto"
++ATTRS{idVendor}=="138a", ATTRS{idProduct}=="0092",      ATTR{power/control}=="*", ATTR{power/control}="auto"

fingerprint-gui/fingerprint-gui-udev-path.patch

@@ -0,0 +1,38 @@
+diff -ruN fingerprint-gui-1.09-orig/bin/fingerprint-helper/fingerprint-helper.pro fingerprint-gui-1.09/bin/fingerprint-helper/fingerprint-helper.pro
+--- fingerprint-gui-1.09-orig/bin/fingerprint-helper/fingerprint-helper.pro	2016-11-21 15:24:35.315792087 +0300
++++ fingerprint-gui-1.09/bin/fingerprint-helper/fingerprint-helper.pro	2016-11-21 15:25:24.527899001 +0300
+@@ -22,8 +22,8 @@
+ QMAKE_CXXFLAGS+=-fno-strict-aliasing
+ 
+-uinput-rules.path     = $${INSTALL_ROOT}/etc/udev/rules.d
+-uinput-rules.commands = install -d $(INSTALL_ROOT)/etc/udev/rules.d; \
+-                        install -m 644 ./92-fingerprint-gui-uinput.rules $(INSTALL_ROOT)/etc/udev/rules.d
++uinput-rules.path     = $${INSTALL_ROOT}/usr/lib/udev/rules.d
++uinput-rules.commands = install -d $(INSTALL_ROOT)/usr/lib/udev/rules.d; \
++                        install -m 644 ./92-fingerprint-gui-uinput.rules $(INSTALL_ROOT)/usr/lib/udev/rules.d
+ 
+ INSTALLS += target uinput-rules
+  
+diff -ruN fingerprint-gui-1.09-orig/fingerprint.pro fingerprint-gui-1.09/fingerprint.pro
+--- fingerprint-gui-1.09-orig/fingerprint.pro	2016-11-21 15:33:45.215341967 +0300
++++ fingerprint-gui-1.09/fingerprint.pro	2016-11-21 15:36:26.077954927 +0300
+@@ -17,8 +17,8 @@
+                             install -m 644 ./upek/lib/libbsapi.so.4.0 ./upek/lib/libbsapi.so.4.3 $(INSTALL_ROOT)$${LIBDIR}; \
+                         fi; \
+                         ldconfig
+-upek-rules.commands   = install -d $(INSTALL_ROOT)/etc/udev/rules.d; \
+-                        install -m 644 ./upek/91-fingerprint-gui-upek.rules $(INSTALL_ROOT)/etc/udev/rules.d
++upek-rules.commands   = install -d $(INSTALL_ROOT)/usr/lib/udev/rules.d; \
++                        install -m 644 ./upek/91-fingerprint-gui-upek.rules $(INSTALL_ROOT)/usr/lib/udev/rules.d
+ upek-cfg.commands     = install -d $(INSTALL_ROOT)/etc; \
+                         install -m 644 ./upek/upek.cfg $(INSTALL_ROOT)/etc/upek.cfg
+ upek-dir.commands     = install -d $(INSTALL_ROOT)/var/upek_data; \
+@@ -38,7 +38,7 @@
+ uninstall-upek.commands = rm -f $(INSTALL_ROOT)$${LIBDIR}/libbsapi.so.4.0; \
+                           rm -f $(INSTALL_ROOT)$${LIBDIR}/libbsapi.so.4.3; \
+                           rm -rf $(INSTALL_ROOT)/var/upek_data; \
+-                          rm -f $(INSTALL_ROOT)/etc/udev/rules.d/91-fingerprint-gui-upek.rules; \
++                          rm -f $(INSTALL_ROOT)/usr/lib/udev/rules.d/91-fingerprint-gui-upek.rules; \
+                           ldconfig
+ 
+ # for version 1.07 change ownership and permissions of data directories and files

fingerprint-gui/fingerprint-gui.install

@@ -44,13 +44,9 @@ EOF
   chown -R root.root "/var/lib/fingerprint-gui"
   find "/var/lib/fingerprint-gui" -type d -exec chmod 755 {} \;
   find "/var/lib/fingerprint-gui" -type f -exec chmod 600 {} \;
-  # icon update
+
-  update-desktop-database -q
-  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
 }
 
 post_remove() {
   getent group plugdev &> /dev/null && groupdel plugdev > /dev/null
-  update-desktop-database -q
-  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
 }