From a30c93e2af03b28083b0bfea868ad3ba77026fe5 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Tue, 9 Jan 2007 17:21:05 +0000 Subject: ttf-sazanami: rprovide virtual/japanese-font, some clean-up --- packages/ttf-fonts/ttf-sazanami_20040629.bb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'packages') diff --git a/packages/ttf-fonts/ttf-sazanami_20040629.bb b/packages/ttf-fonts/ttf-sazanami_20040629.bb index d1c4882d14..a51036155d 100644 --- a/packages/ttf-fonts/ttf-sazanami_20040629.bb +++ b/packages/ttf-fonts/ttf-sazanami_20040629.bb @@ -1,16 +1,18 @@ +require ttf.inc + DESCRIPTION = "Sazanami Gothic/Mincho Japanese TrueType fonts" DESCRIPTION_ttf-sazanami-gothic = "Sazanami Gothic Japanese TrueType font" DESCRIPTION_ttf-sazanami-mincho = "Sazanami Mincho Japanese TrueType font" -LICENSE = "${PN}" -SRC_DISTRIBUTE_LICENSES += "${PN}" AUTHOR = "Electronic Font Open Laboratory (/efont/)" HOMEPAGE = "http://sourceforge.jp/projects/efont/" +LICENSE = "${PN}" +SRC_DISTRIBUTE_LICENSES += "${PN}" +RPROVIDES = "virtual/japanese-font" +PR = "r1" SRC_URI = "http://download.sourceforge.jp/efont/10087/sazanami-20040629.tar.bz2" S = "${WORKDIR}/sazanami-20040629" -require ttf.inc - PACKAGES = "ttf-sazanami-gothic ttf-sazanami-mincho" FILES_ttf-sazanami-gothic = "${datadir}/fonts/truetype/sazanami-gothic.ttf \ ${datadir}/doc/ttf-sazanami-gothic/README" -- cgit v1.2.3 From 0d6071faa667407505bec2d35d9b7f533b62f7cb Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Thu, 11 Jan 2007 18:18:04 +0000 Subject: gpe-beam: unify --- packages/gpe-beam/gpe-beam.inc | 5 +++++ packages/gpe-beam/gpe-beam_0.2.3.bb | 10 ++++------ packages/gpe-beam/gpe-beam_0.2.6.bb | 12 ++++-------- packages/gpe-beam/gpe-beam_0.2.7.bb | 12 ++++-------- packages/gpe-beam/gpe-beam_0.2.8.bb | 11 +++-------- packages/gpe-beam/gpe-beam_0.2.9.bb | 7 ++----- 6 files changed, 22 insertions(+), 35 deletions(-) create mode 100644 packages/gpe-beam/gpe-beam.inc (limited to 'packages') diff --git a/packages/gpe-beam/gpe-beam.inc b/packages/gpe-beam/gpe-beam.inc new file mode 100644 index 0000000000..5ca6df0b03 --- /dev/null +++ b/packages/gpe-beam/gpe-beam.inc @@ -0,0 +1,5 @@ +DESCRIPTION = "GPE infrared communication applet" +SECTION = "gpe" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "gtk+ libgpewidget libmimedir libgpevtype openobex irda-utils dbus-glib" diff --git a/packages/gpe-beam/gpe-beam_0.2.3.bb b/packages/gpe-beam/gpe-beam_0.2.3.bb index b009b10372..e5861f069a 100644 --- a/packages/gpe-beam/gpe-beam_0.2.3.bb +++ b/packages/gpe-beam/gpe-beam_0.2.3.bb @@ -1,7 +1,5 @@ -inherit gpe pkgconfig -LICENSE = "GPL" -DESCRIPTION = "GPE infrared communication applet" -DEPENDS = "gtk+ libgpewidget libmimedir libgpevtype openobex" +require ${PN}.inc + RDEPENDS = "libopenobex-1.0-1" -SECTION = "gpe" -PRIORITY = "optional" + +inherit gpe pkgconfig diff --git a/packages/gpe-beam/gpe-beam_0.2.6.bb b/packages/gpe-beam/gpe-beam_0.2.6.bb index 71af4db7e6..89f8e8230a 100644 --- a/packages/gpe-beam/gpe-beam_0.2.6.bb +++ b/packages/gpe-beam/gpe-beam_0.2.6.bb @@ -1,12 +1,8 @@ -PR = "r1" - -inherit gpe +require ${PN}.inc -DESCRIPTION = "GPE infrared communication applet" -DEPENDS = "gtk+ libgpewidget libmimedir libgpevtype openobex irda-utils dbus-glib" RDEPENDS = "libopenobex-1.0-1 irda-utils" -SECTION = "gpe" -PRIORITY = "optional" -LICENSE = "GPL" +PR = "r1" SRC_URI += "file://vcard-send.patch;patch=1;pnum=0" + +inherit gpe diff --git a/packages/gpe-beam/gpe-beam_0.2.7.bb b/packages/gpe-beam/gpe-beam_0.2.7.bb index 51b99fcfc6..f19b64d933 100644 --- a/packages/gpe-beam/gpe-beam_0.2.7.bb +++ b/packages/gpe-beam/gpe-beam_0.2.7.bb @@ -1,12 +1,8 @@ -PR = "r1" - -inherit gpe +require ${PN}.inc -DESCRIPTION = "GPE infrared communication applet" -DEPENDS = "gtk+ libgpewidget libmimedir libgpevtype openobex irda-utils dbus-glib" RDEPENDS = "libopenobex-1.0-1 irda-utils" -SECTION = "gpe" -PRIORITY = "optional" -LICENSE = "GPL" +PR = "r1" SRC_URI += "file://decl.patch;patch=1;pnum=0" + +inherit gpe diff --git a/packages/gpe-beam/gpe-beam_0.2.8.bb b/packages/gpe-beam/gpe-beam_0.2.8.bb index f68b50341a..9795827aa8 100644 --- a/packages/gpe-beam/gpe-beam_0.2.8.bb +++ b/packages/gpe-beam/gpe-beam_0.2.8.bb @@ -1,12 +1,7 @@ -PR = "r0" +require ${PN}.inc -inherit gpe - -DESCRIPTION = "GPE infrared communication applet" -DEPENDS = "gtk+ libgpewidget libmimedir libgpevtype openobex irda-utils dbus-glib" RDEPENDS = "irda-utils" -SECTION = "gpe" -PRIORITY = "optional" -LICENSE = "GPL" SRC_URI += "file://dbus-new-api.patch;patch=1" + +inherit gpe diff --git a/packages/gpe-beam/gpe-beam_0.2.9.bb b/packages/gpe-beam/gpe-beam_0.2.9.bb index 8275cf6c3a..b96bed4a2f 100644 --- a/packages/gpe-beam/gpe-beam_0.2.9.bb +++ b/packages/gpe-beam/gpe-beam_0.2.9.bb @@ -1,9 +1,6 @@ -DESCRIPTION = "GPE infrared communication applet" -DEPENDS = "gtk+ libgpewidget libmimedir libgpevtype openobex irda-utils dbus-glib" +require ${PN}.inc + RDEPENDS = "irda-utils" -SECTION = "gpe" -PRIORITY = "optional" -LICENSE = "GPL" inherit gpe -- cgit v1.2.3 From bb77ce802e307ef58a2fe725f33ad181b025f16a Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Thu, 11 Jan 2007 22:46:48 +0000 Subject: portmap: use DEBIAN_MIRROR instead of hardcoding one --- packages/portmap/portmap-unslung_5-9.bb | 7 +++---- packages/portmap/portmap.inc | 15 +++++++-------- 2 files changed, 10 insertions(+), 12 deletions(-) (limited to 'packages') diff --git a/packages/portmap/portmap-unslung_5-9.bb b/packages/portmap/portmap-unslung_5-9.bb index ee6c648e9b..c86ae1e892 100644 --- a/packages/portmap/portmap-unslung_5-9.bb +++ b/packages/portmap/portmap-unslung_5-9.bb @@ -4,8 +4,8 @@ LICENSE = "GPL" PR = "r2" COMPATIBLE_MACHINE = "nslu2" -SRC_URI = "http://www.uk.debian.org/debian/pool/main/p/portmap/portmap_5.orig.tar.gz \ - http://www.uk.debian.org/debian/pool/main/p/portmap/portmap_${PV}.diff.gz;patch=1 \ +SRC_URI = "${DEBIAN_MIRROR}/main/p/portmap/portmap_5.orig.tar.gz \ + ${DEBIAN_MIRROR}/main/p/portmap/portmap_${PV}.diff.gz;patch=1 \ file://no-libwrap.patch;patch=1;pnum=0 \ file://portmap.init \ file://make.patch;patch=1" @@ -18,6 +18,5 @@ do_compile() { } do_install() { - oe_runmake 'docdir=${datadir}/doc/portmap' \ - 'DESTDIR=${D}' install + oe_runmake 'docdir=${datadir}/doc/portmap' 'DESTDIR=${D}' install } diff --git a/packages/portmap/portmap.inc b/packages/portmap/portmap.inc index ad477828fb..e7e7673001 100644 --- a/packages/portmap/portmap.inc +++ b/packages/portmap/portmap.inc @@ -2,17 +2,13 @@ DESCRIPTION = "RPC program number mapper." SECTION = "console/network" LICENSE = "GPL" -SRC_URI = "http://www.uk.debian.org/debian/pool/main/p/portmap/portmap_5.orig.tar.gz \ - http://www.uk.debian.org/debian/pool/main/p/portmap/portmap_${PV}.diff.gz;patch=1 \ +SRC_URI = "${DEBIAN_MIRROR}/main/p/portmap/portmap_5.orig.tar.gz \ + http://${DEBIAN_MIRROR}/main/p/portmap/portmap_${PV}.diff.gz;patch=1 \ file://no-libwrap.patch;patch=1;pnum=0 \ file://portmap.init \ file://make.patch;patch=1" S = "${WORKDIR}/portmap_5beta" -PACKAGES =+ "portmap-utils" -FILES_portmap-utils = "/sbin/pmap_set /sbin/pmap_dump" -FILES_${PN}-doc += "${docdir}" - INITSCRIPT_NAME = "portmap" INITSCRIPT_PARAMS = "start 43 S . start 32 0 6 . stop 81 1 ." @@ -27,6 +23,9 @@ do_compile() { do_install() { install -d ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/portmap.init ${D}${sysconfdir}/init.d/portmap - oe_runmake 'docdir=${docdir}/portmap' \ - 'DESTDIR=${D}' install + oe_runmake 'docdir=${docdir}/portmap' 'DESTDIR=${D}' install } + +PACKAGES =+ "portmap-utils" +FILES_portmap-utils = "/sbin/pmap_set /sbin/pmap_dump" +FILES_${PN}-doc += "${docdir}" -- cgit v1.2.3 From 68468c0d2a3b5c7f5cd67d37116758b5cb1d6dd1 Mon Sep 17 00:00:00 2001 From: Andrew Paulsen Date: Fri, 12 Jan 2007 09:51:35 +0000 Subject: libx11: fix makekeys compilation, close #1447 --- packages/xorg-lib/libx11_X11R7.1-1.0.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb b/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb index 7ed04075c8..463312d017 100644 --- a/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb +++ b/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb @@ -17,7 +17,7 @@ FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale" do_compile() { ( unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS - cd src/util; touch makekeys-makekeys.o ; ${BUILD_CC} makekeys.c -o makekeys + cd src/util; touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} makekeys.c -o makekeys ) || exit 1 rm -f ${STAGING_INCDIR}/X11/Xlib.h oe_runmake -- cgit v1.2.3 From ad6297e2bdb9bf190b8d89f755ea265b21d589cb Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Fri, 12 Jan 2007 09:51:53 +0000 Subject: initscripts: fix populate-volatile.sh file and directory creation - now chmod gets called do set the correct permissions --- packages/initscripts/initscripts-1.0/populate-volatile.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/initscripts/initscripts-1.0/populate-volatile.sh b/packages/initscripts/initscripts-1.0/populate-volatile.sh index a60cc0d420..c5692fea7f 100755 --- a/packages/initscripts/initscripts-1.0/populate-volatile.sh +++ b/packages/initscripts/initscripts-1.0/populate-volatile.sh @@ -11,7 +11,7 @@ COREDEF="00_core" create_file() { EXEC=" touch \"$1\"; - chown ${TUSER}.${TGROUP} $1 || echo \"Failed to set owner -${TUSER}- for -$1-.\" >/dev/tty0 2>&1 + chown ${TUSER}.${TGROUP} $1 || echo \"Failed to set owner -${TUSER}- for -$1-.\" >/dev/tty0 2>&1; chmod ${TMODE} $1 || echo \"Failed to set mode -${TMODE}- for -$1-.\" >/dev/tty0 2>&1 " test "$VOLATILE_ENABLE_CACHE" = yes && echo "$EXEC" >> /etc/volatile.cache @@ -26,7 +26,7 @@ create_file() { mk_dir() { EXEC=" mkdir -p \"$1\"; - chown ${TUSER}.${TGROUP} $1 || echo \"Failed to set owner -${TUSER}- for -$1-.\" >/dev/tty0 2>&1 + chown ${TUSER}.${TGROUP} $1 || echo \"Failed to set owner -${TUSER}- for -$1-.\" >/dev/tty0 2>&1; chmod ${TMODE} $1 || echo \"Failed to set mode -${TMODE}- for -$1-.\" >/dev/tty0 2>&1 " test "$VOLATILE_ENABLE_CACHE" = yes && echo "$EXEC" >> /etc/volatile.cache -- cgit v1.2.3 From ea70670c7912cfc80816dba019f44e8815e6a5c3 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 12 Jan 2007 12:59:46 +0000 Subject: qiv: fix do_install --- packages/qiv/qiv_1.9.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/qiv/qiv_1.9.bb b/packages/qiv/qiv_1.9.bb index c3aeb05bd2..17138452a5 100644 --- a/packages/qiv/qiv_1.9.bb +++ b/packages/qiv/qiv_1.9.bb @@ -12,6 +12,9 @@ inherit pkgconfig binconfig CFLAGS += " -lSM -lICE -lXdmcp" do_install() { - install -s -m 0755 qiv ${D}${bindir}/qiv + install -d ${D}${bindir} + install -d ${D}${mandir}/man1/ + + install -s -m 0755 qiv ${D}${bindir}/qiv install -m 0644 qiv.1 ${D}${mandir}/man1/qiv.1 } -- cgit v1.2.3 From 96610be7f09973209825a518a18f24282b35b162 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 12 Jan 2007 13:04:43 +0000 Subject: povray: fix do_configure --- packages/povray/povray_3.6.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/povray/povray_3.6.1.bb b/packages/povray/povray_3.6.1.bb index 914d2eaad6..e1c60570be 100644 --- a/packages/povray/povray_3.6.1.bb +++ b/packages/povray/povray_3.6.1.bb @@ -19,7 +19,7 @@ PARALLEL_MAKE = "" #autoreconf breaks, so we'll skip that. The added advantage is that the patch to ./configure actually has effect do_configure() { - oe_runconf + oe_runconf COMPILED_BY="${MAINTAINER}" } PACKAGES += "${PN}-scenes ${PN}-ini ${PN}-icons ${PN}-scripts ${PN}-includes" -- cgit v1.2.3 From bf35832f54f88a44211080455a9b1acdc2f797ba Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 12 Jan 2007 16:47:19 +0000 Subject: ruby: added forgotten patches --- packages/ruby/ruby-1.8.5/.mtn2git_empty | 0 .../ruby/ruby-1.8.5/disable_wide_getaddrinfo_check.patch | 16 ++++++++++++++++ packages/ruby/ruby-1.8.5/extmk_run.patch | 15 +++++++++++++++ 3 files changed, 31 insertions(+) create mode 100644 packages/ruby/ruby-1.8.5/.mtn2git_empty create mode 100644 packages/ruby/ruby-1.8.5/disable_wide_getaddrinfo_check.patch create mode 100644 packages/ruby/ruby-1.8.5/extmk_run.patch (limited to 'packages') diff --git a/packages/ruby/ruby-1.8.5/.mtn2git_empty b/packages/ruby/ruby-1.8.5/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/ruby/ruby-1.8.5/disable_wide_getaddrinfo_check.patch b/packages/ruby/ruby-1.8.5/disable_wide_getaddrinfo_check.patch new file mode 100644 index 0000000000..82137896b9 --- /dev/null +++ b/packages/ruby/ruby-1.8.5/disable_wide_getaddrinfo_check.patch @@ -0,0 +1,16 @@ +--- packages/ruby/ruby-1.8.5/disable_wide_getaddrinfo_check.patch f667776fd8760b7048cc9617930112347b0ef2c0 ++++ packages/ruby/ruby-1.8.5/disable_wide_getaddrinfo_check.patch f667776fd8760b7048cc9617930112347b0ef2c0 +@@ -0,0 +1,13 @@ ++--- ruby-1.8.5/ext/socket/extconf.rb.orig 2006-12-30 15:12:31.000000000 +1100 +++++ ruby-1.8.5/ext/socket/extconf.rb 2006-12-30 15:16:24.000000000 +1100 ++@@ -216,6 +216,10 @@ ++ } ++ EOF ++ end +++# Ignore the actual result of the above test and assume that +++# everything is OK. +++getaddr_info_ok = true +++ ++ if ipv6 and not getaddr_info_ok ++ abort <