Unified Brother MFC PKGBUILD

2 files changed, 83 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d4375643a742..d7993068a979 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = brother-mfc-j870dw
-	pkgdesc = LPR and CUPS driver for the Brother MFC-J870DW
+	pkgdesc = LPR and CUPS driver for the Brother MFC-J870DW printer
 	pkgver = 3.0.0
 	pkgrel = 1
 	url = http://solutions.brother.com/linux/en_us/
@@ -23,6 +23,7 @@ pkgbase = brother-mfc-j870dw
 	sha256sums = e8bf7663a58ebe2fd0b32a4ec6a19ed6ed82c12086cab401dc1d46aff903bd75
 	sha256sums = 2c6aa6a641332e5c87e971ac2a8beae13b059747bdba331bbd515914770d72d9
 	sha256sums = 9d85a8aafdaac8fac80e04234ad2acf5642bbf0b91ee582d2a89519a55f6dd67
+	depends_x86_64 = lib32-glibc
 
 pkgname = brother-mfc-j870dw
 
diff --git a/PKGBUILD b/PKGBUILD
index a907593c478c..4e2e7aaa5432 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,30 +7,43 @@
 
 # This has not been tested with non cups lprng.
 
+# NOTE 1: Remember to add user to lp group using
+# gpasswd -a USER lp
+# NOTE 2: Remember to logout after adding groups
+# NOTE 3: Set each printer default Media Size to Letter with
+# lpadmin -p BR7360 -o media=Letter
+
 set -u
-pkgname='brother-mfc-j870dw'
+_brotheru='MFC-J870DW'
+_brotherl="${_brotheru,,}"     # mfc-0000dw
+_brotherlnd="${_brotherl//-/}" # mfc0000dw
+_brotherund="${_brotheru//-/}" # MFC0000DW
+pkgname="brother-${_brotherl}"
 pkgver='3.0.0'
 pkgrel='1'
-pkgdesc='LPR and CUPS driver for the Brother MFC-J870DW'
+pkgdesc="LPR and CUPS driver for the Brother ${_brotheru} printer"
 arch=('i686' 'x86_64')
 url='http://solutions.brother.com/linux/en_us/'
 license=('custom:Brother Industries')
 depends=('cups' 'ghostscript' 'psutils' 'a2ps' 'sed' 'grep')
+depends_x86_64=('lib32-glibc')
+# We look at the scripts and find these programs from which we decide on the depends above.
 # gs: lpr rendering
 # pdf2ps: cups rendering
 # a2ps: rendering ascii text files
 # (not) pstops: pdf resizing
 # psnup: printing n-up pages
-# sed grep
+# sed grep awk
 # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=670055
 # Printing a text file fails when Liberation is the only TrueType font available
 optdepends=('ttf-dejavu: printing text files from lpr')
 #install="${pkgname}.install"
 # The cups wrapper uses the lpr driver.
+_brsource="${_brotherlnd}_cupswrapper_GPL_source_${pkgver}-${pkgrel}"
 source=(
-  "http://www.brother.com/pub/bsc/linux/dlf/mfcj870dwlpr-${pkgver}-${pkgrel}.i386.rpm"
-  "http://www.brother.com/pub/bsc/linux/dlf/mfcj870dwcupswrapper-${pkgver}-${pkgrel}.i386.rpm"
-  "http://download.brother.com/welcome/dlf006869/mfcj870dw_cupswrapper_GPL_source_${pkgver}-${pkgrel}.tar.gz"
+  "http://www.brother.com/pub/bsc/linux/dlf/${_brotherlnd}lpr-${pkgver}-${pkgrel}.i386.rpm"
+  "http://www.brother.com/pub/bsc/linux/dlf/${_brotherlnd}cupswrapper-${pkgver}-${pkgrel}.i386.rpm"
+  "http://download.brother.com/welcome/dlf006869/${_brsource}.tar.gz"
   'cupswrapper-license.txt'
   'lpr-license.txt'
 )
