Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- From 2ad3e45a04b10cc8eb46f9888f8a8309d17534b3 Mon Sep 17 00:00:00 2001
- From: Maxqia <contrib@maxqia.com>
- Date: Sat, 5 Mar 2016 19:19:14 -0800
- Subject: [PATCH] Add Native 64-bit Support
- ---
- PKGBUILD | 25 ++++++++-----------------
- buildfiles.patch | 41 +----------------------------------------
- cnijfilter-mx920.install | 10 +++++-----
- 3 files changed, 14 insertions(+), 62 deletions(-)
- diff --git a/PKGBUILD b/PKGBUILD
- index f84c950..ae79e4c 100644
- --- a/PKGBUILD
- +++ b/PKGBUILD
- @@ -1,12 +1,13 @@
- # Contributor: Johannes Dewender arch at JonnyJD dot net
- # Contributor: Behnam Momeni <sbmomeni [at the] gmail [dot] com>
- # Contributor: Stefan Hackl <stef.hackl [at the] gmail [dot] com>
- +# Contributor: Maxqia <contrib [at the] maxqia [dot] com
- pkgname=('cnijfilter-mx920')
- _pkgname=cnijfilter
- pkgver=3.90
- -pkgrel=1
- +pkgrel=2
- _pkgreview=1
- pkgdesc="Canon IJ printer driver (multifunction MX920 series)"
- @@ -15,14 +16,8 @@ url="http://www.canon-europe.com/support/consumer_Products/products/fax__multifu
- arch=('i686' 'x86_64')
- license=('custom')
- -makedepends_x86_64=('gcc-multilib' 'lib32-popt')
- -depends_x86_64=('lib32-gtk2' 'lib32-libxml2')
- -
- -makedepends_i686=('gcc' 'popt')
- -depends_i686=('gtk2' 'libxml2')
- -
- -makedepends=('autoconf>=2.13' 'automake>=1.6' 'tar' 'make')
- -depends=("${_pkgname}-common=4.00")
- +makedepends=('autoconf>=2.13' 'automake>=1.6' 'tar' 'make' 'gcc' 'popt')
- +depends=("${_pkgname}-common=4.00" 'gtk2' 'libxml2')
- install=cnijfilter-mx920.install
- @@ -32,7 +27,7 @@ source=("http://gdlp01.c-wss.com/gds/1/0100005171/01/cnijfilter-source-3.90-1.ta
- "mychanges.patch")
- sha512sums=('9ec303dc7209f5534a20e533fc18ec810603f4515655ce67f28f0f35d521185181351fd866d2191939eb02c783b168f637e18888a4e6a1eacc9e93b1b656ebcb'
- 'b46027090fc03f1b6503b4532881dfb49bf69eff342d4eedca6ed8e39f896de0ff8f8c5ae3dc8e9b5645a3dd1029390668a48737ce01d58d1b01b899fad56b4c'
- - 'd827f8725e899cbeeae883141c55c3c1429797ceb3eaa2d11a1ab6602b4221e120f92fdee7d3ffc08cf99692332b73cb9e1da6b8d5631df3a8071dffbfde799e'
- + '4532a7f3f715a8c070900d00106a6a1585e047715831ecb5ca30cf7e28917c9d307ffb9871aa7484b1aeb83357d1e8d187b2622a27a7d7055650390634ce2617'
- '1cf54862db74f928a3a1ad0316b9940b843dbc4cae95bbb3d93ab317d248788cf844103bc006b4670c27b0f13952301b5907476a6c7d13ebb0cb5c0a942d6182')
- prepare() {
- @@ -47,9 +42,6 @@ prepare() {
- build() {
- cd ${srcdir}/${_pkgname}-source-${pkgver}-${_pkgreview}
- -
- - # TODO: it looks like the libaries can also be built for 64 bit natively
- - export CC="gcc -m32"
- make mx920
- }
- @@ -57,10 +49,9 @@ package() {
- cd ${srcdir}/cnijfilter-source-${pkgver}-${_pkgreview}
- make PACKAGEDIR=${pkgdir} installmx920
- - install -d ${pkgdir}/usr/lib32/bjlib
- - install -m 644 417/database/* ${pkgdir}/usr/lib32/bjlib/
- - install -s -m 755 417/libs_bin32/*.so.* ${pkgdir}/usr/lib32/
- -
- + install -d ${pkgdir}/usr/lib/bjlib
- + install -m 644 417/database/* ${pkgdir}/usr/lib/bjlib/
- + install -s -m 755 417/libs_bin$(getconf LONG_BIT)/*.so.* ${pkgdir}/usr/lib/
- install -D LICENSE-cnijfilter-${pkgver}EN.txt ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE-cnijfilter-${pkgver}EN.txt
- }
- diff --git a/buildfiles.patch b/buildfiles.patch
- index 6be4adb..b4b9664 100644
- --- a/buildfiles.patch
- +++ b/buildfiles.patch
- @@ -7,49 +7,10 @@ diff -aur cnijfilter-source-3.20-1/Makefile cnijfilter-source-3.20-1.new/Makefil
- +mx920 :
- + for dir in "lgmon" "ppd" "cnijfilter" "maintenance" "cngpijmon"; do \
- -+ (cd $$dir; ./autogen.sh --prefix=/usr --program-suffix=mx920 --enable-progpath=/usr/bin --libdir=/usr/lib32; make) || exit 1; \
- ++ (cd $$dir; ./autogen.sh --prefix=/usr --program-suffix=mx920 --enable-progpath=/usr/bin --libdir=/usr/lib; make) || exit 1; \
- + done
- +
- +installmx920 :
- + for dir in "ppd" "cnijfilter" "maintenance" "lgmon" "cngpijmon"; do \
- + (cd $$dir; make install DESTDIR=${PACKAGEDIR}) || exit 1; \
- + done
- -diff -ruN cnijfilter-source-4.00-1.orig/lgmon/configure.in cnijfilter-source-4.00-1/backendnet/configure.in
- ---- cnijfilter-source-4.00-1.orig/lgmon/configure.in 2013-07-17 06:03:45.000000000 +0430
- -+++ cnijfilter-source-4.00-1/lgmon/configure.in 2015-08-04 16:54:42.385652052 +0430
- -@@ -43,7 +43,8 @@
- - esac
- - AC_SUBST(CNCL_LIB_ID)
- -
- --ARC=`getconf LONG_BIT`
- -+#ARC=`getconf LONG_BIT`
- -+ARC=32
- - AC_SUBST(ARC)
- -
- - AC_PROG_CC
- -diff -ruN cnijfilter-source-4.00-1.orig/cnijfilter/configure.in cnijfilter-source-4.00-1/cnijfilter/configure.in
- ---- cnijfilter-source-4.00-1.orig/cnijfilter/configure.in 2013-07-17 06:03:45.000000000 +0430
- -+++ cnijfilter-source-4.00-1/cnijfilter/configure.in 2015-08-04 16:55:56.955652143 +0430
- -@@ -43,7 +43,8 @@
- - esac
- - AC_SUBST(CNCL_LIB_ID)
- -
- --ARC=`getconf LONG_BIT`
- -+#ARC=`getconf LONG_BIT`
- -+ARC=32
- - AC_SUBST(ARC)
- -
- - AC_PROG_CC
- -diff -ruN cnijfilter-source-4.00-1.orig/maintenance/configure.in cnijfilter-source-4.00-1/backendnet/configure.in
- ---- cnijfilter-source-4.00-1.orig/maintenance/configure.in 2013-07-17 06:03:45.000000000 +0430
- -+++ cnijfilter-source-4.00-1/maintenance/configure.in 2015-08-04 16:54:42.385652052 +0430
- -@@ -19,7 +19,8 @@
- - XML2_CFLAGS=`xml2-config --cflags`
- - AC_SUBST(XML2_CFLAGS)
- -
- --ARC=`getconf LONG_BIT`
- -+#ARC=`getconf LONG_BIT`
- -+ARC=32
- - AC_SUBST(ARC)
- -
- - AC_OUTPUT([
- diff --git a/cnijfilter-mx920.install b/cnijfilter-mx920.install
- index 180e381..9b34eff 100644
- --- a/cnijfilter-mx920.install
- +++ b/cnijfilter-mx920.install
- @@ -1,22 +1,22 @@
- post_install() {
- if [ -x /sbin/ldconfig ]; then
- - /sbin/ldconfig /usr/lib32
- + /sbin/ldconfig /usr/lib
- fi
- echo "You need to add the printer by visiting <http://localhost:631/> after starting the cups service."
- }
- post_upgrade() {
- if [ -x /sbin/ldconfig ]; then
- - /sbin/ldconfig /usr/lib32
- + /sbin/ldconfig /usr/lib
- fi
- }
- post_remove() {
- if [ -x /sbin/ldconfig ]; then
- - /sbin/ldconfig /usr/lib32
- + /sbin/ldconfig /usr/lib
- fi
- MODELNUM=417
- for LIBS in "libcnbpcmcm" "libcnbpcnclapi" "libcnbpcnclbjcmd" "libcnbpcnclui" "libcnbpess" "libcnbpo"; do
- - if [ -h /usr/lib32/${LIBS}${MODELNUM}.so ]; then
- - rm -f /usr/lib32/${LIBS}${MODELNUM}.so
- + if [ -h /usr/lib/${LIBS}${MODELNUM}.so ]; then
- + rm -f /usr/lib/${LIBS}${MODELNUM}.so
- fi
- done
- }
- --
- 2.7.2
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement