Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 295779 Details for
Bug 130645
net-print/cnijfilter-3.20 - Canon pixma/pixus drivers (new ebuild)
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
diff on 3.40-r5 <-> 3.40-r7
cnijfilter-3.40-r5-r7.diff (text/plain), 2.25 KB, created by
cmuelle8
on 2011-12-14 09:09:51 UTC
(
hide
)
Description:
diff on 3.40-r5 <-> 3.40-r7
Filename:
MIME Type:
Creator:
cmuelle8
Created:
2011-12-14 09:09:51 UTC
Size:
2.25 KB
patch
obsolete
>--- cnijfilter-3.40-r5.ebuild 2011-12-14 09:52:39.000000000 +0100 >+++ cnijfilter-3.40-r7.ebuild 2011-12-14 10:02:51.000000000 +0100 >@@ -19,6 +19,11 @@ > # Added patch to force 32bit library on emul'd 64bit install > # Removed if for 64bit library copy -- copies 32bit either way > # >+# 2011-12-14 Christian Mueller 3.40-r7 >+# Removed patch to force 32bit library on emul'd 64bit install >+# Added png15 / cups15 patches >+# Fixed amd64 issues >+# > > inherit eutils rpm flag-o-matic multilib > >@@ -44,12 +49,12 @@ > mg6100 > mg8100" > DEPEND="app-text/ghostscript-gpl >- >=net-print/cups-1.1.14 >+ >=net-print/cups-1.3 > !amd64? ( sys-libs/glibc > >=dev-libs/popt-1.6 > >=media-libs/tiff-3.4 >- >=media-libs/libpng-1.0.9 ) >- amd64? ( >=app-emulation/emul-linux-x86-bjdeps-0.1 >+ >=media-libs/libpng-1.2 ) >+ amd64? ( > app-emulation/emul-linux-x86-compat > app-emulation/emul-linux-x86-baselibs ) > servicetools? ( !amd64? ( >=gnome-base/libglade-0.6 >@@ -90,7 +95,8 @@ > > _prefix="/usr/local" > _bindir="/usr/local/bin" >- _libdir="/usr/$(get_libdir)" # either lib or lib32 >+ _libdir="/usr/lib$(use amd64 && echo 64 || echo 32)" # do not use get_libdir >+ _libdir_pkg=libs_bin$(use amd64 && echo 64 || echo 32) > _cupsdir1="/usr/lib/cups" > _cupsdir2="/usr/libexec/cups" > _ppddir="/usr/share/cups/model" >@@ -134,7 +140,8 @@ > mv ${PN}-source-${PV}-1 ${P} || die # Correcting directory-structure > > cd "${P}" >- epatch "${FILESDIR}"/force-32bit-backendnet-libs.patch >+ sed -i -e 's/png_p->jmpbuf/png_jmpbuf(png_p)/' cnijfilter/src/bjfimage.c >+ sed -i -e '/cups.ipp.h/ s_$_\n#include <cups/ppd.h>_' backend/src/cnij_backend_common.c > } > > src_compile() { >@@ -190,9 +197,9 @@ > cd ../backendnet || die > make DESTDIR=${D} install || die "Couldn't make install backendnet" > >- cd ../com/libs_bin32 || die >- >- dolib.so libcnnet.so.* || die "Couldn't install libcnnet.so" >+ cd ../com/${_libdir_pkg} || die >+ ln -sf libcnnet.so.* libcnnet.so >+ cp -a libcnnet.so* ${D}${_libdir} || die > cd .. || die > fi > >@@ -281,7 +288,9 @@ > fi > > cd ../.. >- cp -a ${_prid}/libs_bin32/* ${D}${_libdir} || die >+ cp -a ${_prid}/${_libdir_pkg}/* ${D}${_libdir} || die > cp -a ${_prid}/database/* ${D}${_libdir}/cnijlib || die > cp -a ppd/canon${_pr}.ppd ${D}${_ppddir} || die > } >+ >+
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Raw
Actions:
View
Attachments on
bug 130645
:
85055
|
89824
|
90098
|
90286
|
92300
|
92394
|
92765
|
94410
|
95341
|
95342
|
95343
|
100540
|
100713
|
100922
|
103002
|
106584
|
189035
|
189036
|
189037
|
189039
|
222229
|
224233
|
224363
|
230051
|
230053
|
233407
|
241641
|
241643
|
261484
|
261485
|
261486
|
262545
|
263077
|
270671
|
270673
|
270681
|
270683
|
270687
|
270875
|
270881
|
277421
|
283773
|
283775
|
284261
|
284263
|
292163
|
292399
|
292401
|
292403
|
295761
|
295777
|
295779
|
296499
|
297123
|
302461
|
302525
|
302527
|
304563
|
304565
|
304995
|
304997
|
304999
|
305003
|
305005
|
312725
|
312727
|
312729
|
312731
|
323934
|
323936
|
323938
|
323940
|
332928
|
332936
|
332938
|
332940
|
332942
|
332996
|
333010
|
333012
|
333014
|
333040
|
333042
|
340020
|
340022
|
349482
|
357984
|
357990
|
385826
|
402866
|
491132
|
515100
|
515104
|
560112
|
560114
|
762522
|
882299