@@ -40,12 +53,7 @@ sha256sums=('70e8c16f1aea8a47bbbcca3dbc8230b6982f2d8565d515b8344eca065c9b7d30'
             '2c6aa6a641332e5c87e971ac2a8beae13b059747bdba331bbd515914770d72d9'
             '9d85a8aafdaac8fac80e04234ad2acf5642bbf0b91ee582d2a89519a55f6dd67')
 
-if [ "${CARCH:-}" = 'x86_64' ]; then
-  # This will error out if multilib isn't enabled
-  depends+=('lib32-glibc')
-fi
-
-prepare() {
+build() {
   set -u
   # Do not Install in '/usr/local'. Does not apply to all Brother models.
   # This may modify binary blobs which only
@@ -63,35 +71,62 @@ prepare() {
   #install -dm755 "${srcdir}/usr/share/ppd" # For cups we don't need the ppd file here.
 
   # Get the dirs and the name of the wrapper. Either in /opt or /usr.
-  local _bindir="$(find "${srcdir}/opt" -type d -name 'cupswrapper')"
-  test -d "${_bindir}" # die if blank or invalid before we rm something we don't want to
+  # This is set up to adapt or crash. Unlike false, ${} shows the line number.
+  cd "${srcdir}/opt" 2>/dev/null || cd "${srcdir}/usr"
+  local _rcfile="$(find "`pwd`" -type f -ipath "*inf/br${_brotherund}rc")"
+  test -f "${_rcfile}" || echo "${}"
+  local _bindir="$(find "`pwd`" -type d -name 'cupswrapper')"
+  test -d "${_bindir}" || echo "${}" # die if blank or invalid before we rm something we don't want to
   rm -f "${_bindir}"/* # We download the cups driver only to throw it all away. All I want is the dir name without hunting for it in the installer.
-  local _basedir="$(find "${srcdir}" -maxdepth 1 -type d -name '*cupswrapper_GPL_source*')" # find avoids the link from PKGBUILD
-  test -d "${_basedir}"
-  local _wrapdir="${_basedir}/cupswrapper"
-  test -d "${_wrapdir}"
+  local _basedir="${srcdir}/${_brsource}"
+  test -d "${_basedir}" || echo "${}"
+  cd "${_basedir}/cupswrapper" 2>/dev/null || cd "${_basedir}/scripts" 2>/dev/null || cd "${_basedir}"
+  local _wrapdir="$(pwd)"
   cd "${_wrapdir}"
-  local _wrapper_source="$(echo cupswrapper*)"
-  test -f "${_wrapper_source}"
+  local _wrapper_source="$(echo cupswrapper${_brotherund}*)"
+  if ! test -f "${_wrapper_source}"; then
+    _wrapper_source="$(echo cupswrapper*)"
+    test -f "${_wrapper_source}" || echo "${}"
+  fi
   cd "${_basedir}"/brcups*
   local _makedir="$(pwd)"
+  if cd "${_basedir}/PPD" 2>/dev/null || cd "${_basedir}/ppd" 2>/dev/null; then
+    local _ppddir="$(pwd)"
+  fi
 
-  # Source is available for the cups binary, not the lpr binaries
-  # brprintconf or brmfcj870dwfilter so we can't get away from multilib.
-  # /opt is hardcoded into brmfcj870dwfilter so we can't easily get rid of that 
-  # either.
+  # Source is available for the cups binary, not the lpr binaries so we can't
+  # get away from multilib. Any usage of /opt is hardcoded into some binaries
+  # for which we can't find an equal length replacement so we can't easily get
+  # rid of that either.
   cd "${_makedir}"
-  make -s
-  cp -p 'brcupsconfpt1' "${_bindir}"
+  if [ -s 'Makefile' ]; then
+    make -s
+    cp -p 'brcupsconfpt1' "${_bindir}"
+  else
+    # Not sure why it's called brcupsconfig3 some places and brcupsconfig4 in others.
+    # The version in their binary matches the version in the source so it looks good to me.
+    # gcc options are pulled from other Brother makefiles.
+    gcc -pipe -Wall -W -O2 -s -o "${_bindir}/brcupsconfig3" "brcupsconfig.c"
+  fi
 
   cd "${_bindir}"
-  # Use the supplied ppd
-  cp -p "${_basedir}/PPD"/*.ppd "${_bindir}/"
-  chmod 644 "${_bindir}"/*.ppd
+  if [ ! -z "${_ppddir:-}" ]; then
+    # Use the ppd supplied in the source
+    cp -p "${_ppddir}"/*.ppd "${_bindir}/"
+    chmod 644 "${_bindir}"/*.ppd
+  fi
 
-  # This installer creates one of the files here
+  # Some Brother installers create files here
   mkdir -p "${srcdir}/var/tmp"
 
+  # Fix any sbin reference in the lpr driver. The cups driver uses bin.
+  #sed -i -e 's:/sbin/:/bin/:g' $(find "${srcdir}/usr" -type f -name "psconvert2")
+
+  # Fix page shifted off center that affects some printers
+  # Letter prints off center shifted down and right with PaperType=A4
+  # I can only test printing A4 on Letter paper. A4 appears to print correctly with PaperType=Letter
+  sed -i -e 's:^\(PaperType\)=.\+$:\1=Letter:g' "${_rcfile}"
+
   # Modify the installer so we can finish the install here in PKGBUILD.
   cp -p "${_wrapdir}/${_wrapper_source}" "${_bindir}/"
   #cp -p "${_wrapper_source}" "${_wrapper_source}.Arch" # debug: diff compare with Total Commander
@@ -100,20 +135,22 @@ prepare() {
          -e 's:/opt:${_srcdir}&:g' \
          -e 's:/var:${_srcdir}&:g' \
          -e "# Stop the Install script after the files are generated. cups doesn't require a reload to see the printer driver." \
-         -e 's:^if \[ -e /etc/init:exit 0\n&:g' \
+         -e 's:^if \[ -e /etc/init:exit 0 #Arch Linux Compatible\n&:g' \
     "${_wrapper_source}"
-  # Generate PPD and wrapper
+  grep -lq "#Arch Linux Compatible" "${_wrapper_source}" || echo "${}"
+  test -f "${_wrapper_source}.Arch" && echo "${}" # Halt for debugging
+  # Generate PPD and wrapper. Use sh -x to debug
   # Possible bug: copying to /usr/share/ppd is disabled.
   export _srcdir="${srcdir}"
-  sh "${_wrapper_source}" -i
+  sh -e "${_wrapper_source}" -i
   unset _srcdir
 
-  rmdir "${srcdir}/var/tmp" "${srcdir}/var"
+  rm -rf "${srcdir}/var"
 
   # Remove srcdir from the generated wrapper file.
   # No paths in the generated ppd.
-  sed -i -e '# Remove the ${srcdir} variety' \
-         -e 's:${srcdir}::' \
+  sed -i -e '# Remove the ${_srcdir} variety' \
+         -e 's:${_srcdir}::' \
          -e '# Remove the /home/... variety' \
          -e "s:${srcdir}::" "${srcdir}/usr/lib/cups/filter/"*lpdwrapper*
 
@@ -135,6 +172,14 @@ package() {
   # /etc/printcap is managed by cups. This eliminates any need for a printcap helper.
   rm -f "`find "${pkgdir}" -type f -name 'setupPrintcap*'`"
 
+  # Ensure we got a ppd and a filter for CUPS
+  test "$(find "${pkgdir}/usr/share/cups/model" -type f -name '*.ppd')"
+  test "$(find "${pkgdir}/usr/lib/cups/filter/" -type f)"
+
+  # Ensure there are no forbidden paths
+  grep -alqr "/sbin" "${pkgdir}" && echo "${}"
+  grep -alqr "/usr/tmp" "${pkgdir}" && echo "${}"
+
   install -Dm644 'cupswrapper-license.txt' "${pkgdir}/usr/share/licenses/${pkgname}/cupswrapper-licence.txt"
   install -Dm644 'lpr-license.txt' "${pkgdir}/usr/share/licenses/${pkgname}/lpr-licence.txt"
   set +u