diff options
-rw-r--r-- | net-print/kink/ChangeLog | 7 | ||||
-rw-r--r-- | net-print/kink/files/kink-0.2.1-api-update.patch | 29 | ||||
-rw-r--r-- | net-print/kink/kink-0.2.1-r1.ebuild | 12 | ||||
-rw-r--r-- | net-print/kink/metadata.xml | 2 |
4 files changed, 43 insertions, 7 deletions
diff --git a/net-print/kink/ChangeLog b/net-print/kink/ChangeLog index 9f911ec5b232..b4d00a86912c 100644 --- a/net-print/kink/ChangeLog +++ b/net-print/kink/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-print/kink # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/kink/ChangeLog,v 1.6 2007/01/06 19:50:57 cryos Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/kink/ChangeLog,v 1.7 2007/06/22 05:54:33 philantrop Exp $ + + 22 Jun 2007; Wulf C. Krueger <philantrop@gentoo.org> + +files/kink-0.2.1-api-update.patch, metadata.xml, kink-0.2.1-r1.ebuild: + Added Joerg Plate's patch from bug 176857 to make it compile using + libinklevel's new API. Thanks, Joerg! Minor whitespace fixes. *kink-0.2.1-r1 (06 Jan 2007) diff --git a/net-print/kink/files/kink-0.2.1-api-update.patch b/net-print/kink/files/kink-0.2.1-api-update.patch new file mode 100644 index 000000000000..135a3dfbff15 --- /dev/null +++ b/net-print/kink/files/kink-0.2.1-api-update.patch @@ -0,0 +1,29 @@ +--- kink/kink.cpp- 2007-06-22 01:51:13.000000000 +0200 ++++ kink/kink.cpp 2007-06-22 01:52:08.000000000 +0200 +@@ -76,7 +76,7 @@ + // Detect printers on parallel ports (if any) + for(int i=0; i<PARPORT_LAST_PORT; i++) + { +- callback = get_ink_level(PARPORT,i,&level); ++ callback = get_ink_level(PARPORT,"",i,&level); + switch(callback) + { + case OK: +@@ -91,7 +91,7 @@ + // Detect printers on USB ports (if any) + for(int i=0; i<USB_LAST_PORT; i++) + { +- callback = get_ink_level(USB,i,&level); ++ callback = get_ink_level(USB,"",i,&level); + switch(callback) + { + case OK: +@@ -202,7 +202,7 @@ + grpError->hide(); + grpLevels->show(); + +- callback=get_ink_level(last_type,last_port,&level); ++ callback=get_ink_level(last_type,"",last_port,&level); + if (callback == OK) + { + QProgressBar* ptrBar = 0; diff --git a/net-print/kink/kink-0.2.1-r1.ebuild b/net-print/kink/kink-0.2.1-r1.ebuild index 9dacd6311ad5..658136e492f6 100644 --- a/net-print/kink/kink-0.2.1-r1.ebuild +++ b/net-print/kink/kink-0.2.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/kink/kink-0.2.1-r1.ebuild,v 1.1 2007/01/06 19:10:30 cryos Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/kink/kink-0.2.1-r1.ebuild,v 1.2 2007/06/22 05:54:33 philantrop Exp $ inherit kde eutils @@ -10,11 +10,13 @@ SRC_URI="mirror://sourceforge/kink/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~x86 ~amd64 ~ppc" +KEYWORDS="~amd64 ~ppc ~x86" IUSE="" -DEPEND=">=net-print/libinklevel-0.6.6_rc5" +DEPEND=">=net-print/libinklevel-0.7.1" + need-kde 3.1 -PATCHES="${FILESDIR}/kink-0.2.1-compilefix.diff - ${FILESDIR}/kink-0.2.1-libinklevel-0.6.6.patch" +PATCHES="${FILESDIR}/kink-0.2.1-compilefix.diff + ${FILESDIR}/${P}-libinklevel-0.6.6.patch + ${FILESDIR}/${P}-api-update.patch" diff --git a/net-print/kink/metadata.xml b/net-print/kink/metadata.xml index 3399d0876645..8d1e86a9cefb 100644 --- a/net-print/kink/metadata.xml +++ b/net-print/kink/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<herd>kde</herd> +<herd>kde</herd> </pkgmetadata> |