From 2f96c41a43434117c0483a65b6fddf232c8f76ef Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Sat, 23 May 2009 03:07:49 +0200 Subject: {qpf|ttf}-fonts: fix runtime dependencies. (Closes: #2412) * replace virtual/japanese-font with virtual-japanese-font in RPROVIDES * adjust RDEPENDS and RRECOMMENDS accordingly in zten, uim, qpobox, nunome, jards and anki --- recipes/anki/anki.inc | 2 +- recipes/anki/anki_0.4.3.bb | 2 +- recipes/anki/libanki_0.4.3.bb | 2 +- recipes/jards/jards_1.0.bb | 4 ++-- recipes/nunome/nunome_1.0.2.bb | 4 ++-- recipes/poboxserver/qpobox_0.5.4.bb | 4 ++-- recipes/qpf-fonts/qpf-qte_2.3.10.bb | 4 ++-- recipes/qpf-fonts/qpf-unifont_1.0.bb | 2 +- recipes/qpf-fonts/qpf-unismall_1.0.0.bb | 2 +- recipes/ttf-fonts/ttf-sazanami_20040629.bb | 2 +- recipes/uim/uim_1.3.1.bb | 4 ++-- recipes/zten/zten_1.6.2.bb | 3 ++- 12 files changed, 18 insertions(+), 17 deletions(-) diff --git a/recipes/anki/anki.inc b/recipes/anki/anki.inc index e9a71c286b..d11457b0da 100644 --- a/recipes/anki/anki.inc +++ b/recipes/anki/anki.inc @@ -6,7 +6,7 @@ AUTHOR = "Damien Elmes" PRIORITY = "optional" LICENSE = "GPLv2" RDEPENDS = "python-pyqt" -RRECOMMENDS = "kakasi virtual/japanese-font" +RRECOMMENDS = "kakasi virtual-japanese-font" SRC_URI = "http://ichi2.net/anki/download/anki-${PV}.tgz" diff --git a/recipes/anki/anki_0.4.3.bb b/recipes/anki/anki_0.4.3.bb index f3a62f3323..38f05aeb3f 100644 --- a/recipes/anki/anki_0.4.3.bb +++ b/recipes/anki/anki_0.4.3.bb @@ -1,7 +1,7 @@ require anki.inc RDEPENDS += "libanki" -PR = "r1" +PR = "r2" export PV := "${PV}" diff --git a/recipes/anki/libanki_0.4.3.bb b/recipes/anki/libanki_0.4.3.bb index ac33833790..8e8b5b322d 100644 --- a/recipes/anki/libanki_0.4.3.bb +++ b/recipes/anki/libanki_0.4.3.bb @@ -1,5 +1,5 @@ require anki.inc -PR = "r0" +PR = "r1" S = "${WORKDIR}/anki-${PV}/libanki" diff --git a/recipes/jards/jards_1.0.bb b/recipes/jards/jards_1.0.bb index c0504ae88c..8f51b4309d 100644 --- a/recipes/jards/jards_1.0.bb +++ b/recipes/jards/jards_1.0.bb @@ -4,8 +4,8 @@ HOMEPAGE = "http://gakusei.sf.net" SECTION = "opie/applications" PRIORITY = "optional" LICENSE = "GPL" -RDEPENDS = "virtual/japanese-font qte-mt libpng (>= 1) kpengine" -PR = "r7" +RDEPENDS = "virtual-japanese-font qte-mt libpng (>= 1) kpengine" +PR = "r8" # stuff that still needs fixing #) is the RDEPENDS line correct and sufficient? diff --git a/recipes/nunome/nunome_1.0.2.bb b/recipes/nunome/nunome_1.0.2.bb index bf297b0699..0997232065 100644 --- a/recipes/nunome/nunome_1.0.2.bb +++ b/recipes/nunome/nunome_1.0.2.bb @@ -3,8 +3,8 @@ HOMEPAGE = "http://www.sikigami.com/nunome-Qtopia-1.0/" SECTION = "opie/inputmethods" PRIORITY = "optional" LICENSE = "GPL" -RDEPENDS = "virtual/japanese-font" -PR = "r3" +RDEPENDS = "virtual-japanese-font" +PR = "r4" SRC_URI = "${SOURCEFORGE_MIRROR}/gakusei/nunome-${PV}.tar.bz2 \ file://timer.patch;patch=1 \ diff --git a/recipes/poboxserver/qpobox_0.5.4.bb b/recipes/poboxserver/qpobox_0.5.4.bb index 9bb8c34523..89f4ff00b6 100644 --- a/recipes/poboxserver/qpobox_0.5.4.bb +++ b/recipes/poboxserver/qpobox_0.5.4.bb @@ -1,9 +1,9 @@ DESCRIPTION = "A japanese inputmethod for Qt/Embedded based palmtop environments." SECTION = "opie/inputmethods" -RDEPENDS = "poboxserver virtual/japanese-font" +RDEPENDS = "poboxserver virtual-japanese-font" LICENSE = "GPL" HOMEPAGE = "http://takahr.dhis.portside.net/cgi-bin/rwiki.cgi?cmd=view;name=QPOBox" -PR = "r1" +PR = "r2" SRC_URI = "http://www.vanille.de/mirror/qpobox-${PV}.tar.gz \ file://qpobox-0.5.4-opie.patch;patch=1 \ diff --git a/recipes/qpf-fonts/qpf-qte_2.3.10.bb b/recipes/qpf-fonts/qpf-qte_2.3.10.bb index a1a589f003..16f1563312 100644 --- a/recipes/qpf-fonts/qpf-qte_2.3.10.bb +++ b/recipes/qpf-fonts/qpf-qte_2.3.10.bb @@ -20,8 +20,8 @@ PROVIDES += "qte-font-smoothserif-140 qte-font-smoothserif-180 qte-font-smooths PROVIDES += "qte-font-smoothtimes-100 qte-font-smoothtimes-160 qte-font-smoothtimes-170" PROVIDES += "qte-font-smoothtimes-220 qte-font-smoothtimes-250 qte-font-smoothtimes-440" PROVIDES += "qte-font-unifont" -RPROVIDES_qte-font-unifont += "virtual/japanese-font" -RPROVIDES_qte-font-japanese += "virtual/japanese-font" +RPROVIDES_qte-font-unifont += "virtual-japanese-font" +RPROVIDES_qte-font-japanese += "virtual-japanese-font" SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz" S = "${WORKDIR}/qt-${PV}" diff --git a/recipes/qpf-fonts/qpf-unifont_1.0.bb b/recipes/qpf-fonts/qpf-unifont_1.0.bb index e91e762845..8928c83471 100644 --- a/recipes/qpf-fonts/qpf-unifont_1.0.bb +++ b/recipes/qpf-fonts/qpf-unifont_1.0.bb @@ -2,7 +2,7 @@ require qpf.inc DESCRIPTION = "Unicode fonts - QPF Edition" LICENSE = "GPL QPL" -RPROVIDES = "virtual/japanese-font" +RPROVIDES = "virtual-japanese-font" PR = "r2" SRC_URI = "http://www.openzaurus.org/mirror/qpf-unifont.tar.bz2" diff --git a/recipes/qpf-fonts/qpf-unismall_1.0.0.bb b/recipes/qpf-fonts/qpf-unismall_1.0.0.bb index 6298e2dfc4..8ec527f064 100644 --- a/recipes/qpf-fonts/qpf-unismall_1.0.0.bb +++ b/recipes/qpf-fonts/qpf-unismall_1.0.0.bb @@ -3,7 +3,7 @@ require qpf.inc DESCRIPTION = "Lightweight Japanese font in 10 point suitable for 320x240 display" HOMEPAGE = "http://sourceforge.jp/projects/zaurus-ja/" LICENSE = "GPL" -RPROVIDES = "virtual/japanese-font" +RPROVIDES = "virtual-japanese-font" PR = "r4" SRC_URI = "http://osdn.dl.sourceforge.jp/zaurus-ja/773/unismall-${PV}.tar.gz" diff --git a/recipes/ttf-fonts/ttf-sazanami_20040629.bb b/recipes/ttf-fonts/ttf-sazanami_20040629.bb index 852966ac58..97fe0c6c94 100644 --- a/recipes/ttf-fonts/ttf-sazanami_20040629.bb +++ b/recipes/ttf-fonts/ttf-sazanami_20040629.bb @@ -7,7 +7,7 @@ AUTHOR = "Electronic Font Open Laboratory (/efont/)" HOMEPAGE = "http://sourceforge.jp/projects/efont/" LICENSE = "${PN}" SRC_DISTRIBUTE_LICENSES += "${PN}" -RPROVIDES = "virtual/japanese-font" +RPROVIDES = "virtual-japanese-font" PR = "r4" SRC_URI = "http://download.sourceforge.jp/efont/10087/sazanami-20040629.tar.bz2" diff --git a/recipes/uim/uim_1.3.1.bb b/recipes/uim/uim_1.3.1.bb index fce91c30e3..1811df9300 100644 --- a/recipes/uim/uim_1.3.1.bb +++ b/recipes/uim/uim_1.3.1.bb @@ -1,7 +1,7 @@ require uim.inc DEPENDS = "gtk+ uim-native anthy fontconfig libxft xt glib-2.0 ncurses" SECTION_uim-gtk2.0 = "x11/inputmethods" -PR = "r2" +PR = "r3" SRC_URI += "file://uim-module-manager.patch;patch=1" @@ -11,7 +11,7 @@ PACKAGES += "uim-xim uim-utils uim-skk uim-gtk2.0 uim-fep uim-common uim-anthy l LEAD_SONAME = "libuim.so.1" RDEPENDS_uim = "libuim0" -RDEPENDS_uim-anthy = "virtual/japanese-font" +RDEPENDS_uim-anthy = "virtual-japanese-font" DESCRIPTION_libuim0 = "Simple and flexible input method collection and library" SECTION_libuim0 = "libs/inputmethods" diff --git a/recipes/zten/zten_1.6.2.bb b/recipes/zten/zten_1.6.2.bb index 33feae0911..e45fcef4fc 100644 --- a/recipes/zten/zten_1.6.2.bb +++ b/recipes/zten/zten_1.6.2.bb @@ -5,8 +5,9 @@ SECTION = "opie/applications" PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "eb kakasi" -RDEPENDS = "virtual/japanese-font" +RDEPENDS = "virtual-japanese-font" RCONFLICTS = "ztenv" +PR = "r1" SRC_URI = "http://www.gohome.org/cgi-bin/viewcvs.cgi/zten.tar.gz;md5sum=d24f03c8df5c98d510590bd9a63dc932 \ file://zten.patch;patch=1" -- cgit 1.2.3-korg