diff options
author | Morgenstern | 2020-05-15 12:59:39 +1200 |
---|---|---|
committer | Morgenstern | 2020-05-15 12:59:39 +1200 |
commit | 53cd25f646d2fb5b663207164783376d7f474441 (patch) | |
tree | 172860b55508e25c4937d17e6700deab9591d10a | |
parent | 00302fdc61e74face5f2ad55308ba253932f2e77 (diff) | |
download | aur-53cd25f646d2fb5b663207164783376d7f474441.tar.gz |
Fixed install file and cleaned up PKGBUILD
-rw-r--r-- | .SRCINFO | 12 | ||||
-rw-r--r-- | PKGBUILD | 57 | ||||
-rw-r--r-- | canon-pixma-mx870-complete.install | 30 |
3 files changed, 60 insertions, 39 deletions
@@ -1,7 +1,7 @@ pkgbase = canon-pixma-mx870-complete pkgdesc = Complete stand alone driver set (printing and scanning) for Canon Pixma MX870 pkgver = 3.30 - pkgrel = 6 + pkgrel = 7 url = https://www.usa.canon.com/internet/portal/us/home/support/details/printers/support-inkjet-printer/mx-series/pixma-mx870 install = canon-pixma-mx870-complete.install arch = i686 @@ -9,8 +9,8 @@ pkgbase = canon-pixma-mx870-complete license = custom options = !strip options = !emptydirs - source = http://gdlp01.c-wss.com/gds/3/0100002723/01/cnijfilter-mx870series-3.30-1-i386-deb.tar.gz - source = http://gdlp01.c-wss.com/gds/0/0100002730/01/scangearmp-mx870series-1.50-1-i386-deb.tar.gz + source = https://gdlp01.c-wss.com/gds/3/0100002723/01/cnijfilter-mx870series-3.30-1-i386-deb.tar.gz + source = https://gdlp01.c-wss.com/gds/0/0100002730/01/scangearmp-mx870series-1.50-1-i386-deb.tar.gz source = canon-pixma-mx870-complete-scangearmp.desktop source = canon-pixma-mx870-complete-scangearmp-icon.png sha256sums = df3694f4cf60a63010a8a4fbefcb38195c895786a8edf3fc2dc452bea7b60a95 @@ -23,12 +23,18 @@ pkgbase = canon-pixma-mx870-complete depends_i686 = libtiff4 depends_i686 = libxml2 depends_i686 = gtk2 + optdepends_i686 = gtk-engines: nicer UI + optdepends_i686 = libcanberra: nicer UI + optdepends_i686 = at-spi2-atk: nicer UI depends_x86_64 = lib32-popt depends_x86_64 = lib32-libpng12 depends_x86_64 = lib32-libusb-compat depends_x86_64 = lib32-libtiff4 depends_x86_64 = lib32-libxml2 depends_x86_64 = lib32-gtk2 + optdepends_x86_64 = lib32-gtk-engines: nicer UI + optdepends_x86_64 = lib32-libcanberra: nicer UI + optdepends_x86_64 = lib32-at-spi2-atk: nicer UI pkgname = canon-pixma-mx870-complete @@ -4,56 +4,63 @@ pkgname=canon-pixma-mx870-complete pkgver=3.30 -pkgrel=6 +pkgrel=7 pkgdesc="Complete stand alone driver set (printing and scanning) for Canon Pixma MX870" url="https://www.usa.canon.com/internet/portal/us/home/support/details/printers/support-inkjet-printer/mx-series/pixma-mx870" arch=('i686' 'x86_64') license=('custom') depends_i686=('popt' 'libpng12' 'libusb-compat' 'libtiff4' 'libxml2' 'gtk2') depends_x86_64=('lib32-popt' 'lib32-libpng12' 'lib32-libusb-compat' 'lib32-libtiff4' 'lib32-libxml2' 'lib32-gtk2') +optdepends_i686=('gtk-engines: nicer UI' + 'libcanberra: nicer UI' + 'at-spi2-atk: nicer UI') +optdepends_x86_64=('lib32-gtk-engines: nicer UI' + 'lib32-libcanberra: nicer UI' + 'lib32-at-spi2-atk: nicer UI') options=('!strip' '!emptydirs') -install=${pkgname}.install -source=('http://gdlp01.c-wss.com/gds/3/0100002723/01/cnijfilter-mx870series-3.30-1-i386-deb.tar.gz' - 'http://gdlp01.c-wss.com/gds/0/0100002730/01/scangearmp-mx870series-1.50-1-i386-deb.tar.gz' - "${pkgname}-scangearmp.desktop" - "${pkgname}-scangearmp-icon.png") +install="${pkgname}".install +source=("https://gdlp01.c-wss.com/gds/3/0100002723/01/cnijfilter-mx870series-3.30-1-i386-deb.tar.gz" + "https://gdlp01.c-wss.com/gds/0/0100002730/01/scangearmp-mx870series-1.50-1-i386-deb.tar.gz" + "${pkgname}"-scangearmp.desktop + "${pkgname}"-scangearmp-icon.png) sha256sums=('df3694f4cf60a63010a8a4fbefcb38195c895786a8edf3fc2dc452bea7b60a95' 'ec70d28e830e927d7b05649e4102963dee08e579373cfab9e305f11399afa245' 'b94e03193c2f78d26156f5e4c9bc7fb4451b708aded9ab46f9fc8faa3a40e406' '29dbc682d3f22d79f580bda54801d1f4ef261d857c756eaf4db29e1313406bcc') -_canondir='cnijfilter-mx870series-3.30-1-i386-deb' -_scangearmpdir='scangearmp-mx870series-1.50-1-i386-deb' - package() { + # Custom variables + _canondir='cnijfilter-mx870series-3.30-1-i386-deb' + _scangearmpdir='scangearmp-mx870series-1.50-1-i386-deb' + # Get the .deb files - cd ${srcdir}/${_canondir}/packages - find ./ -type f -iname '*.deb*' -exec install -m644 "{}" "${pkgdir}/{}" \; - cd ${srcdir}/${_scangearmpdir}/packages - find ./ -type f -iname '*.deb*' -exec install -m644 "{}" "${pkgdir}/{}" \; + cd "${srcdir}"/"${_canondir}"/packages + find ./ -type f -iname '*.deb*' -exec install -m0644 "{}" "${pkgdir}"/"{}" \; + cd "${srcdir}"/"${_scangearmpdir}"/packages + find ./ -type f -iname '*.deb*' -exec install -m0644 "{}" "${pkgdir}"/"{}" \; # Extract data from .deb archives - cd ${pkgdir} - for debfile in $(find ./ -type f -iname '*.deb*'); do - ar x $debfile data.tar.gz + cd "${pkgdir}" + for _debfile in $(find ./ -type f -iname '*.deb*'); do + ar x "${_debfile}" data.tar.gz tar -xvzf data.tar.gz - rm $debfile + rm "${_debfile}" rm data.tar.gz done # Fix udev rules - sed -i -e s/SYSFS/ATTR/g ${pkgdir}/etc/udev/rules.d/80-canon_mfp.rules - sed -i -e s/'MODE="666"'/'TAG+="uaccess", TAG+="udev-acl"'/g ${pkgdir}/etc/udev/rules.d/80-canon_mfp.rules + sed -i -e s/SYSFS/ATTR/g "${pkgdir}"/etc/udev/rules.d/80-canon_mfp.rules + sed -i -e s/'MODE="666"'/'TAG+="uaccess", TAG+="udev-acl"'/g "${pkgdir}"/etc/udev/rules.d/80-canon_mfp.rules # Licenses - cd ${pkgdir}/usr/share/doc - find ./ -type f -exec install -Dm644 "{}" "$pkgdir/usr/share/licenses/$pkgname/{}" \; + cd "${pkgdir}"/usr/share/doc + find ./ -type f -exec install -Dm644 "{}" "${pkgdir}"/usr/share/licenses/"${pkgname}"/"{}" \; # Clean up - chmod 644 ${pkgdir}/usr/lib/bjlib/canon_mfp_net.ini - chown root. ${pkgdir}/usr/lib/bjlib/cnnet.ini + chmod 0644 "${pkgdir}"/usr/lib/bjlib/canon_mfp_net.ini + chown root. "${pkgdir}"/usr/lib/bjlib/cnnet.ini # Install .desktop file and icon for scanner - install -Dm644 "${srcdir}/${pkgname}-scangearmp.desktop" "${pkgdir}/usr/share/applications/${pkgname}-scangearmp.desktop" - install -Dm644 "${srcdir}/${pkgname}-scangearmp-icon.png" "${pkgdir}/usr/share/pixmaps/${pkgname}-scangearmp-icon.png" + install -Dm0644 "${srcdir}"/"${pkgname}"-scangearmp.desktop "${pkgdir}"/usr/share/applications/"${pkgname}"-scangearmp.desktop + install -Dm0644 "${srcdir}"/"${pkgname}"-scangearmp-icon.png "${pkgdir}"/usr/share/pixmaps/"${pkgname}"-scangearmp-icon.png } diff --git a/canon-pixma-mx870-complete.install b/canon-pixma-mx870-complete.install index 9a0ec15a8895..67f142e9818c 100644 --- a/canon-pixma-mx870-complete.install +++ b/canon-pixma-mx870-complete.install @@ -16,6 +16,7 @@ post_install() { if [ -x /usr/bin/ldconfig ]; then /sbin/ldconfig fi + # Make symbolic link for the ppd file if [ ! -d ${_cups_path2} ]; then mkdir ${_cups_path2} @@ -33,6 +34,7 @@ post_install() { if [ -x /usr/bin/ldconfig ]; then /sbin/ldconfig fi + # Make symbolic link for GIMP-plug-in if [ -d ${_gimp2dir1} ]; then ln -fs /usr/bin/scangearmp ${_gimp2dir1}/scangearmp @@ -58,14 +60,15 @@ post_remove() { if [ -x /usr/bin/ldconfig ]; then /sbin/ldconfig fi + # Remove cnbp* libs for LIBS in libcnnet; do - if [ -h /usr/lib32/${LIBS}.so ]; then - unlink /usr/lib32/${LIBS}.so + if [ -h /usr/lib/${LIBS}.so ]; then + unlink /usr/lib/${LIBS}.so fi done if [ "$1" = 0 ]; then - rmdir -p --ignore-fail-on-non-empty /usr/lib32/bjlib + rmdir -p --ignore-fail-on-non-empty /usr/lib/bjlib fi @@ -83,18 +86,21 @@ post_remove() { if [ -x /usr/bin/ldconfig ]; then /sbin/ldconfig fi + # Remove cnbp* libs for LIBS in libcnbpcmcm libcnbpcnclapi libcnbpcnclbjcmd libcnbpcnclui libcnbpess libcnbpo; do - if [ -h /usr/lib32/${LIBS}${model_num}.so ]; then - unlink /usr/lib32/${LIBS}${model_num}.so + if [ -h /usr/lib/${LIBS}${model_num}.so ]; then + unlink /usr/lib/${LIBS}${model_num}.so fi done + # Remove directories if [ "$1" = 0 ] ; then rmdir -p --ignore-fail-on-non-empty /usr/share/locale/*/LC_MESSAGES rmdir -p --ignore-fail-on-non-empty /usr/share/cngpijmon${model_name} rmdir -p --ignore-fail-on-non-empty /usr/share/printui${model_name} fi + # Remove symbolic link for ppd unlink ${_cups_path2}/${ppd_name} update-desktop-database -q @@ -108,8 +114,8 @@ post_remove() { for LIBS in libcncpmsimg libcncpmslld libcncpcmcm libcncpmsui libcncpnet do - if [ -h /usr/lib32/${LIBS}.so ]; then - unlink /usr/lib32/${LIBS}.so + if [ -h /usr/lib/${LIBS}.so ]; then + unlink /usr/lib/${LIBS}.so fi done @@ -133,15 +139,17 @@ post_remove() { if [ -x /usr/bin/ldconfig ]; then /sbin/ldconfig fi + # Remove cncp* libs for LIBS in libcncpmsimg libcncpmslld; do - if [ -h /usr/lib32/${LIBS}${model_num}.so ]; then - unlink /usr/lib32/${LIBS}${model_num}.so + if [ -h /usr/lib/${LIBS}${model_num}.so ]; then + unlink /usr/lib/${LIBS}${model_num}.so fi - if [ -h /usr/lib32/${LIBS}${model_num}c.so ]; then - unlink /usr/lib32/${LIBS}${model_num}c.so + if [ -h /usr/lib/${LIBS}${model_num}c.so ]; then + unlink /usr/lib/${LIBS}${model_num}c.so fi done + # Remove .desktop file and icon if [ -f /usr/share/applications/canon-pixma-mx870-complete-scangearmp.desktop ]; then rm -f /usr/share/applications/canon-pixma-mx870-complete-scangearmp.desktop |