Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 186530 Details for
Bug 245136
net-print/hplip-3.9.2 version bump
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
hplip-3.9.2.diff
hplip-3.9.2.diff (text/plain), 6.25 KB, created by
Daniel Pielmeier
on 2009-03-28 12:26:53 UTC
(
hide
)
Description:
hplip-3.9.2.diff
Filename:
MIME Type:
Creator:
Daniel Pielmeier
Created:
2009-03-28 12:26:53 UTC
Size:
6.25 KB
patch
obsolete
>--- hplip-2.8.7.ebuild 2009-03-14 20:06:28.000000000 +0100 >+++ hplip-3.9.2.ebuild 2009-03-28 13:15:23.000000000 +0100 >@@ -2,7 +2,9 @@ > # Distributed under the terms of the GNU General Public License v2 > # $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-2.8.7.ebuild,v 1.2 2009/03/14 19:04:39 armin76 Exp $ > >-inherit eutils linux-info python >+EAPI="2" >+ >+inherit eutils fdo-mime linux-info python > > DESCRIPTION="HP Linux Imaging and Printing System. Includes net-print/hpijs, scanner drivers and service tools." > HOMEPAGE="http://hplip.sourceforge.net/" >@@ -17,13 +19,13 @@ > DEPEND="!net-print/hpijs > !net-print/hpoj > virtual/ghostscript >- >=media-libs/jpeg-6b >- >=net-print/foomatic-filters-3.0.20080507 >+ media-libs/jpeg >+ >=net-print/foomatic-filters-3.0.20080507[cups] > !minimal? ( >- >=net-print/cups-1.2 >+ net-print/cups > dev-libs/libusb > cupsddk? ( net-print/cupsddk ) >- dbus? ( >=sys-apps/dbus-1.0.0 ) >+ dbus? ( sys-apps/dbus ) > scanner? ( >=media-gfx/sane-backends-1.0.19-r1 ) > snmp? ( > net-analyzer/net-snmp >@@ -36,18 +38,17 @@ > !<sys-fs/udev-114 > scanner? ( > dev-python/imaging >- gtk? ( >=media-gfx/xsane-0.89 ) >- !gtk? ( >=media-gfx/sane-frontends-1.0.9 ) >+ gtk? ( media-gfx/xsane ) >+ !gtk? ( media-gfx/sane-frontends ) > ) > qt4? ( !qt3? ( > dev-python/PyQt4 >- dbus? ( >=dev-python/dbus-python-0.80 ) >+ dbus? ( dev-python/dbus-python ) > fax? ( dev-python/reportlab ) > ) ) > qt3? ( >- >=dev-python/PyQt-3.14 >- dev-python/ctypes >- dbus? ( >=dev-python/dbus-python-0.80 ) >+ dev-python/PyQt >+ dbus? ( dev-python/dbus-python ) > fax? ( dev-python/reportlab ) > ) > )" >@@ -60,7 +61,7 @@ > > use scanner && ! use gtk && ewarn "You need USE=gtk for the scanner GUI." > >- if ! use ppds && ! use cupsddk; then >+ if ! use ppds && ! use cupsddk ; then > ewarn "Installing neither static (USE=-ppds) nor dynamic (USE=-cupsddk) PPD files," > ewarn "which is probably not what you want. You will almost certainly not be able to " > ewarn "print (recommended: USE=\"cupsddk -ppds\")." >@@ -73,10 +74,7 @@ > fi > } > >-src_unpack() { >- unpack ${A} >- cd "${S}" >- >+src_prepare() { > sed -i -e "s:\$(doc_DATA)::" Makefile.in || die "Patching Makefile.in failed" > sed -i -e "s/'skipstone']/'skipstone', 'epiphany']/" \ > -e "s/'skipstone': ''}/'skipstone': '', 'epiphany': '--new-window'}/" \ >@@ -95,28 +93,44 @@ > cp "${FILESDIR}"/70-hpmud.rules data/rules > sed -i -e "s/55-hpmud.rules/70-hpmud.rules/g" Makefile.* */*.html || die "sed failed" > >+ sed -i \ >+ -e s:\/usr\/lib\/cups\/driver:$(cups-config --serverbin)\/driver:g \ >+ installer/core_install.py || die "sed core_install.py" >+ > # Use system foomatic-rip instead of foomatic-rip-hplip >- sed -i -e 's/foomatic-rip-hplip/foomatic-rip/' ppd/*.ppd || die "sed failed" >+ local i >+ for i in ppd/*.ppd.gz >+ do >+ rm -f ${i}.temp >+ gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | gzip > ${i}.temp || die "*.ppd.gz sed failed" >+ mv ${i}.temp ${i} >+ done > > # Qt4 is still undocumented by upstream, so use with caution >- local QT_VER >- use qt4 && QT_VER="4" >- use qt3 && QT_VER="3" >- sed -i \ >- -e "s/%s --force-startup/%s --force-startup --qt${QT_VER}/" \ >- -e "s/'--force-startup'/'--force-startup', '--qt${QT_VER}'/" \ >- base/device.py || die "sed failed" >- sed -i \ >- -e "s/Exec=hp-systray/Exec=hp-systray --qt${QT_VER}/" \ >- hplip-systray.desktop.in || die "sed failed" >+ local qt_ver >+ use qt3 && qt_ver="3" >+ use qt4 && qt_ver="4" >+ if use qt3 || use qt4 ; then >+ sed -i \ >+ -e "s/%s --force-startup/%s --force-startup --qt${qt_ver}/" \ >+ -e "s/'--force-startup'/'--force-startup', '--qt${qt_ver}'/" \ >+ base/device.py || die "sed failed" >+ sed -i \ >+ -e "s/Exec=hp-systray/Exec=hp-systray --qt${qt_ver}/" \ >+ hplip-systray.desktop.in || die "sed failed" >+ fi >+ >+ # Upstream patch https://sourceforge.net/forum/forum.php?forum_id=928083 >+ epatch "${FILESDIR}"/${P}-high_cpu_utilization_logout.patch > } > >-src_compile() { >+src_configure() { > if use qt3 || use qt4 ; then >- local GUI_BUILD="--enable-gui-build" >+ local gui_build="--enable-gui-build" > else >- local GUI_BUILD="--disable-gui-build" >+ local gui_build="--disable-gui-build" > fi >+ use qt4 && gui_build="${gui_build} --enable-qt4 --disable-qt3" > > econf \ > --disable-dependency-tracking \ >@@ -124,7 +138,7 @@ > --with-cupsbackenddir=$(cups-config --serverbin)/backend \ > --with-cupsfilterdir=$(cups-config --serverbin)/filter \ > --disable-foomatic-rip-hplip-install \ >- ${GUI_BUILD} \ >+ ${gui_build} \ > $(use_enable doc doc-build) \ > $(use_enable cupsddk foomatic-drv-install) \ > $(use_enable dbus dbus-build) \ >@@ -133,30 +147,43 @@ > $(use_enable parport pp-build) \ > $(use_enable ppds foomatic-ppd-install) \ > $(use_enable scanner scan-build) \ >- $(use_enable snmp network-build) \ >- || die "econf failed" >- emake || die "Compilation failed" >+ $(use_enable snmp network-build) > } > > src_install() { > emake -j1 DESTDIR="${D}" install || die "emake install failed" > rm -f "${D}"/etc/sane.d/dll.conf > >- # bug 106035 >- use qt3 || use qt4 || rm -Rf "${D}"/usr/share/applications >- > use minimal && rm -rf "${D}"/usr/lib >+ >+ # bug 237537 maybe it is safe to add this as this issue has been confirmed a few times >+ use minimal || fperms 700 /usr/libexec/cups/backend/hp >+ >+ # bug 106035/259763 >+ if use !qt3 && use !qt4 ; then >+ rm -Rf "${D}"/usr/share/applications "${D}"/etc/xdg >+ fi >+ >+ # kde3 autostart hack >+ if [[ -d /usr/kde/3.5/share/autostart ]] && use !minimal ; then >+ insinto /usr/kde/3.5/share/autostart >+ doins hplip-systray.desktop >+ fi >+ >+ # Do not install unzipped ppd files >+ rm -f "${D}"/usr/share/ppd/HP/*.ppd > } > > pkg_preinst() { > # avoid collisions with cups-1.2 compat symlinks >- if [ -e "${ROOT}"/usr/lib/cups/backend/hp ] && [ -e "${ROOT}"/usr/libexec/cups/backend/hp ]; then >+ if [ -e "${ROOT}"/usr/lib/cups/backend/hp ] && [ -e "${ROOT}"/usr/libexec/cups/backend/hp ] ; then > rm -f "${ROOT}"/usr/libexec/cups/backend/hp{,fax}; > fi > } > > pkg_postinst() { > python_mod_optimize /usr/share/${PN} >+ fdo-mime_desktop_database_update > > elog "You should run hp-setup as root if you are installing hplip for the first time, and may also" > elog "need to run it if you are upgrading from an earlier version." >@@ -169,4 +196,5 @@ > > pkg_postrm() { > python_mod_cleanup /usr/share/${PN} >+ fdo-mime_desktop_database_update > }
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 Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 245136
:
171082
|
171083
|
171449
|
171450
|
171517
|
177677
|
177678
|
178169
|
178170
|
178173
|
178613
|
182736
|
182752
|
182754
|
182804
|
184692
|
185645
|
185778
| 186530 |
186531