[oe-commits] org.oe.dev merge of 'bac543c4612d852bbed6209100ed1a521881f0cf'

rwhitby commit openembedded-commits at lists.openembedded.org
Mon Sep 24 09:18:02 UTC 2007


merge of 'bac543c4612d852bbed6209100ed1a521881f0cf'
     and 'e4d75b274d0d0e865c3387c7fffdc927c195383a'

Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: a8f3bafcb48eddb52c9b4c0eae2518264f20ea14
ViewMTN: http://monotone.openembedded.org/revision/info/a8f3bafcb48eddb52c9b4c0eae2518264f20ea14
Files:
1
packages/meta/slugos-packages.bb
packages/redboot-utils/fis_1.0.bb
packages/gcc/files
packages/bluez/bluez-gstreamer-plugin_3.19.bb
packages/gcc/files/gfortran.patch
packages/abiword/abiword-plugins_2.4.6.bb
packages/abiword/abiword-plugins_2.5.1.bb
packages/abiword/abiword-plugins_2.5.2.bb
packages/bluez/bluez-utils3.inc
packages/bluez/bluez-utils_3.18.bb
packages/bluez/bluez-utils_3.19.bb
packages/efl1/epdf_cvs.bb
packages/epdfview/epdfview_0.1.2.bb
packages/epdfview/epdfview_0.1.3.bb
packages/epdfview/epdfview_0.1.4.bb
packages/epdfview/epdfview_0.1.5.bb
packages/epdfview/epdfview_0.1.6.bb
packages/evince/evince_0.5.2.bb
packages/evince/evince_0.6.1.bb
packages/evince/evince_0.9.0.bb
packages/evince/evince_0.9.2.bb
packages/gcc/gcc-cross_4.1.2.bb
packages/gcc/gcc-cross_4.2.1.bb
packages/gcc/gcc_4.1.2.bb
packages/gcc/gcc_4.2.1.bb
packages/tracker/tracker_0.5.4.bb
Diffs:

#
# mt diff -rbac543c4612d852bbed6209100ed1a521881f0cf -ra8f3bafcb48eddb52c9b4c0eae2518264f20ea14
#
# 
# 
# patch "packages/meta/slugos-packages.bb"
#  from [738a66a4cd05dd74381dce0949ddcd547be2497f]
#    to [3e624519aa3c29fb9c243930483b6363f1b191b9]
# 
# patch "packages/redboot-utils/fis_1.0.bb"
#  from [423fde1a30e871e390b48542349b88efb3a07ac9]
#    to [16fa3c9f589d8b24e84de8555dad50affd97b735]
# 
============================================================
--- packages/meta/slugos-packages.bb	738a66a4cd05dd74381dce0949ddcd547be2497f
+++ packages/meta/slugos-packages.bb	3e624519aa3c29fb9c243930483b6363f1b191b9
@@ -5,7 +5,7 @@ LICENSE = "MIT"
 DESCRIPTION = "Packages that are compatible with the SlugOS firmware"
 HOMEPAGE = "http://www.nslu2-linux.org"
 LICENSE = "MIT"
-PR = "r35"
+PR = "r36"
 CONFLICTS = "db3"
 
 COMPATIBLE_MACHINE = "nslu2"
@@ -37,6 +37,7 @@ SLUGOS_PACKAGES = "\
 	binutils \
 	bison \
 	bluez-utils \
+	bluez-hcidump \
 	bogofilter \
 	boost \
 	bridge-utils \
============================================================
--- packages/redboot-utils/fis_1.0.bb	423fde1a30e871e390b48542349b88efb3a07ac9
+++ packages/redboot-utils/fis_1.0.bb	16fa3c9f589d8b24e84de8555dad50affd97b735
@@ -1,7 +1,7 @@ DESCRIPTION = "Tool to edit the Redboot 
 DESCRIPTION = "Tool to edit the Redboot FIS partition layout from userspace"
-PR = "r4"
+PR = "r5"
 
-SRC_URI = "svn://svn.nslu2-linux.org/svnroot/fis;module=trunk;proto=http"
+SRC_URI = "svn://svn.nslu2-linux.org/svnroot/fis;module=trunk;proto=http;rev=6"
 S="${WORKDIR}/trunk"
 
 export CFLAGS += "--std=c99"


