diff options
author | Philip Balister <philip@balister.org> | 2007-05-05 20:36:01 +0000 |
---|---|---|
committer | Philip Balister <philip@balister.org> | 2007-05-05 20:36:01 +0000 |
commit | faf3482413a3d1a7e121aaf3fdff2497b56c089e (patch) | |
tree | 48f4a8ada896f2e8cb2d9842a65241993efbcf70 | |
parent | d26de2c423b2f4d3454eac2f952f127d426e5839 (diff) | |
parent | bf86b396fc10e477d183557b2decdb99049ac7b6 (diff) |
merge of 'bcb26d45f59e69826c0f1f99784cb544fe4d99f5'
and 'd6b64846e115c0e8068d0d352ef4993a3f19a381'
-rw-r--r-- | classes/insane.bbclass | 2 | ||||
-rw-r--r-- | packages/gpe-autostarter/gpe-autostarter_0.12.bb | 2 | ||||
-rw-r--r-- | packages/prismstumbler/prismstumbler_0.7.3.bb | 6 | ||||
-rw-r--r-- | packages/tracker/tracker_0.5.4.bb | 2 |
4 files changed, 8 insertions, 4 deletions
diff --git a/classes/insane.bbclass b/classes/insane.bbclass index 30b164b734..c3a211eefd 100644 --- a/classes/insane.bbclass +++ b/classes/insane.bbclass @@ -219,7 +219,7 @@ def package_qa_check_rpath(file,name,d): #bb.note("???%s???" % bad_dir_test) for line in txt: #bb.note("===%s===" % line) - if bad_dir_test in line: + if bad_dir in line: package_qa_write_error( 1, name, file, d) bb.error("QA Issue package %s contains bad RPATH %s in file %s" % (name, line, file)) #bb.note("Fixing RPATH for you in %s" % file) diff --git a/packages/gpe-autostarter/gpe-autostarter_0.12.bb b/packages/gpe-autostarter/gpe-autostarter_0.12.bb index f92b5df16b..c47f75797e 100644 --- a/packages/gpe-autostarter/gpe-autostarter_0.12.bb +++ b/packages/gpe-autostarter/gpe-autostarter_0.12.bb @@ -4,3 +4,5 @@ DEPENDS = "glib-2.0 dbus-glib hotplug-dbus virtual/libx11" RDEPENDS = "hotplug-dbus" inherit gpe + +SRC_URI += "file://wireless.patch;patch=1" diff --git a/packages/prismstumbler/prismstumbler_0.7.3.bb b/packages/prismstumbler/prismstumbler_0.7.3.bb index bf38d10ca1..c0bfdcc5be 100644 --- a/packages/prismstumbler/prismstumbler_0.7.3.bb +++ b/packages/prismstumbler/prismstumbler_0.7.3.bb @@ -10,7 +10,8 @@ RDEPENDS = "wireless-tools" SRC_URI = "${SOURCEFORGE_MIRROR}/prismstumbler/${PN}-${PV}.tar.bz2 \ file://bogoconf.patch;patch=1 \ file://crosscompile.patch;patch=1 \ - file://libz.patch;patch=1;pnum=0" + file://libz.patch;patch=1;pnum=0 \ + file://wireless.patch;patch=1" inherit autotools pkgconfig @@ -19,7 +20,8 @@ EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \ --with-libpcap=${STAGING_DIR}/${HOST_SYS} \ --with-sqlite-includes=${STAGING_INCDIR} \ --with-sqlite-libs=${STAGING_LIBDIR} \ - --without-athena" + --without-athena \ + --without-motif" CFLAGS =+ "-I${S}/include -D_GNU_SOURCE" diff --git a/packages/tracker/tracker_0.5.4.bb b/packages/tracker/tracker_0.5.4.bb index eaf8c3f566..d10a2a646b 100644 --- a/packages/tracker/tracker_0.5.4.bb +++ b/packages/tracker/tracker_0.5.4.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Tracker is a tool designed to extract information and metadata about your personal data so that it can be searched easily and quickly." LICENSE = "GPLv2" -DEPENDS = "gtk+ gstreamer gamin libgmime dbus poppler libexif libgsf" +DEPENDS = "file gtk+ gstreamer gamin libgmime dbus poppler libexif libgsf" SRC_URI = "http://www.gnome.org/~jamiemcc/tracker/tracker-${PV}.tar.gz \ file://no-ioprio.patch;patch=1" |