diff --git a/srcpkgs/fingerprint-gui/patches/fix-udev-paths.patch b/srcpkgs/fingerprint-gui/patches/fix-udev-paths.patch new file mode 100644 index 00000000000..7564e3abaf5 --- /dev/null +++ b/srcpkgs/fingerprint-gui/patches/fix-udev-paths.patch @@ -0,0 +1,37 @@ +--- bin/fingerprint-helper/fingerprint-helper.pro 2016-11-21 15:24:35.315792087 +0300 ++++ 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 + +--- fingerprint.pro 2016-11-21 15:33:45.215341967 +0300 ++++ 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 + diff --git a/srcpkgs/fingerprint-gui/patches/fix-udev-rules-groups.patch b/srcpkgs/fingerprint-gui/patches/fix-udev-rules-groups.patch new file mode 100644 index 00000000000..e8a80c65f07 --- /dev/null +++ b/srcpkgs/fingerprint-gui/patches/fix-udev-rules-groups.patch @@ -0,0 +1,21 @@ +--- upek/91-fingerprint-gui-upek.rules 2017-01-12 19:48:38.325444912 +0300 ++++ 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" diff --git a/srcpkgs/fingerprint-gui/template b/srcpkgs/fingerprint-gui/template index c6d540c3d33..8fd1c437578 100644 --- a/srcpkgs/fingerprint-gui/template +++ b/srcpkgs/fingerprint-gui/template @@ -1,35 +1,44 @@ # Template file for 'fingerprint-gui' pkgname=fingerprint-gui -version=1.06 -revision=7 +version=1.09 +revision=1 +wrksrc="${pkgname}-${version}-qt5" build_style=qmake -make_dirs="/var/lib/fingerprint-gui 0755 root root - /var/upek_data 0750 root input" -hostmakedepends="qca-devel qt-devel qt-host-tools qt-qmake" -makedepends="qt-devel qca-devel libfprint-devel libfakekey-devel polkit-qt-devel pam-devel" +hostmakedepends="qt5-host-tools qt5-qmake" +makedepends="qt5-devel qca-qt5-devel libfprint-devel libfakekey-devel + polkit-qt5-devel pam-devel qt5-x11extras-devel" depends="desktop-file-utils" short_desc="Fingerprint management GUI and PAM module" maintainer="Leah Neukirchen " license="GPL-2.0-or-later" homepage="http://www.ullrich-online.cc/fingerprint/" -distfiles="http://www.ullrich-online.cc/fingerprint/download/${pkgname}-${version}.tar.gz" -checksum=f5021d4c446b65ce62de63b9b2874b05a62318b386f35577ca0322b722a1920f -CXXFLAGS+="-I/usr/include/QtCrypto" -LDFLAGS+="-Wl,--no-as-needed -lqca" -configure_args='LIBPOLKIT_QT=LIBPOLKIT_QT_1_1' +distfiles="https://github.com/maksbotan/${pkgname}/archive/v${version}-qt5.tar.gz" +checksum=a28d43e7e505f8ed15c8360bd91603eaf3206c225a542d0116669caafd89154c -pre_configure() { - sed -i 's/plugdev/input/g' \ - upek/91-fingerprint-gui-upek.rules \ - bin/fingerprint-helper/92-fingerprint-gui-uinput.rules -} +# build system deals poorly with cross headers so include +# them manually +if [ "$CROSS_BUILD" ]; then + CXXFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/qt5" + CXXFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/qt5/QtCore" + CXXFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/qt5/QtGui" + CXXFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/qt5/QtWidgets" + CXXFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/qt5/QtXml" + + hostmakedepends="qt5-x11extras-devel" +fi + +# This one is needed even when out of cross-compilation +CXXFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/Qca-qt5/QtCrypto" + +LDFLAGS+=" -Wl,--no-as-needed -lqca-qt5" + +conf_files="/etc/upek.cfg" +make_dirs="/var/lib/fingerprint-gui 0755 root root + /var/upek_data 0750 root input" post_install() { vdoc CHANGELOG vconf upek/upek.cfg - vmkdir usr/lib/udev/rules.d - mv ${DESTDIR}/etc/udev/rules.d/* ${DESTDIR}/usr/lib/udev/rules.d - vinstall upek/91-fingerprint-gui-upek.rules 644 usr/lib/udev/rules.d case "$XBPS_TARGET_MACHINE" in i686*) vcopy "upek/lib/libbsapi.so.*" usr/lib;; x86_64*) vcopy "upek/lib64/libbsapi.so.*" usr/lib;; diff --git a/srcpkgs/fingerprint-gui/update b/srcpkgs/fingerprint-gui/update index 8a959947980..e69de29bb2d 100644 --- a/srcpkgs/fingerprint-gui/update +++ b/srcpkgs/fingerprint-gui/update @@ -1,2 +0,0 @@ -site="http://www.ullrich-online.cc/fingerprint/downloads.php" -ignore="1.07" # requires polkit