API tools faq
paste
Advertisement
Maxqia

Add Native 64-bit Support (cnijfilter-common)

Maxqia
Mar 6th, 2016
57
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 7.89 KB | None | 0 0
raw download clone embed print report
  1. From 002c1dd33014eb6016d01fcd264b3ee3a8459c94 Mon Sep 17 00:00:00 2001
  2. From: Maxqia <contrib@maxqia.com>
  3. Date: Sat, 5 Mar 2016 23:03:02 -0800
  4. Subject: [PATCH] Add Native 64-bit Support
  5.  
  6. ---
  7. PKGBUILD                  | 38 +++++++++++---------------------------
  8.  buildfiles.patch          | 47 ++++-------------------------------------------
  9.  cnijfilter-common.install | 10 +++++-----
  10.  3 files changed, 20 insertions(+), 75 deletions(-)
  11.  
  12. diff --git a/PKGBUILD b/PKGBUILD
  13. index f712a06..55c8f22 100644
  14. --- a/PKGBUILD
  15. +++ b/PKGBUILD
  16. @@ -2,12 +2,13 @@
  17.  # Contributor: Stefan Hackl <stef.hackl [at the] gmail [dot] com>
  18.  # Contributor: Eric Le Bras <eric.lebras [at the] gmail [dot] com>
  19.  # Contributor: Jeroen Op 't Eynde <jeroen [at the] xprsyrslf [dot] be>
  20. +# Contributor: Maxqia <contrib [at the] maxqia [dot] com
  21.  
  22.  pkgname=('cnijfilter-common')
  23.  _pkgname=cnijfilter
  24.  
  25.  pkgver=4.00
  26. -pkgrel=1
  27. +pkgrel=2
  28.  _pkgreview=1
  29.  
  30.  pkgdesc="Canon IJ Printer Driver (Common Package)"
  31. @@ -15,16 +16,11 @@ url="http://www.canon-europe.com/support/pixma_software/"
  32.  
  33.  arch=('i686' 'x86_64')
  34.  license=('custom')
  35. -
  36. +bits=$(getconf LONG_BIT)
  37.  conflicts=('lib32-cnijfilter320')
  38. -
  39. -makedepends_x86_64=('gcc-multilib' 'lib32-popt')
  40. -depends_x86_64=('lib32-libcups' 'lib32-popt')
  41. -
  42. -makedepends_i686=('gcc' 'popt')
  43. -depends_i686=('libcups' 'popt')
  44. -
  45. -makedepends=('autoconf>=2.13' 'automake>=1.6' 'tar' 'make')
  46. +
  47. +makedepends=('autoconf>=2.13' 'automake>=1.6' 'tar' 'make' 'gcc' 'popt')
  48. +depends=('libcups' 'popt')
  49.  
  50.  install=cnijfilter-common.install
  51.  
  52. @@ -35,21 +31,20 @@ source=("cnijfilter-source-4.00-1.tar.gz::http://pdisp01.c-wss.com/gdl/WWUFORedi
  53.     "mychanges.patch")
  54.  sha512sums=('f90a5beec88812f65e8f52f287db8cefbb9c13eabbb7a1117c72d4af238126c282ebbca09ef96f3147d3bd5281f227402ae7564a68d32002eb033833a8080d72'
  55.              'fe33272a243c164e574db591ccca09ef804c899d66ed2e2e3225cfaab503df016fb8f8c6da9e4989fcd8f38678884c989d87c02e47d95aafb60a776df158c7be'
  56. -            '9b1081c964c7894eefa8b4d11b04c7eafda208f629a373a09999fe8fe8f5ce85f6a697bb14e20a3b3ce795d578d46fde5a431b3f29eb4f0ee70e67477bf6f4c2'
  57. +            'c110799111d4ac8fa10a431b5c09633cc17379e2f5aada1d8686fff1d02963c1cfde1482b3144848d03c6f4a11474267ceb8ac4a72e8d222a3275ca5ee21177c'
  58.              '4bd4d2854edfacb59e5b54b1eec348a982e25ba28608d1700e25efea9a54339be234ceaa9b6a013245d4135da14b34cd0d01ae91c315e63ff57565cd5ee1363f')
  59.  
  60.  prepare() {
  61.    cd "${srcdir}/${_pkgname}-source-${pkgver}-${_pkgreview}/"
  62.  
  63.    patch -p1 -i ${srcdir}/cups.patch
  64. +  sed -i.bak s/arch/$bits/g ${srcdir}/buildfiles.patch
  65.    patch -p1 -i ${srcdir}/buildfiles.patch
  66.    patch -p1 -i ${srcdir}/mychanges.patch
  67.  }
  68.  
  69.  build() {
  70.    cd "${srcdir}/${_pkgname}-source-${pkgver}-${_pkgreview}/"
  71. -
  72. -  export CC="gcc -m32"
  73.    make common
  74.  }
  75.  
  76. @@ -58,21 +53,10 @@ package() {
  77.    
  78.    make PACKAGEDIR=${pkgdir} installcommon
  79.    
  80. -  install -d ${pkgdir}/usr/lib32/bjlib
  81. -  if [ "${CARCH}" = 'x86_64' ]; then
  82. -    install -d ${pkgdir}/usr/lib
  83. -    ln -s /usr/lib32/bjlib ${pkgdir}/usr/lib/bjlib
  84. -  fi
  85. -  install -m 644 com/ini/cnnet.ini ${pkgdir}/usr/lib32/bjlib
  86. -  install -s -m 755 com/libs_bin32/lib*.so.* ${pkgdir}/usr/lib32
  87. +  install -d ${pkgdir}/usr/lib/bjlib
  88. +  install -m 644 com/ini/cnnet.ini ${pkgdir}/usr/lib/bjlib
  89. +  install -s -m 755 com/libs_bin$bits/lib*.so.* ${pkgdir}/usr/lib
  90.    install -D LICENSE-cnijfilter-${pkgver}EN.txt ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE-cnijfilter-${pkgver}EN.txt
  91. -  if [ "${CARCH}" = 'x86_64' ]; then
  92. -    mv ${pkgdir}/usr/lib/cups/backend ${pkgdir}/usr/lib32/cups/
  93. -    install -d ${pkgdir}/usr/lib/cups/backend
  94. -    ln -s /usr/lib32/cups/backend/* ${pkgdir}/usr/lib/cups/backend/
  95. -    install -d ${pkgdir}/usr/lib/cups/filter
  96. -    ln -s /usr/lib32/cups/filter/pstocanonij ${pkgdir}/usr/lib/cups/filter/
  97. -  fi
  98.  
  99.    install -d ${pkgdir}/etc/udev/rules.d
  100.    install -m 644 etc/*.rules ${pkgdir}/etc/udev/rules.d
  101. diff --git a/buildfiles.patch b/buildfiles.patch
  102. index 6cd4846..42ad9cd 100644
  103. --- a/buildfiles.patch
  104. +++ b/buildfiles.patch
  105. @@ -1,11 +1,11 @@
  106.  diff -ruN cnijfilter-source-4.00-1.orig/lgmon2/src/Makefile.am cnijfilter-source-4.00-1/lgmon2/src/Makefile.am
  107. ---- cnijfilter-source-4.00-1.orig/lgmon2/src/Makefile.am   2013-07-17 06:03:45.000000000 +0430
  108. -+++ cnijfilter-source-4.00-1/lgmon2/src/Makefile.am    2015-08-04 12:35:12.115634249 +0430
  109. +--- cnijfilter-source-4.00-1.orig/lgmon2/src/Makefile.am        2013-07-17 06:03:45.000000000 +0430
  110. ++++ cnijfilter-source-4.00-1/lgmon2/src/Makefile.am     2015-08-04 12:35:12.115634249 +0430
  111.  @@ -9,3 +9,4 @@
  112.   CFLAGS = -O2 -Wall -I/usr/include/libusb-1.0 -I./common @XML2_CFLAGS@
  113.  
  114.   cnijlgmon2_LDADD = -ldl -lusb-1.0 -lcnnet -lxml2
  115. -+cnijlgmon2_LDFLAGS = -L../../com/libs_bin32
  116. ++cnijlgmon2_LDFLAGS = -L../../com/libs_binarch
  117.  diff -ruN cnijfilter-source-4.00-1.orig/Makefile cnijfilter-source-4.00-1/Makefile
  118.  --- cnijfilter-source-4.00-1.orig/Makefile 2013-07-17 06:03:45.000000000 +0430
  119.  +++ cnijfilter-source-4.00-1/Makefile  2015-08-04 13:02:47.675636146 +0430
  120. @@ -15,49 +15,10 @@ diff -ruN cnijfilter-source-4.00-1.orig/Makefile cnijfilter-source-4.00-1/Makefi
  121.  
  122.  +common :
  123.  +  for dir in "libs" "bscc2sts" "cnijnpr" "cngpij" "cngpijmnt" "pstocanonij" "backend" "backendnet" "cmdtocanonij" "cnijbe" "lgmon2"; do \
  124. -+    (cd $$dir; ./autogen.sh --prefix=/usr --enable-libpath=/usr/lib32/bjlib --enable-progpath=/usr/bin --libdir=/usr/lib32; make) || exit 1; \
  125. ++    (cd $$dir; ./autogen.sh --prefix=/usr --enable-libpath=/usr/lib/bjlib --enable-progpath=/usr/bin --libdir=/usr/lib; make) || exit 1; \
  126.  +  done
  127.  +
  128.  +installcommon :
  129.  +  for dir in "libs" "bscc2sts" "cnijnpr" "cngpij" "cngpijmnt" "pstocanonij" "backend" "backendnet" "cmdtocanonij" "cnijbe" "lgmon2"; do \
  130.  +    (cd $$dir; make install DESTDIR=${PACKAGEDIR}) || exit 1; \
  131.  +  done
  132. -diff -ruN cnijfilter-source-4.00-1.orig/backendnet/configure.in cnijfilter-source-4.00-1/backendnet/configure.in
  133. ---- cnijfilter-source-4.00-1.orig/backendnet/configure.in  2013-07-17 06:03:45.000000000 +0430
  134. -+++ cnijfilter-source-4.00-1/backendnet/configure.in   2015-08-04 16:54:42.385652052 +0430
  135. -@@ -19,7 +19,8 @@
  136. - AC_DEFINE_UNQUOTED(BJLIB_PATH, "$enable_libpath")
  137. - AC_SUBST(BJLIB_PATH)
  138. -
  139. --ARC=`getconf LONG_BIT`
  140. -+#ARC=`getconf LONG_BIT`
  141. -+ARC=32
  142. - AC_SUBST(ARC)
  143. -
  144. - # Checks for programs.
  145. -diff -ruN cnijfilter-source-4.00-1.orig/cnijfilter/configure.in cnijfilter-source-4.00-1/cnijfilter/configure.in
  146. ---- cnijfilter-source-4.00-1.orig/cnijfilter/configure.in  2013-07-17 06:03:45.000000000 +0430
  147. -+++ cnijfilter-source-4.00-1/cnijfilter/configure.in   2015-08-04 16:55:56.955652143 +0430
  148. -@@ -43,7 +43,8 @@
  149. - esac
  150. - AC_SUBST(CNCL_LIB_ID)
  151. -
  152. --ARC=`getconf LONG_BIT`
  153. -+#ARC=`getconf LONG_BIT`
  154. -+ARC=32
  155. - AC_SUBST(ARC)
  156. -
  157. - AC_PROG_CC
  158. -diff -ruN cnijfilter-source-4.00-1.orig/cnijnpr/configure.in cnijfilter-source-4.00-1/cnijnpr/configure.in
  159. ---- cnijfilter-source-4.00-1.orig/cnijnpr/configure.in 2013-07-17 06:03:45.000000000 +0430
  160. -+++ cnijfilter-source-4.00-1/cnijnpr/configure.in  2015-08-04 16:56:07.878985490 +0430
  161. -@@ -37,7 +37,8 @@
  162. -
  163. - CFLAGS="-O2"
  164. -
  165. --ARC=`getconf LONG_BIT`
  166. -+#ARC=`getconf LONG_BIT`
  167. -+ARC=32
  168. - AC_SUBST(ARC)
  169. -
  170. - AC_OUTPUT(Makefile
  171. diff --git a/cnijfilter-common.install b/cnijfilter-common.install
  172. index df370e5..cedf3b1 100644
  173. --- a/cnijfilter-common.install
  174. +++ b/cnijfilter-common.install
  175. @@ -1,20 +1,20 @@
  176.  post_install() {
  177.     if [ -x /sbin/ldconfig ]; then
  178. -     /sbin/ldconfig /usr/lib32
  179. +     /sbin/ldconfig /usr/lib
  180.     fi
  181.  }
  182.  post_upgrade() {
  183.     if [ -x /sbin/ldconfig ]; then
  184. -     /sbin/ldconfig /usr/lib32
  185. +     /sbin/ldconfig /usr/lib
  186.     fi
  187.  }
  188.  post_remove() {
  189.     if [ -x /sbin/ldconfig ]; then
  190. -     /sbin/ldconfig /usr/lib32
  191. +     /sbin/ldconfig /usr/lib
  192.     fi
  193.     for LIBS in "libcnbpcnclapicom" "libcnnet"; do
  194. -     if [ -h /usr/lib32/${LIBS}.so ]; then
  195. -       rm -f /usr/lib32/${LIBS}.so
  196. +     if [ -h /usr/lib/${LIBS}.so ]; then
  197. +       rm -f /usr/lib/${LIBS}.so
  198.       fi
  199.     done
  200.  }
  201. --
  202. 2.7.2
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!