autu: Update to 2.0.1_3_0ubuntu5-2 Patch MFC-7820N

3 files changed, 63 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index be9c322e6e72..b0dbfbf22c26 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Fri Apr  6 00:31:09 UTC 2018
+# Sat Jul 14 00:24:15 UTC 2018
 pkgbase = brother-lpr-drivers-laser
 	pkgdesc = LPR drivers for DCP-7010 DCP-7020 DCP-7025 DCP-8060 DCP-8065DN FAX-2820 FAX-2920 HL-2030 HL-2040 HL-2070N HL-5240 HL-5250DN HL-5270DN HL-5280DW MFC-7220 MFC-7225N MFC-7420 MFC-7820N MFC-8460N MFC-8660DN MFC-8860DN MFC-8870DW
 	pkgver = 2.0.1_3_0ubuntu5
-	pkgrel = 1
+	pkgrel = 2
 	url = http://solutions.brother.com/linux/en_us/index.html
 	arch = i686
 	arch = x86_64
@@ -11,6 +11,10 @@ pkgbase = brother-lpr-drivers-laser
 	license = custom:brother commercial license
 	depends = brother-lpr-drivers-common
 	depends = a2ps
+	depends = cups
+	source = 0000-MFC-7820N-pstops.patch
+	md5sums = e44951445d4c4dfc776cde1b10406beb
+	sha256sums = e1f8625f45b27c7ca1d2366660398eb7f2baa79c8e6e926a247a9a232984bc6a
 	source_i686 = http://mirrors.kernel.org/ubuntu/pool/multiverse/b/brother-lpr-drivers-laser/brother-lpr-drivers-laser_2.0.1-3-0ubuntu5_i386.deb
 	md5sums_i686 = cf0120479d74d3be6796ae4d804e7b0d
 	sha256sums_i686 = fba405edd53dedffed9beb604d9f301f0b241630badaa9f340387866563d2713
diff --git a/0000-MFC-7820N-pstops.patch b/0000-MFC-7820N-pstops.patch
new file mode 100644
index 000000000000..0d028dc2f464
--- /dev/null
+++ b/0000-MFC-7820N-pstops.patch
@@ -0,0 +1,25 @@
+diff -Naru3 Arch.orig-0000/usr/Brother/inf/brMFC7820Nfunc Arch/usr/Brother/inf/brMFC7820Nfunc
+--- Arch.orig-0000/usr/Brother/inf/brMFC7820Nfunc	2012-09-19 07:02:09.000000000 -0400
++++ Arch/usr/Brother/inf/brMFC7820Nfunc	2018-07-13 20:00:00.339931540 -0400
+@@ -24,3 +24,5 @@
+ Sleep={PrinterDefault,"1-99"}
+ Toner Save Mode={ON,OFF}
+ 
++[psconvert2]
++pstops=/usr/lib/cups/filter/pstops
+diff -Naru3 Arch.orig-0000/usr/Brother/lpd/filterMFC7820N Arch/usr/Brother/lpd/filterMFC7820N
+--- Arch.orig-0000/usr/Brother/lpd/filterMFC7820N	2012-09-19 07:02:09.000000000 -0400
++++ Arch/usr/Brother/lpd/filterMFC7820N	2018-07-13 20:00:00.343264864 -0400
+@@ -110,10 +110,9 @@
+ fi
+ 	
+ #PSTOPSFILTER=`which pstops`
++PSTOPSFILTER='/usr/lib/cups/filter/pstops'
+ 
+-if [ -e '/usr/bin/pstops' ];then
+-	PSTOPSFILTER='/usr/bin/pstops'
+-else
++if [ ! -e "${PSTOPSFILTER}" ];then
+ 	PSTOPSFILTER=''
+ fi
+ 
diff --git a/PKGBUILD b/PKGBUILD
index 419335b8e812..36eec8f44bfd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,24 +5,52 @@
 set -u
 pkgname='brother-lpr-drivers-laser'
 pkgver='2.0.1_3_0ubuntu5'
-pkgrel='1'
+pkgrel='2'
 pkgdesc='LPR drivers for DCP-7010 DCP-7020 DCP-7025 DCP-8060 DCP-8065DN FAX-2820 FAX-2920 HL-2030 HL-2040 HL-2070N HL-5240 HL-5250DN HL-5270DN HL-5280DW MFC-7220 MFC-7225N MFC-7420 MFC-7820N MFC-8460N MFC-8660DN MFC-8860DN MFC-8870DW'
 arch=('i686' 'x86_64')
 url='http://solutions.brother.com/linux/en_us/index.html'
 license=('GPL' 'custom:brother commercial license')
-depends=('brother-lpr-drivers-common' 'a2ps')
+depends=('brother-lpr-drivers-common' 'a2ps' 'cups')
 depends_x86_64=('lib32-glibc')
+_srcdir='Arch'
+source=('0000-MFC-7820N-pstops.patch') # https://aur.archlinux.org/cgit/aur.git/tree/brother-mfc-7840w.patch?h=brother-mfc-7840w
 source_i686=("http://mirrors.kernel.org/ubuntu/pool/multiverse/b/${pkgname}/${pkgname}_${pkgver//_/-}_i386.deb")
 source_x86_64=("http://mirrors.kernel.org/ubuntu/pool/multiverse/b/${pkgname}/${pkgname}_${pkgver//_/-}_amd64.deb")
+md5sums=('e44951445d4c4dfc776cde1b10406beb')
 md5sums_i686=('cf0120479d74d3be6796ae4d804e7b0d')
 md5sums_x86_64=('ac86b51f47a344a1961ff13ff3cfe775')
+sha256sums=('e1f8625f45b27c7ca1d2366660398eb7f2baa79c8e6e926a247a9a232984bc6a')
 sha256sums_i686=('fba405edd53dedffed9beb604d9f301f0b241630badaa9f340387866563d2713')
 sha256sums_x86_64=('bd35371d79dd9ea02e8563be7b429f43acf9fc8d7bf01a187d8413eb16cfa221')
 
-package() {
+prepare() {
   set -u
-  cd "${pkgdir}"
+  mkdir "${_srcdir}"
+  cd "${_srcdir}"
   bsdtar -xf "${srcdir}/data.tar".?z
+  # Better implementation and removes quoting error
+  ln -sf '/usr/bin/brprintconflsr2' 'usr/bin/brprintconfiglpr2'
+
+  if ! :; then
+    # I suspect all printers will need this so
+    # convert single printer patch into mega patch for all printers
+    cp /dev/null "${srcdir}/0000-mega-pstops.patch"
+    local _f
+    for _f in usr/Brother/lpd/filter*; do
+      sed -e "/^\(diff\|+++\|---\)/ s:MFC7820N:${_f##*/filter}:g" "${srcdir}/0000-MFC-7820N-pstops.patch" >> "${srcdir}/0000-mega-pstops.patch"
+    done
+    patch --no-backup-if-mismatch -r - -Nup1 -i "${srcdir}/0000-mega-pstops.patch"
+  else
+    # cp -pr "${srcdir}/${_srcdir}"{,.orig-0000}
+    #diff -Naru3 Arch{.orig-0000,} > '0000-MFC-7820N-pstops.patch'
+    patch -Nup1 -i "${srcdir}/0000-MFC-7820N-pstops.patch"
+  fi
+  set +u
+}
+
+package() {
+  set -u
+  mv Arch/* "${pkgdir}"
   set +u
 }
 set +u