#
# mt diff -re4d75b274d0d0e865c3387c7fffdc927c195383a -ra8f3bafcb48eddb52c9b4c0eae2518264f20ea14
#
# 
# 
# add_dir "packages/gcc/files"
# 
# add_file "packages/bluez/bluez-gstreamer-plugin_3.19.bb"
#  content [f67c210c4018f045ec0a87f2baff07aefd2c19ae]
# 
# add_file "packages/gcc/files/gfortran.patch"
#  content [b050220a6851cf1b7525b48eba3fc64209d7c89c]
# 
# patch "packages/abiword/abiword-plugins_2.4.6.bb"
#  from [90e4ee7a0e8fbba87ea3c2b68d511dcfd6b93959]
#    to [f9e45ae632c16a6e48d5f86d69622b506fc10de1]
# 
# patch "packages/abiword/abiword-plugins_2.5.1.bb"
#  from [ac69b252517894d1f05efb9c4443e854c958b28d]
#    to [62e4936aba824f0155caa54f5911ce2750c5a7ae]
# 
# patch "packages/abiword/abiword-plugins_2.5.2.bb"
#  from [380a4ea0f3f1f3606d2a65ae330bb4bc025f1452]
#    to [39b5723ec0757262378d7f9ea18236861fbbface]
# 
# patch "packages/bluez/bluez-utils3.inc"
#  from [4cf020b7c86ff55af20fb6a730f55fb32a810135]
#    to [57a5ef74c55de81a92629f96194e3390e75484af]
# 
# patch "packages/bluez/bluez-utils_3.18.bb"
#  from [6eab1b4ae54ca017408988788320c718efedc784]
#    to [585b498ec4a54ca79531aca3aabb3569a3dd6476]
# 
# patch "packages/bluez/bluez-utils_3.19.bb"
#  from [6eab1b4ae54ca017408988788320c718efedc784]
#    to [585b498ec4a54ca79531aca3aabb3569a3dd6476]
# 
# patch "packages/efl1/epdf_cvs.bb"
#  from [e413e42ab3491388c723c09e3d825d3bbe55542c]
#    to [9250d539c8f86f2eda976014a30908c6b3905ba0]
# 
# patch "packages/epdfview/epdfview_0.1.2.bb"
#  from [1b1ef51171b82fb1e5bd831a40da163149bec148]
#    to [f6ca145eba9dac8455260344c3842ac26ca8745f]
# 
# patch "packages/epdfview/epdfview_0.1.3.bb"
#  from [ecf0961f5f94592fbb9a41d8e6ded36fb8797bd7]
#    to [1b1ef51171b82fb1e5bd831a40da163149bec148]
# 
# patch "packages/epdfview/epdfview_0.1.4.bb"
#  from [ecf0961f5f94592fbb9a41d8e6ded36fb8797bd7]
#    to [1b1ef51171b82fb1e5bd831a40da163149bec148]
# 
# patch "packages/epdfview/epdfview_0.1.5.bb"
#  from [33e235bc0c7482a9d081fca2c1028cddc5ca153e]
#    to [d69520dd4a8189f45fe661be6cbdd872fc0243a2]
# 
# patch "packages/epdfview/epdfview_0.1.6.bb"
#  from [33e235bc0c7482a9d081fca2c1028cddc5ca153e]
#    to [d69520dd4a8189f45fe661be6cbdd872fc0243a2]
# 
# patch "packages/evince/evince_0.5.2.bb"
#  from [7fb39851f831c9982ca26a8059b42278304f4d36]
#    to [3b7703f23805d9492ed4ad8c4426374d3141ce20]
# 
# patch "packages/evince/evince_0.6.1.bb"
#  from [e357ae7b8e959629904c07b7c566814ceac340df]
#    to [42f1db9c040b862b8d4ce1842e2e4e5e37ba3f2a]
# 
# patch "packages/evince/evince_0.9.0.bb"
#  from [c874b55da09d3037d303e145d2cc1507fa7402e6]
#    to [14e01d8692044f2b81b78f301288bbcc971d0769]
# 
# patch "packages/evince/evince_0.9.2.bb"
#  from [89ebf8b7f1349cc3376ba3c7c781805d0338ba57]
#    to [b0705645e100b270c463bd4654e40a4d2135b33c]
# 
# patch "packages/gcc/gcc-cross_4.1.2.bb"
#  from [e32d37ba80f15300c2db6d0edcc1ede5e4b98c2a]
#    to [36019aa250fcf94fb16c8f3adab162249c9d8053]
# 
# patch "packages/gcc/gcc-cross_4.2.1.bb"
#  from [7c1b83bd533cc9f0be3ff22dfc2f2f421a61b51d]
#    to [be2f2c53bbd220132778e60f9e959c8e95466e72]
# 
# patch "packages/gcc/gcc_4.1.2.bb"
#  from [31103053e64980e6cc2b3a95ec488a95571ad557]
#    to [9898246aa60cafd67aec15702e2857dd9a13c54e]
# 
# patch "packages/gcc/gcc_4.2.1.bb"
#  from [75d1f330d3edd4d9ef0c6477866c817ffddf9f14]
#    to [cf5a7ff85d01add9d5ee5a5f6fc4db5df067224e]
# 
# patch "packages/tracker/tracker_0.5.4.bb"
#  from [af58e08614c9a05576935ebdd2adb94edc389bb8]
#    to [8dc21c07b0988530c1597956d00001659fa4d16e]
# 
============================================================
--- packages/bluez/bluez-gstreamer-plugin_3.19.bb	f67c210c4018f045ec0a87f2baff07aefd2c19ae
+++ packages/bluez/bluez-gstreamer-plugin_3.19.bb	f67c210c4018f045ec0a87f2baff07aefd2c19ae
@@ -0,0 +1,26 @@
+require bluez-utils3.inc
+
+DEPENDS += "gstreamer gst-plugins-base "
+
+# see bluez-utils3.inc for the explanation of these option
+EXTRA_OECONF = " \
+                 --enable-bccmd \
+		 --enable-hid2hci \
+                 --enable-alsa \ 
+		 --disable-cups \
+		 --enable-glib \
+		 --enable-gstreamer \
+		 --disable-sdpd \
+	         --enable-network \
+	         --enable-serial \
+	         --enable-input \
+	         --enable-audio \
+	         --enable-echo \
+                 --enable-configfile \
+	         --enable-initscripts \
+		 --enable-test \
+		" 
+
+PACKAGES = "${PN}"
+
+FILES_${PN} = "${libdir}/gstreamer-0.10/libgstbluetooth.so"
============================================================
--- packages/gcc/files/gfortran.patch	b050220a6851cf1b7525b48eba3fc64209d7c89c
+++ packages/gcc/files/gfortran.patch	b050220a6851cf1b7525b48eba3fc64209d7c89c
@@ -0,0 +1,40 @@
+The patch below fixes a crash building libgfortran on arm-linux-gnueabi.
+
+This target doesn't really have a 128-bit integer type, however it does use 
+TImode to represent the return value of certain special ABI defined library 
+functions. This results in type_for_size(TImode) being called.
+
+Because TImode deosn't correspond to any gfortran integer kind 
+gfc_type_for_size returns NULL and we segfault shortly after.
+
+The patch below fixes this by making gfc_type_for_size handle TImode in the 
+same way as the C frontend.
+
+Tested on x86_64-linux and arm-linux-gnueabi.
+Applied to trunk.
+
+Paul
+
+2007-05-15  Paul Brook  <paul at codesourcery.com>
+
+	gcc/fortran/
+	* trans-types.c (gfc_type_for_size): Handle signed TImode.
+
+Index: gcc-4.2.1/gcc/fortran/trans-types.c
+===================================================================
+--- gcc-4.2.1/gcc/fortran/trans-types.c	(revision 170435)
++++ gcc-4.2.1/gcc/fortran/trans-types.c	(working copy)
+@@ -1800,6 +1800,13 @@ gfc_type_for_size (unsigned bits, int un
+ 	  if (type && bits == TYPE_PRECISION (type))
+ 	    return type;
+ 	}
++
++      /* Handle TImode as a special case because it is used by some backends
++         (eg. ARM) even though it is not available for normal use.  */
++#if HOST_BITS_PER_WIDE_INT >= 64
++      if (bits == TYPE_PRECISION (intTI_type_node))
++	return intTI_type_node;
++#endif
+     }
+   else
+     {
============================================================
--- packages/abiword/abiword-plugins_2.4.6.bb	90e4ee7a0e8fbba87ea3c2b68d511dcfd6b93959
+++ packages/abiword/abiword-plugins_2.4.6.bb	f9e45ae632c16a6e48d5f86d69622b506fc10de1
@@ -5,6 +5,8 @@ RDEPENDS = "abiword"
 DEPENDS = "libwpd librsvg goffice poppler"
 RDEPENDS = "abiword"
 
+PR = "r1"
+
 SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz \
            file://abiword-plugin-pdf-poppler.patch;patch=1;pnum=2"
 S = "${WORKDIR}/abiword-${PV}/abiword-plugins"
============================================================
--- packages/abiword/abiword-plugins_2.5.1.bb	ac69b252517894d1f05efb9c4443e854c958b28d
+++ packages/abiword/abiword-plugins_2.5.1.bb	62e4936aba824f0155caa54f5911ce2750c5a7ae
@@ -5,6 +5,8 @@ RDEPENDS = "abiword"
 DEPENDS = "libwpd librsvg goffice poppler libglade"
 RDEPENDS = "abiword"
 
+PR = "r1"
+
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-plugins-${PV}.tar.gz \
============================================================
--- packages/abiword/abiword-plugins_2.5.2.bb	380a4ea0f3f1f3606d2a65ae330bb4bc025f1452
+++ packages/abiword/abiword-plugins_2.5.2.bb	39b5723ec0757262378d7f9ea18236861fbbface
@@ -5,8 +5,10 @@ RDEPENDS = "abiword"
 DEPENDS = "boost loudmouth libwpd librsvg goffice poppler libglade"
 RDEPENDS = "abiword"
 
-DEFAULT_PREFERENCE = "-1"
+PR = "r1"
 
+DEFAULT_PREFERENCE = "1"
+
 SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-plugins-${PV}.tar.gz \
            http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz \
 	   "
============================================================
--- packages/bluez/bluez-utils3.inc	4cf020b7c86ff55af20fb6a730f55fb32a810135
+++ packages/bluez/bluez-utils3.inc	57a5ef74c55de81a92629f96194e3390e75484af
@@ -76,6 +76,7 @@ do_install_append() {
 	rmdir ${D}${bindir} ${D}${sbindir}
 	chmod u+s ${D}${base_sbindir}/hciattach ${D}${base_sbindir}/hciconfig
 	install -m 0644 ${WORKDIR}/hcid.conf ${D}${sysconfdir}/bluetooth/
+        install -m 0644 ${S}/rfcomm/rfcomm.conf ${D}${sysconfdir}/bluetooth/
         install -m 0755 ${S}/daemon/.libs/passkey-agent ${D}${base_bindir}/
 }
 
@@ -86,15 +87,7 @@ PACKAGES =+ "${PN}-compat"
 
 PACKAGES =+ "${PN}-compat"
 
-CONFFILES_${PN} = " \
-                   ${sysconfdir}/bluetooth/hcid.conf \
-                   ${sysconfdir}/default/bluetooth \
-                  "
 
-CONFFILES_${PN}-compat = " \
-                          ${sysconfdir}/bluetooth/rfcomm.conf \
-			 " 
-
 FILES_${PN} = " \
                ${base_sbindir}/hcid \
                ${libdir}/bluetooth \
============================================================
--- packages/bluez/bluez-utils_3.18.bb	6eab1b4ae54ca017408988788320c718efedc784
+++ packages/bluez/bluez-utils_3.18.bb	585b498ec4a54ca79531aca3aabb3569a3dd6476
@@ -18,6 +18,12 @@ EXTRA_OECONF = " \
 		 --enable-test \
 		" 
 
+CONFFILES_${PN} = " \
+                   ${sysconfdir}/bluetooth/hcid.conf \
+                   ${sysconfdir}/default/bluetooth \
+                  "
 
+CONFFILES_${PN}-compat = " \
+                          ${sysconfdir}/bluetooth/rfcomm.conf \
+                         "
+
-CONFFILES_${PN} = "${sysconfdir}/bluetooth/hcid.conf ${sysconfdir}/bluetooth/rfcomm.conf \
-	${sysconfdir}/default/bluetooth"
============================================================
--- packages/bluez/bluez-utils_3.19.bb	6eab1b4ae54ca017408988788320c718efedc784
+++ packages/bluez/bluez-utils_3.19.bb	585b498ec4a54ca79531aca3aabb3569a3dd6476
@@ -18,6 +18,12 @@ EXTRA_OECONF = " \
 		 --enable-test \
 		" 
 
+CONFFILES_${PN} = " \
+                   ${sysconfdir}/bluetooth/hcid.conf \
+                   ${sysconfdir}/default/bluetooth \
+                  "
 
+CONFFILES_${PN}-compat = " \
+                          ${sysconfdir}/bluetooth/rfcomm.conf \
+                         "
+
-CONFFILES_${PN} = "${sysconfdir}/bluetooth/hcid.conf ${sysconfdir}/bluetooth/rfcomm.conf \
-	${sysconfdir}/default/bluetooth"
============================================================
--- packages/efl1/epdf_cvs.bb	e413e42ab3491388c723c09e3d825d3bbe55542c
+++ packages/efl1/epdf_cvs.bb	9250d539c8f86f2eda976014a30908c6b3905ba0
@@ -1,8 +1,10 @@ PV = "0.1.0+cvs${SRCDATE}"
 DESCRIPTION = "Epdf is the glue between EFL and libpoppler"
 LICENSE = "BSD"
 DEPENDS = "poppler0.6 evas ecore etk ewl"
 PV = "0.1.0+cvs${SRCDATE}"
 
+PR = "r1"
+
 inherit efl_library
 
 SRC_URI = "${E_CVS};module=e17/proto/${SRCNAME} \
============================================================
--- packages/epdfview/epdfview_0.1.2.bb	1b1ef51171b82fb1e5bd831a40da163149bec148
+++ packages/epdfview/epdfview_0.1.2.bb	f6ca145eba9dac8455260344c3842ac26ca8745f
@@ -1,9 +1,9 @@ DEPENDS = "poppler gtk+"
 DESCRIPTION = "A minimal PDF viewer based on gtk and poppler"
 HOMEPAGE = "http://www.emma-soft.com/projects/epdfview/"
 LICENSE = "GPLv2"
 SECTION = "x11/applications"
 DEPENDS = "poppler gtk+"
-PR="r2"
+PR="r3"
 
 SRC_URI = "http://www.emma-soft.com/projects/epdfview/chrome/site/releases/epdfview-${PV}.tar.bz2"
 
============================================================
--- packages/epdfview/epdfview_0.1.3.bb	ecf0961f5f94592fbb9a41d8e6ded36fb8797bd7
+++ packages/epdfview/epdfview_0.1.3.bb	1b1ef51171b82fb1e5bd831a40da163149bec148
@@ -1,9 +1,9 @@ DEPENDS = "poppler gtk+"
 DESCRIPTION = "A minimal PDF viewer based on gtk and poppler"
 HOMEPAGE = "http://www.emma-soft.com/projects/epdfview/"
 LICENSE = "GPLv2"
 SECTION = "x11/applications"
 DEPENDS = "poppler gtk+"
-PR="r1"
+PR="r2"
 
 SRC_URI = "http://www.emma-soft.com/projects/epdfview/chrome/site/releases/epdfview-${PV}.tar.bz2"
 
============================================================
--- packages/epdfview/epdfview_0.1.4.bb	ecf0961f5f94592fbb9a41d8e6ded36fb8797bd7
+++ packages/epdfview/epdfview_0.1.4.bb	1b1ef51171b82fb1e5bd831a40da163149bec148
@@ -1,9 +1,9 @@ DEPENDS = "poppler gtk+"
 DESCRIPTION = "A minimal PDF viewer based on gtk and poppler"
 HOMEPAGE = "http://www.emma-soft.com/projects/epdfview/"
 LICENSE = "GPLv2"
 SECTION = "x11/applications"
 DEPENDS = "poppler gtk+"
-PR="r1"
+PR="r2"
 
 SRC_URI = "http://www.emma-soft.com/projects/epdfview/chrome/site/releases/epdfview-${PV}.tar.bz2"
 
============================================================
--- packages/epdfview/epdfview_0.1.5.bb	33e235bc0c7482a9d081fca2c1028cddc5ca153e
+++ packages/epdfview/epdfview_0.1.5.bb	d69520dd4a8189f45fe661be6cbdd872fc0243a2
@@ -1,9 +1,9 @@ DEPENDS = "poppler gtk+ cups"
 DESCRIPTION = "A minimal PDF viewer based on gtk and poppler"
 HOMEPAGE = "http://www.emma-soft.com/projects/epdfview/"
 LICENSE = "GPLv2"
 SECTION = "x11/applications"
 DEPENDS = "poppler gtk+ cups"
-PR="r1"
+PR="r2"
 
 SRC_URI = "http://www.emma-soft.com/projects/epdfview/chrome/site/releases/epdfview-${PV}.tar.bz2"
 
============================================================
--- packages/epdfview/epdfview_0.1.6.bb	33e235bc0c7482a9d081fca2c1028cddc5ca153e
+++ packages/epdfview/epdfview_0.1.6.bb	d69520dd4a8189f45fe661be6cbdd872fc0243a2
@@ -1,9 +1,9 @@ DEPENDS = "poppler gtk+ cups"
 DESCRIPTION = "A minimal PDF viewer based on gtk and poppler"
 HOMEPAGE = "http://www.emma-soft.com/projects/epdfview/"
 LICENSE = "GPLv2"
 SECTION = "x11/applications"
 DEPENDS = "poppler gtk+ cups"
-PR="r1"
+PR="r2"
 
 SRC_URI = "http://www.emma-soft.com/projects/epdfview/chrome/site/releases/epdfview-${PV}.tar.bz2"
 
============================================================
--- packages/evince/evince_0.5.2.bb	7fb39851f831c9982ca26a8059b42278304f4d36
+++ packages/evince/evince_0.5.2.bb	3b7703f23805d9492ed4ad8c4426374d3141ce20
@@ -1,10 +1,10 @@ RRECOMMENDS = "gnome-vfs-plugin-file"
 DESCRIPTION = "Evince is a document viewer for document formats like pdf, ps, djvu."
 LICENSE = "GPL"
 SECTION = "x11/office"
 DEPENDS = "tiff espgs poppler gtk+ libgnomeui libgnomeprint libgnomeprintui"
 RDEPENDS = "espgs gconf"
 RRECOMMENDS = "gnome-vfs-plugin-file"
-PR = "r1"
+PR = "r2"
 
 inherit gnome pkgconfig
 
============================================================
--- packages/evince/evince_0.6.1.bb	e357ae7b8e959629904c07b7c566814ceac340df
+++ packages/evince/evince_0.6.1.bb	42f1db9c040b862b8d4ce1842e2e4e5e37ba3f2a
@@ -1,10 +1,10 @@ RRECOMMENDS = "gnome-vfs-plugin-file"
 DESCRIPTION = "Evince is a document viewer for document formats like pdf, ps, djvu."
 LICENSE = "GPL"
 SECTION = "x11/office"
 DEPENDS = "tiff libxt espgs poppler gtk+ libgnomeui libgnomeprint libgnomeprintui"
 RDEPENDS = "espgs gconf"
 RRECOMMENDS = "gnome-vfs-plugin-file"
-PR = "r0"
+PR = "r1"
 
 inherit gnome pkgconfig
 
============================================================
--- packages/evince/evince_0.9.0.bb	c874b55da09d3037d303e145d2cc1507fa7402e6
+++ packages/evince/evince_0.9.0.bb	14e01d8692044f2b81b78f301288bbcc971d0769
@@ -1,10 +1,10 @@ RRECOMMENDS = "gnome-vfs-plugin-file"
 DESCRIPTION = "Evince is a document viewer for document formats like pdf, ps, djvu."
 LICENSE = "GPL"
 SECTION = "x11/office"
 DEPENDS = "tiff libxt espgs gnome-doc-utils poppler libxml2 gtk+ gnome-vfs gconf libglade gnome-keyring "
 RDEPENDS = "espgs "
 RRECOMMENDS = "gnome-vfs-plugin-file"
-PR = "r1"
+PR = "r2"
 
 inherit gnome pkgconfig gtk-icon-cache
 
============================================================
--- packages/evince/evince_0.9.2.bb	89ebf8b7f1349cc3376ba3c7c781805d0338ba57
+++ packages/evince/evince_0.9.2.bb	b0705645e100b270c463bd4654e40a4d2135b33c
@@ -1,10 +1,10 @@ RRECOMMENDS = "gnome-vfs-plugin-file"
 DESCRIPTION = "Evince is a document viewer for document formats like pdf, ps, djvu."
 LICENSE = "GPL"
 SECTION = "x11/office"
 DEPENDS = "tiff djvulibre libxt espgs gnome-doc-utils poppler libxml2 gtk+ gnome-vfs gconf libglade gnome-keyring "
 RDEPENDS = "espgs "
 RRECOMMENDS = "gnome-vfs-plugin-file"
-PR = "r1"
+PR = "r2"
 
 inherit gnome pkgconfig gtk-icon-cache
 
============================================================
--- packages/gcc/gcc-cross_4.1.2.bb	e32d37ba80f15300c2db6d0edcc1ede5e4b98c2a
+++ packages/gcc/gcc-cross_4.1.2.bb	36019aa250fcf94fb16c8f3adab162249c9d8053
@@ -5,7 +5,7 @@ FILESDIR = "${@os.path.dirname(bb.data.g
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 # NOTE: split PR.  If the main .oe changes something that affects its *build*
 # remember to increment this one too.
%s
>>> DIFF TRUNCATED @ 16K






More information about the Openembedded-commits mailing list