E17 release and fixes for new libpng, gdb-pixbuf, world

index ad29726..1eb0eab 100644
@@ -2,7 +2,7 @@ HOMEPAGE = "http://www.enlightenment.org"
 SRCNAME ?= "${BPN}"
 SRCVER ?= "${PV}"
 
-EFL_SRCREV ?= "81287"
+EFL_SRCREV ?= "81627"
 
 ARM_INSTRUCTION_SET = "arm"
 

similarity index 50%
rename from meta-efl/recipes-efl/efl/ecore_1.7.3.bb
rename to meta-efl/recipes-efl/efl/ecore_1.7.4.bb
index d65309c..bc59b2b 100644
@@ -7,5 +7,5 @@ SRC_URI = "\
   file://fix-ecore-fb-initialization.patch \
 "
 
-SRC_URI[md5sum] = "355ae8ec2793c89dc93ced936d853b89"
-SRC_URI[sha256sum] = "0e2facbc89dbf5182b5bf5628bcdb37fa837e7b5978ce3f4bf9839cfe06a8830"
+SRC_URI[md5sum] = "3b1aa01bffb10d4266545fe4a823bb47"
+SRC_URI[sha256sum] = "2fc1d202c688466b0f33e21c3b892c7610ae5f89835475a1ebdb22c72c0d9116"

similarity index 41%
rename from meta-efl/recipes-efl/efl/eeze_1.7.3.bb
rename to meta-efl/recipes-efl/efl/edbus_1.7.4.bb
index c80fc5f..6ba64be 100644
@@ -6,5 +6,5 @@ SRC_URI = "\
   ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
 "
 
-SRC_URI[md5sum] = "4ccc70135b1221a532206fb53c84e434"
-SRC_URI[sha256sum] = "22a47e477609dda00e8360f05648367c320289a7132cc2f012e830632da92c6b"
+SRC_URI[md5sum] = "eaae06263de72944c0e818205c555b8b"
+SRC_URI[sha256sum] = "17a63299957f80c2f9d13945dab2b28933f3eda7a7a2c0fff17dcc6cc5dc83a4"

similarity index 41%
rename from meta-efl/recipes-efl/efl/edbus_1.7.3.bb
rename to meta-efl/recipes-efl/efl/edje_1.7.4.bb
index d7c87aa..a6ec0be 100644
@@ -6,5 +6,5 @@ SRC_URI = "\
   ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
 "
 
-SRC_URI[md5sum] = "c1eaa663812a04dcd5bdf3ea952f19d6"
-SRC_URI[sha256sum] = "f893304271b1b233933cb66ed03810d02bc47794f8c23119f656304632d6b7c9"
+SRC_URI[md5sum] = "fcd3749e41041854503b578e690cc672"
+SRC_URI[sha256sum] = "7b81f512bd7cabfbe787d2bfd2d6c622c9ce151684ee57017c1bb1616f5d0e51"

similarity index 41%
rename from meta-efl/recipes-efl/efl/edje_1.7.3.bb
rename to meta-efl/recipes-efl/efl/eet_1.7.4.bb
index 6232e72..2872af7 100644
@@ -6,5 +6,5 @@ SRC_URI = "\
   ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
 "
 
-SRC_URI[md5sum] = "b1901b4d98d1646b45ff27dfd9ff8b7c"
-SRC_URI[sha256sum] = "752c60f843b649d3bdfa51e78c13696ac1cd46374a8dbfe96c07cc7aba5381fb"
+SRC_URI[md5sum] = "e7d68ed52d1eafa0998e74fab9c22e97"
+SRC_URI[sha256sum] = "60f0cdc627806256e81c685080b97a10f348a53f9198360ff1c67ca0547ed806"

similarity index 41%
rename from meta-efl/recipes-efl/efl/eet_1.7.3.bb
rename to meta-efl/recipes-efl/efl/eeze_1.7.4.bb
index 1b1c96e..aea04cb 100644
@@ -6,5 +6,5 @@ SRC_URI = "\
   ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
 "
 
-SRC_URI[md5sum] = "6befcd8b1c12a44ff2c2c91bbbbe001b"
-SRC_URI[sha256sum] = "24c4f2fa8a186aa5e1a810beb58e03c806e26652f58aded6b1148c4cf44e98b3"
+SRC_URI[md5sum] = "3728318ac1a90980a608e4a1780d5d98"
+SRC_URI[sha256sum] = "a70d2a3404c08a85a733111a90fae2fa7a3411478907963ade7f0f10216bb51c"

deleted file mode 100644
index f5ed47b..0000000
@@ -1,10 +0,0 @@
-require ${BPN}.inc
-
-PR = "${INC_PR}.0"
-
-SRC_URI = "\
-  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
-"
-
-SRC_URI[md5sum] = "64a279b4568a769f657b9c9820a0bf74"
-SRC_URI[sha256sum] = "bc337d6c2cf80358d25e885c3c3dd3098cbedf1b5e4ef8d2acab41b4870648df"

new file mode 100644
index 0000000..ee6b736
@@ -0,0 +1,10 @@
+require ${BPN}.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI = "\
+  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
+"
+
+SRC_URI[md5sum] = "439cb27888cc1e6bf6ec5bd23512df7e"
+SRC_URI[sha256sum] = "30c757294d662ef618227fb7fb02a0f73a781f0d31bcb393970b6c7a931729e0"

deleted file mode 100644
index 71319dd..0000000
@@ -1,10 +0,0 @@
-require ${BPN}.inc
-
-PR = "${INC_PR}.0"
-
-SRC_URI = "\
-  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
-"
-
-SRC_URI[md5sum] = "00669561a82bad4df4a6268f1957ae40"
-SRC_URI[sha256sum] = "94e312367a8d04a7d69627e5a3bb1eb4bd8de9d165c0288400527808ef43f956"

new file mode 100644
index 0000000..f4fb76b
@@ -0,0 +1,10 @@
+require ${BPN}.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI = "\
+  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
+"
+
+SRC_URI[md5sum] = "e5f60ff5a227abd6121c6749000aa0f7"
+SRC_URI[sha256sum] = "baff603d614da0b52d505544f18c670e7dfd700e0c1df5ea56284ba3d737c7ee"

deleted file mode 100644
index e90df9c..0000000
@@ -1,10 +0,0 @@
-require ${BPN}.inc
-
-PR = "${INC_PR}.0"
-
-SRC_URI = "\
-  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
-"
-
-SRC_URI[md5sum] = "968f7672eb6ee96e4bdd2bbfe55e5e8a"
-SRC_URI[sha256sum] = "f63c02f04edc6c53e29b41488ca3749a8cae5bed76803d60ad80be4ca117c635"

new file mode 100644
index 0000000..4e36a32
@@ -0,0 +1,10 @@
+require ${BPN}.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI = "\
+  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
+"
+
+SRC_URI[md5sum] = "f2e4b4e4c04e83bc9533ef7938b51218"
+SRC_URI[sha256sum] = "5d1233d8bf2ab9d955ab0682b8fa1c15fe5905a543820c3255a16d1c49ec33c1"

deleted file mode 100644
index d066cb8..0000000
@@ -1,10 +0,0 @@
-require ${BPN}.inc
-
-PR = "${INC_PR}.0"
-
-SRC_URI = "\
-  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
-"
-
-SRC_URI[md5sum] = "2075fbbe8523027a3659ad08bfcf5a02"
-SRC_URI[sha256sum] = "043375ba63fa8619e053e9014566fc72f22522ef48daedcdfc62dfc1f3eb0a22"

new file mode 100644
index 0000000..b81f743
@@ -0,0 +1,10 @@
+require ${BPN}.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI = "\
+  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
+"
+
+SRC_URI[md5sum] = "cf2ca073656ebac36c26df4fa4debdee"
+SRC_URI[sha256sum] = "92ffb1a12883cd7d599e428a28501e4ce411db9839c698bb4095c9a1a470dccb"

deleted file mode 100644
index 91bec48..0000000
@@ -1,10 +0,0 @@
-require ${BPN}.inc
-
-PR = "${INC_PR}.0"
-
-SRC_URI = "\
-  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
-"
-
-SRC_URI[md5sum] = "eacc4e3a3534965469136a2e7cdd076b"
-SRC_URI[sha256sum] = "3a7388225ce97432e4324f5c2da4d4aaa3e711b8a6e92021b4edd47fbed5099a"

new file mode 100644
index 0000000..818ce54
@@ -0,0 +1,10 @@
+require ${BPN}.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI = "\
+  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
+"
+
+SRC_URI[md5sum] = "f4e3350587108bfe9719b496689dccc9"
+SRC_URI[sha256sum] = "300fe9750a2affebc6b3f94356dbc719d01a34054b2c7fc81a49f3e38a7ca975"

deleted file mode 100644
index 63578f5..0000000
@@ -1,10 +0,0 @@
-require ${BPN}.inc
-
-PR = "${INC_PR}.0"
-
-SRC_URI = "\
-  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
-"
-
-SRC_URI[md5sum] = "aa1f96d4166edc154e773210e8ac8d21"
-SRC_URI[sha256sum] = "93f5f00127176701b946d0db941d5209c5ca13659e184a31c0883ac1e145ce5d"

new file mode 100644
index 0000000..9e52fa4
@@ -0,0 +1,10 @@
+require ${BPN}.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI = "\
+  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
+"
+
+SRC_URI[md5sum] = "402e1da5f5281607585c860012200b49"
+SRC_URI[sha256sum] = "5af9e0111ff519aa63adba48c91150ae4d6eb5697ec5fd8ad20016a7ed44f1ea"

deleted file mode 100644
index 2a5e275..0000000
@@ -1,10 +0,0 @@
-require ${BPN}.inc
-
-PR = "${INC_PR}.0"
-
-SRC_URI = "\
-  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
-"
-
-SRC_URI[md5sum] = "7394c4776a980490aea0bea5e35f05a4"
-SRC_URI[sha256sum] = "25090565d995029a4fb57ac82ded1470b1beb8c23eeadaf713a30ca0cf58bb29"

new file mode 100644
index 0000000..8917e27
@@ -0,0 +1,10 @@
+require ${BPN}.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI = "\
+  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
+"
+
+SRC_URI[md5sum] = "ca3b3d7263756ab3456e559e36f190a0"
+SRC_URI[sha256sum] = "b3f19f79a3dbcfce25f939eaf4f65b9ab734d32e6af6a008293aee50a16ba53d"

deleted file mode 100644
index 3f2e63d..0000000
@@ -1,10 +0,0 @@
-require ${BPN}.inc
-
-PR = "${INC_PR}.0"
-
-SRC_URI = "\
-  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
-"
-
-SRC_URI[md5sum] = "e188843ccf4cdcf31f9645fdd28c9567"
-SRC_URI[sha256sum] = "98bf7896535ca9d454bbc5b84b59c619a4b0ac80fadd067a102d20f1a9ea5db0"

new file mode 100644
index 0000000..7a96210
@@ -0,0 +1,10 @@
+require ${BPN}.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI = "\
+  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
+"
+
+SRC_URI[md5sum] = "2edde882521b30a4cc3ce092a1ef86d0"
+SRC_URI[sha256sum] = "900404a946f7169efe3c21e9960225dd2277e14ac0e75e597160861bd41b632e"

deleted file mode 100644
index 8dc4d32..0000000
@@ -1,10 +0,0 @@
-require ${BPN}.inc
-
-PR = "${INC_PR}.0"
-
-SRC_URI = "\
-  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
-"
-
-SRC_URI[md5sum] = "2a5bab8f87569d770b4a95fc0a382be4"
-SRC_URI[sha256sum] = "d47cb26a384e6d523aa18df4fd558d0415165322ba714b83d99799e8531c617b"

new file mode 100644
index 0000000..56faeb3
@@ -0,0 +1,10 @@
+require ${BPN}.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI = "\
+  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
+"
+
+SRC_URI[md5sum] = "33a70651fd3d73c3d928b9c5362d5aac"
+SRC_URI[sha256sum] = "a3e19a0bbad3cfafc314c46baa0b5250382809bc04e458bd0c02b5ce68a29da6"

deleted file mode 100644
index f109a80..0000000
@@ -1,10 +0,0 @@
-require ${BPN}.inc
-
-PR = "${INC_PR}.0"
-
-SRC_URI = "\
-  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
-"
-
-SRC_URI[md5sum] = "e13456be6c8c6276baeefa2b91d14e7b"
-SRC_URI[sha256sum] = "4b9ec22d25d5847998cd9a60ba2edd47e5e217183e661e60b8440252c62f916f"

new file mode 100644
index 0000000..7b2e071
@@ -0,0 +1,10 @@
+require ${BPN}.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI = "\
+  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
+"
+
+SRC_URI[md5sum] = "bf8d20bc35b28ff5696781eac4685681"
+SRC_URI[sha256sum] = "3fdb6d56ac5de4ea40ad00f0d3a2b8dc3018be29f9ddb148ec3cd1ed5006e50a"

index ade5b80..05dac91 100644
@@ -1,4 +1,4 @@
-EFL_PREFERRED_VERSION ?= "1.7.1+svn%"
+EFL_PREFERRED_VERSION ?= "1.7.4+svn%"
 EFL_PREFERRED_PYTHON_VERSION ?= "1.7.0+svn%"
 
 PREFERRED_VERSION_ecore ?= "${EFL_PREFERRED_VERSION}"

index 2059626..945cfad 100644
@@ -1,7 +1,7 @@
 require ${BPN}.inc
 
 SRCREV = "${EFL_SRCREV}"
-PV = "1.7.1+svnr${SRCPV}"
+PV = "1.7.4+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
 

index 78730be..95d8e02 100644
@@ -1,7 +1,7 @@
 require ${BPN}.inc
 
 SRCREV = "${EFL_SRCREV}"
-PV = "1.7.1+svnr${SRCPV}"
+PV = "1.7.4+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
 

index 78730be..95d8e02 100644
@@ -1,7 +1,7 @@
 require ${BPN}.inc
 
 SRCREV = "${EFL_SRCREV}"
-PV = "1.7.1+svnr${SRCPV}"
+PV = "1.7.4+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
 

index 78730be..95d8e02 100644
@@ -1,7 +1,7 @@
 require ${BPN}.inc
 
 SRCREV = "${EFL_SRCREV}"
-PV = "1.7.1+svnr${SRCPV}"
+PV = "1.7.4+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
 

index 78730be..95d8e02 100644
@@ -1,7 +1,7 @@
 require ${BPN}.inc
 
 SRCREV = "${EFL_SRCREV}"
-PV = "1.7.1+svnr${SRCPV}"
+PV = "1.7.4+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
 

index 78730be..95d8e02 100644
@@ -1,7 +1,7 @@
 require ${BPN}.inc
 
 SRCREV = "${EFL_SRCREV}"
-PV = "1.7.1+svnr${SRCPV}"
+PV = "1.7.4+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
 

index 78730be..95d8e02 100644
@@ -1,7 +1,7 @@
 require ${BPN}.inc
 
 SRCREV = "${EFL_SRCREV}"
-PV = "1.7.1+svnr${SRCPV}"
+PV = "1.7.4+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
 

index 78730be..95d8e02 100644
@@ -1,7 +1,7 @@
 require ${BPN}.inc
 
 SRCREV = "${EFL_SRCREV}"
-PV = "1.7.1+svnr${SRCPV}"
+PV = "1.7.4+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
 

index 78730be..95d8e02 100644
@@ -1,7 +1,7 @@
 require ${BPN}.inc
 
 SRCREV = "${EFL_SRCREV}"
-PV = "1.7.1+svnr${SRCPV}"
+PV = "1.7.4+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
 

index 78730be..95d8e02 100644
@@ -1,7 +1,7 @@
 require ${BPN}.inc
 
 SRCREV = "${EFL_SRCREV}"
-PV = "1.7.1+svnr${SRCPV}"
+PV = "1.7.4+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
 

index 78730be..95d8e02 100644
@@ -1,7 +1,7 @@
 require ${BPN}.inc
 
 SRCREV = "${EFL_SRCREV}"
-PV = "1.7.1+svnr${SRCPV}"
+PV = "1.7.4+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
 

index 78730be..95d8e02 100644
@@ -1,7 +1,7 @@
 require ${BPN}.inc
 
 SRCREV = "${EFL_SRCREV}"
-PV = "1.7.1+svnr${SRCPV}"
+PV = "1.7.4+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
 

index 78730be..95d8e02 100644
@@ -1,7 +1,7 @@
 require ${BPN}.inc
 
 SRCREV = "${EFL_SRCREV}"
-PV = "1.7.1+svnr${SRCPV}"
+PV = "1.7.4+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
 

index 78730be..95d8e02 100644
@@ -1,7 +1,7 @@
 require ${BPN}.inc
 
 SRCREV = "${EFL_SRCREV}"
-PV = "1.7.1+svnr${SRCPV}"
+PV = "1.7.4+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
 

index 78730be..95d8e02 100644
@@ -1,7 +1,7 @@
 require ${BPN}.inc
 
 SRCREV = "${EFL_SRCREV}"
-PV = "1.7.1+svnr${SRCPV}"
+PV = "1.7.4+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
 

index 05dac91..23a8eae 100644
@@ -1,6 +1,8 @@
 EFL_PREFERRED_VERSION ?= "1.7.4+svn%"
 EFL_PREFERRED_PYTHON_VERSION ?= "1.7.0+svn%"
 
+PREFERRED_VERSION_e-wm ?= "0.17.0+svnr%"
+
 PREFERRED_VERSION_ecore ?= "${EFL_PREFERRED_VERSION}"
 PREFERRED_VERSION_ecore-native ?= "${EFL_PREFERRED_VERSION}"
 PREFERRED_VERSION_edbus ?= "${EFL_PREFERRED_VERSION}"

205 lines not on this page · raw message

new file mode 100644
index 0000000..f12072c
@@ -0,0 +1,16 @@
+require ${BPN}.inc
+
+PR = "${INC_PR}.0"
+
+SRCNAME = "enlightenment"
+
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+SRC_URI = "\
+  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
+  file://enlightenment_start.oe \
+  file://applications.menu \
+"
+
+SRC_URI[md5sum] = "b2824849c2c56d80fdc11c1f2171d4ec"
+SRC_URI[sha256sum] = "469a493c6f7fb2599912edb5ec17181554187c2845bb5290878f1eba9e04b258"

219 lines not on this page · raw message

index 58ef853..15e7002 100644
@@ -2,10 +2,13 @@ require ${BPN}.inc
 
 SRCREV = "${EFL_SRCREV}"
 PV = "1.7.99+svnr${SRCPV}"
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "\
   ${E_SVN}/trunk;module=${SRCNAME};protocol=http;scmdata=keep \
 "
 S = "${WORKDIR}/${SRCNAME}"
+
+PACKAGES =+ "${PN}-utils"
+FILES_${PN}-utils = "${bindir}/edbus-codegen"

index fbf4424..f398d49 100644
@@ -3,12 +3,13 @@ HOMEPAGE = "http://code.google.com/p/libass/"
 SECTION = "libs/multimedia"
 
 LICENSE = "ISC"
+LIC_FILES_CHKSUM = "file://COPYING;md5=8ae98663bac55afe5d989919d296f28a"
 
 DEPENDS = "enca fontconfig freetype libpng"
 
 INC_PR = "r1"
 
-SRC_URI = "http://${PN}.googlecode.com/files/${P}.tar.bz2"
+SRC_URI = "http://${PN}.googlecode.com/files/${P}.tar.gz"
 
 inherit autotools pkgconfig
 

new file mode 100644
index 0000000..0b32276
@@ -0,0 +1,5 @@
+require ${PN}.inc
+PR = "${INC_PR}.0"
+
+SRC_URI[md5sum] = "6cace482a013a3c4bf3b31a68ac66026"
+SRC_URI[sha256sum] = "629a7e81fff92dea8d0399b818a41fd1b61e381c67a5961b1eaec2efadb14c6c"

deleted file mode 100644
index 62c7cf8..0000000
@@ -1,7 +0,0 @@
-require ${PN}.inc
-PR = "${INC_PR}.0"
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
-
-SRC_URI[md5sum] = "f9042884397002ba40aa89dc7d34f59f"
-SRC_URI[sha256sum] = "ffd0a7ccf635c4795edb8f61015b47ff84ec9c5babf502dd2cc8223d4489745c"

index b7a7b75..e2a7e97 100644
@@ -109,7 +109,7 @@ do_compile_prepend() {
 		${STAGING_DIR_TARGET}/${libdir}/libjpeg.so.* \
 		${STAGING_DIR_TARGET}/${libdir}/liblzma.so.* \
 		${STAGING_DIR_TARGET}/${libdir}/libpixman-1.so.* \
-		${STAGING_DIR_TARGET}/${libdir}/libpng12.so.* \
+		${STAGING_DIR_TARGET}/${libdir}/libpng1*.so.* \
 		${STAGING_DIR_TARGET}/${libdir}/librsvg-2.so.* \
 		${STAGING_DIR_TARGET}/${libdir}/libstdc++.so.* \
 		${STAGING_DIR_TARGET}/${libdir}/libtiff.so.* \

index 5ad5644..cb0368e 100644
@@ -1,6 +1,6 @@
 require emacs.inc
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "${GNU_MIRROR}/emacs/emacs-${PV}.tar.gz;name=tarball \
            file://use-qemu.patch \

new file mode 100644
index 0000000..0fc93c5
@@ -0,0 +1,102 @@
+Imported from gentoo
+
+$NetBSD: patch-plugins_bmp_xp_ie__impGraphic__BMP.cpp,v 1.1 2011/02/01 10:48:15 wiz Exp $
+
+Fix build with png-1.5.
+
+--- a/plugins/bmp/xp/ie_impGraphic_BMP.cpp.orig	2009-06-25 04:02:06.000000000 +0000
++++ b/plugins/bmp/xp/ie_impGraphic_BMP.cpp
+@@ -191,7 +191,10 @@ UT_Error IE_ImpGraphic_BMP::_convertGrap
+ 
+ 	/* Clean Up Memory Used */
+ 		
+-	FREEP(m_pPNGInfo->palette);
++	png_colorp palette;
++	int num_palette;
++	png_get_PLTE( m_pPNG, m_pPNGInfo, &palette, &num_palette );
++	FREEP(palette);
+ 	DELETEP(pBB);
+ 	png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
+    
+@@ -313,7 +316,7 @@ UT_Error IE_ImpGraphic_BMP::Initialize_P
+ 	 * the normal method of doing things with libpng).  REQUIRED unless you
+ 	 * set up your own error handlers in the png_create_read_struct() earlier.
+ 	 */
+-	if (setjmp(m_pPNG->jmpbuf))
++	if (setjmp(png_jmpbuf(m_pPNG)))
+ 	{
+ 		/* Free all of the memory associated with the png_ptr and info_ptr */
+ 		png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
+@@ -332,7 +335,7 @@ UT_Error IE_ImpGraphic_BMP::Initialize_P
+ 	UT_Error IE_ImpGraphic_BMP::Convert_BMP_Pallet(UT_ByteBuf* pBB)
+ 	{
+ 		/* Reset error handling for libpng */
+-		if (setjmp(m_pPNG->jmpbuf))
++		if (setjmp(png_jmpbuf(m_pPNG)))
+ 		{
+ 			png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
+ 			return UT_ERROR;
+@@ -372,7 +375,7 @@ UT_Error IE_ImpGraphic_BMP::Initialize_P
+ UT_Error IE_ImpGraphic_BMP::Convert_BMP(UT_ByteBuf* pBB)
+ {
+ 	/* Reset error handling for libpng */
+-	if (setjmp(m_pPNG->jmpbuf))
++	if (setjmp(png_jmpbuf(m_pPNG)))
+ 	{
+ 		png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
+ 		return UT_ERROR;
+
+$NetBSD: patch-plugins_garble_xp_abiword-garble-png.cpp,v 1.1 2011/02/01 10:48:15 wiz Exp $
+
+Fix build with png-1.5.
+
+--- a/plugins/garble/xp/abiword-garble-png.cpp.orig	2009-09-05 15:34:44.000000000 +0000
++++ b/plugins/garble/xp/abiword-garble-png.cpp
+@@ -79,7 +79,7 @@ bool abiword_document::garble_png( void*
+ 		png_set_strip_alpha( png_ptr );
+ 		png_set_interlace_handling( png_ptr );
+ 		png_set_bgr( png_ptr );
+-		rowbytes = info_ptr->rowbytes;
++		rowbytes = png_get_rowbytes( png_ptr, info_ptr );
+ 		png_destroy_read_struct( &png_ptr, &info_ptr, NULL );
+ 	}
+ 
+$NetBSD: patch-af,v 1.12 2011/01/15 15:07:11 wiz Exp $
+
+Fix build with png-1.5.
+
+--- a/src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp.orig	2009-07-01 04:02:04.000000000 +0000
++++ b/src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp
+@@ -185,7 +185,7 @@ UT_Error IE_ImpGraphic_GdkPixbuf::import
+ /** needed for the stejmp context */
+ UT_Error IE_ImpGraphic_GdkPixbuf::_png_write(GdkPixbuf * pixbuf)
+ {
+-	if (setjmp(m_pPNG->jmpbuf))
++	if (setjmp(png_jmpbuf(m_pPNG)))
+ 	{
+ 		DELETEP(m_pPngBB);
+ 		png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
+@@ -446,7 +446,7 @@ UT_Error IE_ImpGraphic_GdkPixbuf::Initia
+ 	 * the normal method of doing things with libpng).  REQUIRED unless you
+ 	 * set up your own error handlers in the png_create_read_struct() earlier.
+ 	 */
+-	if (setjmp(m_pPNG->jmpbuf))
++	if (setjmp(png_jmpbuf(m_pPNG)))
+ 	{
+ 		/* Free all of the memory associated with the png_ptr and info_ptr */
+ 		png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
+$NetBSD: patch-ae,v 1.21 2011/01/15 15:07:11 wiz Exp $
+
+Fix build with png-1.5.
+
+--- a/src/af/util/xp/ut_png.cpp.orig	2008-02-24 03:33:07.000000000 +0000
++++ b/src/af/util/xp/ut_png.cpp
+@@ -71,7 +71,7 @@ bool UT_PNG_getDimensions(const UT_ByteB
+ 	 * the normal method of doing things with libpng).  REQUIRED unless you
+ 	 * set up your own error handlers in the png_create_read_struct() earlier.
+ 	 */
+-	if (setjmp(png_ptr->jmpbuf))
++	if (setjmp(png_jmpbuf(png_ptr)))
+ 	{
+ 		/* Free all of the memory associated with the png_ptr and info_ptr */
+ 		png_destroy_read_struct(&png_ptr, &info_ptr, static_cast<png_infopp>(NULL));

index c4bf344..a2cd1cc 100644
@@ -13,7 +13,9 @@ SRC_URI = "http://www.abisource.com/downloads/${BPN}/${PV}/source/${BP}.tar.gz \
            file://autogen-common.sh \
            file://nodolt.patch \
            file://fix.no.undefined.param.patch \
-           file://abiword.fix.glib-2.32.patch"
+           file://abiword.fix.glib-2.32.patch \
+           file://libpng15.patch \
+"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=ecd3ac329fca77e2d0e412bec38e1c20"
 

@@ -23,7 +25,7 @@ SRC_URI[sha256sum] = "d99089a63a6cfc1a6a4a026be9278028d47d224088d24b1853acb67e95
 #want 2.x from 2.x.y for the installation directory
 SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}"
 
-PR = "r7"
+PR = "r8"
 
 inherit autotools pkgconfig
 

new file mode 100644
index 0000000..b2eb8d6
@@ -0,0 +1,61 @@
+Imported from gentoo
+http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/x11-libs/fltk/files/fltk-1.1.10-libpng15.patch
+
+--- a/src/Fl_PNG_Image.cxx
++++ b/src/Fl_PNG_Image.cxx
+@@ -66,7 +66,8 @@ Fl_PNG_Image::Fl_PNG_Image(const char *png) // I - File to read
+   png_structp	pp;			// PNG read pointer
+   png_infop	info;			// PNG info pointers
+   png_bytep	*rows;			// PNG row pointers
+-
++  png_byte     color_type;             // PNG color type
++  png_byte     bit_depth;              // PNG bit depth
+ 
+   // Open the PNG file...
+   if ((fp = fopen(png, "rb")) == NULL) return;
+@@ -75,7 +76,7 @@ Fl_PNG_Image::Fl_PNG_Image(const char *png) // I - File to read
+   pp   = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
+   info = png_create_info_struct(pp);
+ 
+-  if (setjmp(pp->jmpbuf))
++  if (setjmp(png_jmpbuf(pp)))
+   {
+     Fl::warning("PNG file \"%s\" contains errors!\n", png);
+     return;
+@@ -86,28 +87,24 @@ Fl_PNG_Image::Fl_PNG_Image(const char *png) // I - File to read
+ 
+   // Get the image dimensions and convert to grayscale or RGB...
+   png_read_info(pp, info);
++  color_type = png_get_color_type(pp, info);
+ 
+-  if (info->color_type == PNG_COLOR_TYPE_PALETTE)
++  if (color_type == PNG_COLOR_TYPE_PALETTE)
+     png_set_expand(pp);
+ 
+-  if (info->color_type & PNG_COLOR_MASK_COLOR)
+-    channels = 3;
+-  else
+-    channels = 1;
+-
+-  if ((info->color_type & PNG_COLOR_MASK_ALPHA) || info->num_trans)
+-    channels ++;
++  channels = png_get_channels(pp, info);
+ 
+-  w((int)(info->width));
+-  h((int)(info->height));
++  w((int)(png_get_image_width(pp, info)));
++  h((int)(png_get_image_height(pp, info)));
+   d(channels);
+ 
+-  if (info->bit_depth < 8)
++  bit_depth = png_get_bit_depth(pp, info);
++  if (bit_depth < 8)
+   {
+     png_set_packing(pp);
+     png_set_expand(pp);
+   }
+-  else if (info->bit_depth == 16)
++  else if (bit_depth == 16)
+     png_set_strip_16(pp);
+ 
+ #  if defined(HAVE_PNG_GET_VALID) && defined(HAVE_PNG_SET_TRNS_TO_ALPHA)

index ad8768d..bf218ee 100644
@@ -6,9 +6,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1c0b73db66884b6a925e727400315130"
 
 DEPENDS = "alsa-lib zlib jpeg libpng libxext libxft"
 
+PR = "r1"
+
 SRC_URI = "ftp://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/fltk/${PV}/fltk-${PV}-source.tar.bz2 \
            file://disable_test.patch \
            file://dso-fix.patch \
+           file://libpng15.patch \
           "
 
 S = "${WORKDIR}/fltk-${PV}"

deleted file mode 100644
index a1e35c0..0000000
@@ -1,106 +0,0 @@
-diff -ru links-0.96/cookies.c links-0.96+cookies-save/cookies.c
---- links-0.96/cookies.c	Mon Sep  3 07:19:37 2001
-+++ links-0.96+cookies-save/cookies.c	Mon Sep  3 07:18:42 2001
-@@ -276,15 +276,99 @@
- 
- void init_cookies(void)
- {
--	/* !!! FIXME: read cookies */
-+	unsigned char in_buffer[MAX_STR_LEN];
-+	unsigned char *cookfile, *p, *q;
-+	FILE *fp;
-+
-+	/* must be called after init_home */
-+	if (! links_home) return;
-+	
-+	cookfile = stracpy(links_home);
-+	if (! cookfile) return;
-+	add_to_strn(&cookfile, "cookies");
-+
-+	fp = fopen(cookfile, "r");
-+	mem_free(cookfile);
-+	if (fp == NULL) return;
-+	
-+	while (fgets(in_buffer, MAX_STR_LEN, fp)) {
-+		struct cookie *cookie;
-+		
-+		if (!(cookie = mem_alloc(sizeof(struct cookie)))) return;
-+		memset(cookie, 0, sizeof(struct cookie));
-+		
-+		q = in_buffer; p = strchr(in_buffer, ' ');
-+		if (p == NULL) goto inv;
-+		*p++ = '\0';
-+		cookie->name = stracpy(q);
-+		
-+		q = p; p = strchr(p, ' ');
-+		if (p == NULL) goto inv;
-+		*p++ = '\0';
-+		cookie->value = stracpy(q);
-+		
-+		q = p; p = strchr(p, ' ');
-+		if (p == NULL) goto inv;
-+		*p++ = '\0';
-+		cookie->server = stracpy(q);
-+		
-+		q = p; p = strchr(p, ' ');
-+		if (p == NULL) goto inv;
-+		*p++ = '\0';
-+		cookie->path = stracpy(q);
-+		
-+		q = p; p = strchr(p, ' ');
-+		if (p == NULL) goto inv;
-+		*p++ = '\0';
-+		cookie->domain = stracpy(q);
-+		
-+		q = p; p = strchr(p, ' ');
-+		if (p == NULL) goto inv;
-+		*p++ = '\0';
-+		cookie->expires = atoi(q);
-+		
-+		cookie->secure = atoi(p);
-+		
-+		cookie->id = cookie_id++;
-+
-+		accept_cookie(cookie);
-+
-+		continue;
-+
-+inv:
-+		free_cookie(cookie);
-+		free(cookie);
-+	}
-+	fclose(fp);
- }
- 
- void cleanup_cookies(void)
- {
- 	struct cookie *c;
-+	unsigned char *cookfile;
-+	FILE *fp;
-+	
- 	free_list(c_domains);
--	/* !!! FIXME: save cookies */
--	foreach (c, cookies) free_cookie(c);
-+
-+	cookfile = stracpy(links_home);
-+	if (! cookfile) return;
-+	add_to_strn(&cookfile, "cookies");
-+
-+	fp = fopen(cookfile, "w");
-+	mem_free(cookfile);
-+	if (fp == NULL) return;
-+	
-+	foreach (c, cookies) {
-+		if (c->expires && ! cookie_expired(c))
-+			fprintf(fp, "%s %s %s %s %s %d %d\n", c->name, c->value,
-+			    c->server?c->server:(unsigned char *)"", c->path?c->path:(unsigned char *)"",
-+			    c->domain?c->domain:(unsigned char *)"", c->expires, c->secure);
-+
-+		free_cookie(c);
-+	}
-+
-+	fclose(fp);
-+	
- 	free_list(cookies);
- }
- 

deleted file mode 100644
index 0d3b407..0000000
@@ -1,20 +0,0 @@
---- links-2.1pre17/cookies.c.pix	2005-05-15 23:05:10.000000000 +0800
-+++ links-2.1pre17/cookies.c	2005-05-15 23:17:21.000000000 +0800
-@@ -41,7 +41,7 @@
- 
- void free_cookie(struct cookie *c)
- {
--	mem_free(c->name);
-+	if (c->value) mem_free(c->name);
- 	if (c->value) mem_free(c->value);
- 	if (c->server) mem_free(c->server);
- 	if (c->path) mem_free(c->path);
-@@ -355,7 +355,7 @@
- 
- inv:
- 		free_cookie(cookie);
--		free(cookie);
-+		mem_free(cookie);
- 	}
- 	fclose(fp);
- }

similarity index 84%
rename from meta-oe/recipes-support/links/links-x11_2.0+2.1pre30.bb
rename to meta-oe/recipes-support/links/links-x11_2.7.bb
index b71da9f..601742f 100644
@@ -6,6 +6,8 @@ RCONFLICTS_${PN} = "links"
 SRC_URI += " file://links2.desktop \
              http://www.xora.org.uk/oe/links2.png;name=icon"
 
+S = "${WORKDIR}/links-${PV}"
+
 EXTRA_OECONF = "--enable-javascript --with-libfl --enable-graphics \
                 --with-ssl=${STAGING_LIBDIR}/.. --with-libjpeg \
                 --without-libtiff --without-svgalib --without-fb \

@@ -19,8 +21,7 @@ do_install_append() {
     install -m 0644 ${WORKDIR}/links2.png ${D}/${datadir}/pixmaps
 }
 
-
-SRC_URI[md5sum] = "f0f107cc824b71e43f0c6ab620209daf"
-SRC_URI[sha256sum] = "f32314d851e86ec463967ddce78d051e3953b529878cbaeecf882c625ad29c75"
+SRC_URI[md5sum] = "d06aa6e14b2172d73188871a5357185a"
+SRC_URI[sha256sum] = "0c182b1cbcdfd5cdcd2f75a6032d1a4b660d07c1225c1e07757cec81d3302130"
 SRC_URI[icon.md5sum] = "477e8787927c634614bac01b44355a33"
 SRC_URI[icon.sha256sum] = "eddcd8b8c8698aa621d1a453943892d77b72ed492e0d14e0dbac5c6a57e52f47"

index abd10f2..e77e2c4 100644
@@ -3,17 +3,11 @@ browser, similar to Lynx."
 HOMEPAGE = "http://links.twibright.com/"
 SECTION = "console/network"
 LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=b0c80473f97008e42e29a9f80fcc55ff"
+LIC_FILES_CHKSUM = "file://COPYING;md5=65e735be2e05d5943803344148f57603"
 DEPENDS = "jpeg libpng flex openssl zlib"
 
-LPV = "${@d.getVar("PV",1).split("+")[1]}"
-
-SRC_URI = "http://links.twibright.com/download/links-${LPV}.tar.bz2 \
+SRC_URI = "http://links.twibright.com/download/links-${PV}.tar.bz2 \
            file://ac-prog-cxx.patch \
-           file://cookies-save-0.96.patch \
-           file://links-2.1pre17-fix-segfault-on-loading-cookies.patch"
+"
 
 inherit autotools
-
-S = "${WORKDIR}/links-${LPV}"
-

similarity index 73%
rename from meta-oe/recipes-support/links/links_2.0+2.1pre30.bb
rename to meta-oe/recipes-support/links/links_2.7.bb
index 2496173..24c1985 100644
@@ -9,5 +9,5 @@ EXTRA_OECONF = "--enable-javascript --with-libfl --enable-graphics \
                 --without-directfb --without-pmshell --without-atheos \
                 --without-x --without-sdl"
 
-SRC_URI[md5sum] = "f0f107cc824b71e43f0c6ab620209daf"
-SRC_URI[sha256sum] = "f32314d851e86ec463967ddce78d051e3953b529878cbaeecf882c625ad29c75"
+SRC_URI[md5sum] = "d06aa6e14b2172d73188871a5357185a"
+SRC_URI[sha256sum] = "0c182b1cbcdfd5cdcd2f75a6032d1a4b660d07c1225c1e07757cec81d3302130"

index e953663..ec3bde0 100644
@@ -1,3 +1,6 @@
+Upstream-Status: Submitted
+https://code.google.com/p/omgps/issues/detail?id=15
+
 diff -uNr omgps.orig/src/dbus_intf.c omgps/src/dbus_intf.c
 --- omgps.orig/src/dbus_intf.c	2011-12-12 12:22:47.000000000 +0100
 +++ omgps/src/dbus_intf.c	2012-11-14 14:44:45.435381443 +0100

index 56ec3a4..3ed86d8 100644
@@ -1,3 +1,6 @@
+Upstream-Status: Submitted
+https://code.google.com/p/omgps/issues/detail?id=15
+
 we need to include config.h first to know if HAVE_SYS_CAPABILITY_H is enabled or no, otherwise
 sys/capability.h is not included and later used
 | src/network.c: In function 'can_ping':

index 3eae960..41f6471 100644
@@ -1,3 +1,6 @@
+Upstream-Status: Submitted
+https://code.google.com/p/omgps/issues/detail?id=15
+
 diff -uNr omgps.orig/src/include/map_repo.h omgps/src/include/map_repo.h
 --- omgps.orig/src/include/map_repo.h	2009-07-20 19:54:08.000000000 +0200
 +++ omgps/src/include/map_repo.h	2010-01-17 14:55:24.000000000 +0100

new file mode 100644
index 0000000..6880805
@@ -0,0 +1,15 @@
+Upstream-Status: Submitted
+https://code.google.com/p/omgps/issues/detail?id=15
+
+diff -uNr omgps/src/tab_scratch.c omgps.new/src/tab_scratch.c
+--- omgps/src/tab_scratch.c	2012-12-22 18:13:25.994788128 +0100
++++ omgps.new/src/tab_scratch.c	2012-12-22 18:12:45.876790644 +0100
+@@ -51,7 +51,7 @@
+ 	}
+ 
+ 	gboolean ret = gdk_pixbuf_save (pixbuf, buf, SCREENSHOT_FILE_TYPE, &err, "tEXt::Software", "omgps", NULL);
+-	gdk_pixbuf_unref(pixbuf);
++	g_object_unref(pixbuf);
+ 
+ 	if (ret) {
+ 		char buf1[128];

index d18a2fd..290c5e6 100644
@@ -1,3 +1,6 @@
+Upstream-Status: Submitted
+https://code.google.com/p/omgps/issues/detail?id=15
+
 diff -uNr omgps.orig//src/uart.c omgps/src/uart.c
 --- omgps.orig//src/uart.c	2010-08-22 23:34:09.000000000 +0200
 +++ omgps/src/uart.c	2010-08-22 23:33:54.000000000 +0200

index 73d6dba..3ccb14e 100644
@@ -1,3 +1,6 @@
+Upstream-Status: Submitted
+https://code.google.com/p/omgps/issues/detail?id=15
+
 --- a/src/settings.c	2011-12-12 13:21:30.573400795 +0100
 +++ b/src/settings.c	2011-12-12 14:11:05.269606119 +0100
 @@ -278,6 +278,9 @@

index 0d788b6..7c787a4 100644
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
 DEPENDS = "gtk+ python-pygobject dbus-glib"
 SRCREV = "109"
 PV = "0.1+svnr${SRCPV}"
-PR = "r1"
+PR = "r2"
 S = "${WORKDIR}/${PN}"
 
 do_configure_prepend() {

@@ -20,6 +20,7 @@ SRC_URI = "svn://omgps.googlecode.com/svn/trunk;module=omgps;protocol=http \
            file://fix.capability.patch \
            file://use.unused.variable.patch \
            file://fix.build.with.glib.2.34.patch \
+           file://gdk-pixbuf-2.26.5.patch \
 "
 
 inherit autotools

index 38cd2c3..a8af6ab 100644
@@ -33,6 +33,11 @@ INITSCRIPT_PARAMS = "defaults"
 # cc1: all warnings being treated as errors
 CFLAGS += "-Wno-extra -Wno-error=unused-but-set-parameter -Wno-error=unused-but-set-variable"
 
+# twiddler is WIP in 1.99.7 and probably not worth fixing (a lot of changes in gpm-2-dev after 1.99.7
+# gpm-1.99.7/src/drivers/twid/twiddler.c:503:14: error: cast to pointer from integer of different size [-Werror=int-to-pointer-cast]
+# /gpm-1.99.7/src/mice.c:221:5: error: (near initialization for 'mice[32].init') [-Werror]
+CFLAGS += "-Wno-error=int-to-pointer-cast -Wno-error"
+
 do_install () {
     oe_runmake 'ROOT=${D}' install
     install -m 0644 src/headers/gpm.h ${D}${includedir}

index 03f51c1..75aff5d 100644
@@ -5,7 +5,7 @@ Subject: [PATCH] Remove user switch applet
 
 This hasn't been updated to work with gnome-panel > 2.30.0, so just drop it
 
-Upstream-status: unacceptable, backport
+Upstream-Status: unacceptable, backport
 
 Signed-off-by: Koen Kooi <[email protected]>
 ---

index adcc533..ace1b00 100644
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix glib includes
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
-Upstream status: unknown
+Upstream-Status: unknown
 
 
 Signed-off-by: Andreas Müller <[email protected]>

index 3db44a8..95d193e 100644
@@ -5,7 +5,7 @@ Subject: [PATCH] gvfsfusedaemon.c: fix glib build
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
-Upstream-status: Applied but we can not use it because newer versions depend
+Upstream-Status: Applied but we can not use it because newer versions depend
 on gnome-disk-utiltity >= V3.02 which depends on gtk+ V3
 
 Signed-off-by: Andreas Müller <[email protected]>

index 06f10bd..83e598e 100644
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix glib includes
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
-Upstream status: unknown
+Upstream-Status: unknown
 
 Signed-off-by: Andreas Müller <[email protected]>
 ---

index 481b6fa..d2eb156 100644
@@ -1,6 +1,6 @@
 Remove CC and CFLAGS values, we set these ourselves
 
-Upstream-status: Inappropriate [config]
+Upstream-Status: Inappropriate [config]
 
 diff -urN vblade-19.old//makefile vblade-19//makefile
 --- vblade-19.old//makefile	2008-10-08 22:07:40.000000000 +0100

index dfe3ca1..97c00cd 100644
@@ -5,7 +5,7 @@ Subject: [PATCH] iw: version.sh: don't use git describe for versioning
 
 It will detect top-level git repositories like the Angstrom setup-scripts and break.
 
-Upstream-status: Unknown
+Upstream-Status: Unknown
 
 Signed-off-by: Koen Kooi <[email protected]>
 ---

index ba49bcd..4356982 100644
@@ -3,7 +3,7 @@ From: Koen Kooi <[email protected]>
 Date: Thu, 17 Nov 2011 11:17:42 +0100
 Subject: [PATCH] don't try to run /sbin/dhclient to get the version number, this break cross-compiling
 
-Upstream-status: Unknown
+Upstream-Status: Unknown
 
 Signed-off-by: Koen Kooi <[email protected]>
 ---

index 0494c4f..4581ef2 100644
@@ -24,7 +24,7 @@ So no real way to get the actual SoC name, TI AM3359, but a lot better than 'Unk
 Signed-off-by: Koen Kooi <[email protected]>
 ---
 
-Upstream-status: submitted
+Upstream-Status: submitted
 
  svg.c |    4 ++++
  1 file changed, 4 insertions(+)

index b3bda45..f63d98a 100644
@@ -7,7 +7,7 @@ Subject: [PATCH 2/2] svg: open /etc/os-release and use PRETTY_NAME for the
 Signed-off-by: Koen Kooi <[email protected]>
 ---
 
-Upstream-status: Submitted
+Upstream-Status: Submitted
 
  svg.c |   11 +++++++++++
  1 file changed, 11 insertions(+)

index 1e16b86..9b71e9d 100644
@@ -6,7 +6,7 @@ Subject: [PATCH] php: don't use broken wrapper for mkdir
 Signed-off-by: Koen Kooi <[email protected]>
 ---
 
-Upstream-status: Inappropriate
+Upstream-Status: Inappropriate
 
  Makefile.global |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)

index 3c3ec7c..0b0d471 100644
@@ -5,7 +5,7 @@ Subject: [PATCH] disable AI_ADDRCONFIG flag
 
 Signed-off-by: Koen Kooi <[email protected]>
 
-Upstream-status: unknown
+Upstream-Status: unknown
 ---
  tornado/netutil.py |    6 ------
  1 files changed, 0 insertions(+), 6 deletions(-)

index 0cbacf0..e51a89c 100644
@@ -6,7 +6,7 @@ Subject: [PATCH] usbmodeswitch: leave stripping to packager
 Signed-off-by: Koen Kooi <[email protected]>
 ---
 
-Upstream-status: Unknown
+Upstream-Status: Unknown
 
  Makefile |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)

index f9396b2..4f549fd 100644
@@ -6,7 +6,7 @@ Subject: [PATCH] usb-modeswitch: leave script munging to recipe
 Signed-off-by: Koen Kooi <[email protected]>
 ---
 
-Upstream-status: Unknown
+Upstream-Status: Unknown
 
  Makefile |   13 +------------
  1 files changed, 1 insertions(+), 12 deletions(-)

index 41bf4cc..81c5d1b 100644
@@ -1,4 +1,4 @@
-Upstream Status: Backport
+Upstream-Status: Backport
 Signed-off-by: Jack Mitchell <[email protected]>
 ---
  src/xslt.c | 19 +++++++------------

index c30f9cb..98ce875 100644
@@ -7,7 +7,7 @@ Subject: [PATCH] Fix panel plugin build.
 - Build as a module.
 - Only export needed symbols.
 ---
-Upstream-status: applied
+Upstream-Status: applied
  Makefile.am |   12 +++++++++---
  1 files changed, 9 insertions(+), 3 deletions(-)
 

index 08ea135..ccff851 100644
@@ -5,7 +5,7 @@ Subject: [PATCH] port to libxfce4ui
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
-Upstream-status: pending
+Upstream-Status: pending
 
 
 Signed-off-by: Andreas Müller <[email protected]>

index 05f7c72..fedbc12 100644
@@ -5,7 +5,7 @@ Subject: [PATCH] configure.ac.in: remove breaking BM_DEBUG_SUPPORT
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
-Upstream-status: pending
+Upstream-Status: pending
 
 
 Signed-off-by: Andreas Müller <[email protected]>

index 38949a5..dd9c6d4 100644
@@ -9,7 +9,7 @@ anything on log out without session save.
 
 Based on original work by Chris Bainbridge ([email protected]).
 ---
-Upstream-status: applied
+Upstream-Status: applied
  xfce4-session/xfsm-manager.c |   81 ++++++++++++++++++++++++-----------------
  1 files changed, 47 insertions(+), 34 deletions(-)
 

index a76fad2..f926a93 100644
@@ -5,7 +5,7 @@ Subject: [PATCH 1/2] xsettings.xml: remove trouble causing comment
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
-Upstream-status: Pending
+Upstream-Status: Pending
 
 
 Signed-off-by: Andreas Müller <[email protected]>

index af9d956..6a80136 100644
@@ -8,3 +8,5 @@ SRC_URI[qwt.md5sum] = "ace68558eab873e2da7e641179c4ef0c"
 SRC_URI[qwt.sha256sum] = "3fe19dd5962d705632fc2ef616b009299de6cf1e702538296924dbfdc8003cb2"
 
 RPROVIDES_${PN}-dev = "libqwt-dev"
+
+EXCLUDE_FROM_WORLD = "1"

similarity index 100%
rename from meta-oe/recipes-support/hddtemp/files/hddtemp-0.3-beta15-autodetect-717479.patch
rename to meta-oe/recipes-support/hddtemp/hddtemp/hddtemp-0.3-beta15-autodetect-717479.patch

similarity index 100%
rename from meta-oe/recipes-support/hddtemp/files/hddtemp-db.patch
rename to meta-oe/recipes-support/hddtemp/hddtemp/hddtemp-db.patch

similarity index 100%
rename from meta-oe/recipes-support/hddtemp/files/hddtemp-no-nls-support.patch
rename to meta-oe/recipes-support/hddtemp/hddtemp/hddtemp-no-nls-support.patch

similarity index 100%
rename from meta-oe/recipes-support/hddtemp/files/hddtemp.db
rename to meta-oe/recipes-support/hddtemp/hddtemp/hddtemp.db

similarity index 100%
rename from meta-oe/recipes-support/hddtemp/files/hddtemp_0.3-beta15-52.diff
rename to meta-oe/recipes-support/hddtemp/hddtemp/hddtemp_0.3-beta15-52.diff

similarity index 100%
rename from meta-oe/recipes-support/hddtemp/files/init
rename to meta-oe/recipes-support/hddtemp/hddtemp/init

deleted file mode 100644
index a71a9dd..0000000
@@ -1,133 +0,0 @@
-hddtemp database update
-
-Patch from Fedora 18 SRPM.
-
---- ../hddtemp.db~	2007-09-14 21:11:37.000000000 +0300
-+++ ../hddtemp.db	2008-02-09 22:10:31.000000000 +0200
-@@ -80,6 +80,8 @@
- 
- "FUJITSU MHV2100AH"		194  C	"FUJITSU MHV2100AH" 
- "FUJITSU MHV2100AT"		194  C	"FUJITSU MHV2100AT" 
-+"FUJITSU MHV2100BH"		194  C  "FUJITSU MHV2100BH" 
-+"FUJITSU MHV2060AH"		194  C  "FUJITSU MHV2060AH"
- "FUJITSU MHV2080[AB]H"		194  C	"FUJITSU MHV2080AH"
- 
- "FUJITSU MPF3204AH"		194  C	"Fujitsu MPF3204AH"
-@@ -325,11 +327,14 @@
- "ST3120026A"				194  C	"Seagate Barracuda V ST3120026A"
- "ST3160021A"				194  C	"Seagate Barracuda 7200.7 - ST3160021A"
- "ST3160023(A|AS)"			194  C	"Seagate Barracuda V ST3160023A and AS (160Gb, ATA100 or Serial ATA)"
-+"ST316081[12](A|AS)"			194  C  "Seagate Barracuda 7200.9 160GB" 
- "ST3160827AS"				194  C	"Seagate Barracuda 7200.7 160GB (Serial ATA)" 
- "ST3200021A"				194  C	"Seagate Barracuda 7200.7 Plus 200GB"
- "ST3200822(A|AS)"			194  C	"Seagate Barracuda 7200.7 Plus 200GB (PATA or SATA)"
--"ST3200826A"				194  C	"Seagate Barracuda 7200.8 200Gb"
-+"ST3200826A"				194  C	"Seagate Barracuda 7200.8 200GB"
- "ST3250623A"				194  C	"Seagate Barracuda 7200.16 250GB"
-+"ST3250624AS"				194  C  "Seagate Barracuda 7200.9 250GB SATA"
-+"ST3250624NS"				194  C  "Seagate NL35 SATA (RAID-Edition) 7200 250GB"
- "ST3250823A"				194  C	"Seagate Barracuda 7200.8 250GB"
- "ST3250823A"				194  C	"Seagate Barracuda 7200.7 Plus 250GB"
- "ST3250823NS"				194  C	"Seagate NL35 SATA (RAID-Edition) 7200 250GB"
-@@ -338,9 +343,7 @@
- "ST3400633(A|AS)"                       194  C  "Seagate Barracuda 7200.7 400 GB"
- "ST3500630NS"				194  C  "Seagate"
- "ST3400632NS"				194  C	"Seagate"
--"ST3320620AS"                           194  C  "Seagate Barracuda 7200.7 320 GB"
--"ST3500630AS"                           194  C  "Seagate Barracuda 7200.7 500 GB"
--"ST3802110A"				194  C	"Seagate Barracuda 7200.9 80 GB"
-+"ST380[28]110(A|AS)"				194  C	"Seagate Barracuda 7200.9 80 GB"
- "ST910021A"				194  C	"Seagate Momentus 7200.1 100GB" 
- "ST910082[35]A"				194  C	"Seagate Momentus 5400.2 100GB"
- "ST9120821A"				194  C	"Seagate Momentus 5400.2 120GB"
-@@ -351,12 +354,14 @@
- "ST960822A"				194  C	"Seagate Momentus 5400.2 60GB"
- "ST96812AS"				194  C	"Seagate Momentus 5400.2 60GB SATA"
- "ST9808211A"				194  C	"Seagate Momentus 5400.2 80GB"
-+"ST98823AS"				194  C  "Seagate Momentus 5400.2 80GB SATA"
- 
- ########################################
- ############# TOSHIBA Laptops
- ########################################
- "MK4313MAT"				220  C	"Toshiba MK4313MAT"
- "TOSHIBA MK1032GAX"			194  C	"Toshiba MK1032GAX"
-+"TOSHIBA MK1032GSX"			194  C  "Toshiba MK1032GSX"
- "TOSHIBA MK1517GAP"			0    C	"Toshiba MK1517GAP"
- "TOSHIBA MK2018GAS"			226  F	"Toshiba MK2018GAS"
- "TOSHIBA MK2023GAS"			194  C	"Toshiba MK2023GAS"
-@@ -377,6 +382,7 @@
- "TOSHIBA MK6026GAX"			194  C	"Toshiba MK6026GAX" 
- "TOSHIBA MK8025GAS"			194  C	"Toshiba MK8025GAS"
- "TOSHIBA MK8026GAX"			194  C	"Toshiba MK8026GAX" 
-+"TOSHIBA MK8032GSX"			194  C  "Toshiba MK8032GSX" 
- 
- "MK4025GAS"				194  C	"Toshiba MK4025GAS"
- 
-@@ -397,7 +403,7 @@
- "WDC WD300BB-00CAA0"						  0 C "Western Digital WD300BB"
- "WDC WD360GD-00FNA0"						194 C "Western Digital SATA Raptor 36.7GB"
- "WDC WD400BB-00CAA0"						  0 C "Western Digital 400BB-00CAA0"
--"WDC WD400BB-00J[KH]A0"						194 C "Western Digital Caviar WD400BB"
-+"WDC WD400BB-00[DJ][KH]A0"					194 C "Western Digital Caviar WD400BB"
- "WDC WD400BB-23JHC0"						194 C "Western Digital 23JHC0"
- #"WDC WD400BB-00GFA0"						  0 C ""
- "WDC WD400BB-55HEA0"						194 C "Western Digital Caviar WD400BB"
-@@ -416,7 +422,7 @@
- "WDC WD600VE-75HDT0"						194 C "Western Digital 600VE-75HDT0"
- "WDC WD600VE-00HDT0"						194 C "Western Digital 600VE-00HDT0"
- "WDC WD740GD-00FL21.0"						194 C "Western Digital SATA Raptor"
--"WDC WD740GD-([05]0FL[AC]0|75FLA1)"				194 C "Western Digital SATA Raptor 74GB 8MB"
-+"WDC WD740GD-([05]0FL[AC][01]|75FLA1)"				194 C "Western Digital SATA Raptor 74GB 8MB"
- "WDC WD800BB-00CAA1"						  0 C "Western Digital WD800BB-00CAA1"
- "WDC WD800BB-(00|22)DKA0"					194 C "Western Digital WD800BB 80 Go"
- "WDC WD800BB-32CCB0"						194 C "Western Digital 800BB-32CCB0"
-@@ -428,14 +434,13 @@
- "WDC WD800JB-00CRA1"						  0 C "Western Digital Caviar WD800JB"
- "WDC WD800JB-00(ET|FM|FS)A0"					194 C "Western Digital Caviar 80GB Special Edition 8MB"
- "WDC WD800JB-00JJ[AC]0"						194 C "Western Digital WD800JB"
--"WDC WD800JD-(00|55)(HK|JR)A0"					194 C "Western Digital SATA 80GB, 8MB Cache"
--"WDC WD800JD-00(HK|JN)A0"					194 C "Western Digital SATA 80GB, 8MB Cache"
-+"WDC WD800JD-(00|55|75)(HK|JR|JN)[AC]0"				194 C "Western Digital SATA 80GB, 8MB Cache"
- "WDC WD800LB-(00|55)DNA0"					194 C "Western Digital Caviar WD800LB 80 Go ATA-100"
- "WDC WD800VE-07HDT0"						194 C "Western Digital 800VE-07HDT0"
- "WDC WD1200BB-00(FTA|GUA)0"					194 C "Western Digital Caviar EIDE 2MB Cache"
--"WDC WD1200JB-00(EV|FU|GV)A0"					194 C "Western Digital Caviar 120GB Special Edition 8MB" 
-+"WDC WD1200JB-00(EV|FU|GV|RE)A0"				194 C "Western Digital Caviar 120GB Special Edition 8MB" 
- "WDC WD1200JB-22GVA0"						194 C "Western Digital Caviar 120GB"
--"WDC WD1200JD-00(GBB|HBC)0"					194 C "Western Digital WD1200JD"
-+"WDC WD1200JD-00(FYB|GBB|HBC)0"					194 C "Western Digital WD1200JD"
- "WDC WD1200LB-55EDA0"						194 C "Western Digital WD1220LB"
- "WDC WD1200SB-01KB[AC]0"					194 C "Western Digital Caviar RE (Raid Edition) 120 GB"
- "WDC WD1600BB-00DWA0"						194 C "Western Digital Caviar WD1600BB"
-@@ -443,10 +448,11 @@
- "WDC WD2000BB-00FTA0"						194 C "Western Digital WD2000BB"
- "WDC WD2000JB-(00EV|32EV|34EV|00FU|00GV|55GV|98GV|00KF)A0"	194 C "Western Digital Caviar 200GB Special Edition 8MB"
- "WDC WD2000JB-00GVC0"						194 C "Western Digital WD2000JB"
-+"WDC WD2000JD-00FYB0"						194 C "Western Digital WD2000JD"
- "WDC WD2000JS-00MHB1"						194 C "Western Digital SATA 200GB"
- "WDC WD2500JB-(00RE|00EV|00FU|32FU|00GV|55GV)A0"		194 C "Western Digital Caviar 250GB Special Edition 8MB"
- "WDC WD2500JB-00GVC0"						194 C "Western Digital 250GB"
--"WDC WD2500JD-(00G|32H)BB0"					194 C "Western Digital SATA Caviar 250GB Special Edition 8MB"
-+"WDC WD2500JD-(00G|32H|75H)BB0"					194 C "Western Digital SATA Caviar 250GB Special Edition 8MB"
- "WDC WD2500JD-40HBC0"						194 C "Western Digital WD2500JD-40HBC0" 
- "WDC WD2500PB-98FBA0"						194 C "Western Digital Caviar 250GB Special Edition 8MB"
- "WDC WD2500PD-00FZB1"						194 C "Western Digital WD2500PD-00FZB1" 
-@@ -510,7 +516,7 @@
- "Maxtor 7(L|V)300(F|R|S)0"		194 C "Maxtor MaXLine III 300GB 7200rpm"
- "MAXTOR STM3320620AS"			194 C ""
- 
--"WDC WD1500ADFD-00NLR1"                                         194 C "Western Digital Raptor 150GB"
-+"WDC WD1500ADFD-00NLR[01]"                                         194 C "Western Digital Raptor 150GB"
- "WDC WD1600JS-00NCB1"						194 C "Western Digital Caviar 1600JS 160GB Sata"
- "WDC WD1600SD-01KCC0"						194 C "Western Digital Caviar RE Serial ATA series"
- "WDC WD2500JD-57HBC0"                                           194 C "Western Digital Caviar SE (Serial ATA) 250 GB"
-@@ -518,6 +524,8 @@
- "WDC WD2500JS-41MVB1"						194 C "Western Digital SATAII Caviar 250GB Special Edition 8MB"
- "WDC WD2500JD-00HBB0"						194 C   "Western Digital SATA 250GB" 
- "WDC WD2500KS-00MJB0"						194 C "Western Digital SATA-II Caviar 250GB Special Edition 16MB"
-+"WDC WD2500YD-01NVB1"						194 C "Western Digital Caviar RE 250GB 16MB"
- "WDC WD3000JS-00PDB0"						194 C "Western Digital WD3000JS"
--"WDC WD3200KS-00PFB0"						194 C	""
-+"WDC WD3200KS-00PFB0"						194 C "Western Digital Caviar 320GB 16MB"
- "WDC WD3200JD-22KLB0"                                           194 C "Western Digital Caviar SE 320GB 8MB" 
-+"WDC WD3200SD-01KNB0"						194 C "Western Digital Caviar RE 320GB SATA 8MB"

index 4a061cf..7b0cbd9 100644
@@ -80,6 +80,8 @@
 
 "FUJITSU MHV2100AH"		194  C	"FUJITSU MHV2100AH" 
 "FUJITSU MHV2100AT"		194  C	"FUJITSU MHV2100AT" 
+"FUJITSU MHV2100BH"		194  C  "FUJITSU MHV2100BH" 
+"FUJITSU MHV2060AH"		194  C  "FUJITSU MHV2060AH"
 "FUJITSU MHV2080[AB]H"		194  C	"FUJITSU MHV2080AH"
 
 "FUJITSU MPF3204AH"		194  C	"Fujitsu MPF3204AH"

@@ -325,11 +327,14 @@
 "ST3120026A"				194  C	"Seagate Barracuda V ST3120026A"
 "ST3160021A"				194  C	"Seagate Barracuda 7200.7 - ST3160021A"
 "ST3160023(A|AS)"			194  C	"Seagate Barracuda V ST3160023A and AS (160Gb, ATA100 or Serial ATA)"
+"ST316081[12](A|AS)"			194  C  "Seagate Barracuda 7200.9 160GB" 
 "ST3160827AS"				194  C	"Seagate Barracuda 7200.7 160GB (Serial ATA)" 
 "ST3200021A"				194  C	"Seagate Barracuda 7200.7 Plus 200GB"
 "ST3200822(A|AS)"			194  C	"Seagate Barracuda 7200.7 Plus 200GB (PATA or SATA)"
-"ST3200826A"				194  C	"Seagate Barracuda 7200.8 200Gb"
+"ST3200826A"				194  C	"Seagate Barracuda 7200.8 200GB"
 "ST3250623A"				194  C	"Seagate Barracuda 7200.16 250GB"
+"ST3250624AS"				194  C  "Seagate Barracuda 7200.9 250GB SATA"
+"ST3250624NS"				194  C  "Seagate NL35 SATA (RAID-Edition) 7200 250GB"
 "ST3250823A"				194  C	"Seagate Barracuda 7200.8 250GB"
 "ST3250823A"				194  C	"Seagate Barracuda 7200.7 Plus 250GB"
 "ST3250823NS"				194  C	"Seagate NL35 SATA (RAID-Edition) 7200 250GB"

@@ -338,9 +343,7 @@
 "ST3400633(A|AS)"                       194  C  "Seagate Barracuda 7200.7 400 GB"
 "ST3500630NS"				194  C  "Seagate"
 "ST3400632NS"				194  C	"Seagate"
-"ST3320620AS"                           194  C  "Seagate Barracuda 7200.7 320 GB"
-"ST3500630AS"                           194  C  "Seagate Barracuda 7200.7 500 GB"
-"ST3802110A"				194  C	"Seagate Barracuda 7200.9 80 GB"
+"ST380[28]110(A|AS)"				194  C	"Seagate Barracuda 7200.9 80 GB"
 "ST910021A"				194  C	"Seagate Momentus 7200.1 100GB" 
 "ST910082[35]A"				194  C	"Seagate Momentus 5400.2 100GB"
 "ST9120821A"				194  C	"Seagate Momentus 5400.2 120GB"

@@ -351,12 +354,14 @@
 "ST960822A"				194  C	"Seagate Momentus 5400.2 60GB"
 "ST96812AS"				194  C	"Seagate Momentus 5400.2 60GB SATA"
 "ST9808211A"				194  C	"Seagate Momentus 5400.2 80GB"
+"ST98823AS"				194  C  "Seagate Momentus 5400.2 80GB SATA"
 
 ########################################
 ############# TOSHIBA Laptops
 ########################################
 "MK4313MAT"				220  C	"Toshiba MK4313MAT"
 "TOSHIBA MK1032GAX"			194  C	"Toshiba MK1032GAX"
+"TOSHIBA MK1032GSX"			194  C  "Toshiba MK1032GSX"
 "TOSHIBA MK1517GAP"			0    C	"Toshiba MK1517GAP"
 "TOSHIBA MK2018GAS"			226  F	"Toshiba MK2018GAS"
 "TOSHIBA MK2023GAS"			194  C	"Toshiba MK2023GAS"

@@ -377,6 +382,7 @@
 "TOSHIBA MK6026GAX"			194  C	"Toshiba MK6026GAX" 
 "TOSHIBA MK8025GAS"			194  C	"Toshiba MK8025GAS"
 "TOSHIBA MK8026GAX"			194  C	"Toshiba MK8026GAX" 
+"TOSHIBA MK8032GSX"			194  C  "Toshiba MK8032GSX" 
 
 "MK4025GAS"				194  C	"Toshiba MK4025GAS"
 

@@ -397,7 +403,7 @@
 "WDC WD300BB-00CAA0"						  0 C "Western Digital WD300BB"
 "WDC WD360GD-00FNA0"						194 C "Western Digital SATA Raptor 36.7GB"
 "WDC WD400BB-00CAA0"						  0 C "Western Digital 400BB-00CAA0"
-"WDC WD400BB-00J[KH]A0"						194 C "Western Digital Caviar WD400BB"
+"WDC WD400BB-00[DJ][KH]A0"					194 C "Western Digital Caviar WD400BB"
 "WDC WD400BB-23JHC0"						194 C "Western Digital 23JHC0"
 #"WDC WD400BB-00GFA0"						  0 C ""
 "WDC WD400BB-55HEA0"						194 C "Western Digital Caviar WD400BB"

@@ -416,7 +422,7 @@
 "WDC WD600VE-75HDT0"						194 C "Western Digital 600VE-75HDT0"
 "WDC WD600VE-00HDT0"						194 C "Western Digital 600VE-00HDT0"
 "WDC WD740GD-00FL21.0"						194 C "Western Digital SATA Raptor"
-"WDC WD740GD-([05]0FL[AC]0|75FLA1)"				194 C "Western Digital SATA Raptor 74GB 8MB"
+"WDC WD740GD-([05]0FL[AC][01]|75FLA1)"				194 C "Western Digital SATA Raptor 74GB 8MB"
 "WDC WD800BB-00CAA1"						  0 C "Western Digital WD800BB-00CAA1"
 "WDC WD800BB-(00|22)DKA0"					194 C "Western Digital WD800BB 80 Go"
 "WDC WD800BB-32CCB0"						194 C "Western Digital 800BB-32CCB0"

@@ -428,14 +434,13 @@
 "WDC WD800JB-00CRA1"						  0 C "Western Digital Caviar WD800JB"
 "WDC WD800JB-00(ET|FM|FS)A0"					194 C "Western Digital Caviar 80GB Special Edition 8MB"
 "WDC WD800JB-00JJ[AC]0"						194 C "Western Digital WD800JB"
-"WDC WD800JD-(00|55)(HK|JR)A0"					194 C "Western Digital SATA 80GB, 8MB Cache"
-"WDC WD800JD-00(HK|JN)A0"					194 C "Western Digital SATA 80GB, 8MB Cache"
+"WDC WD800JD-(00|55|75)(HK|JR|JN)[AC]0"				194 C "Western Digital SATA 80GB, 8MB Cache"
 "WDC WD800LB-(00|55)DNA0"					194 C "Western Digital Caviar WD800LB 80 Go ATA-100"
 "WDC WD800VE-07HDT0"						194 C "Western Digital 800VE-07HDT0"
 "WDC WD1200BB-00(FTA|GUA)0"					194 C "Western Digital Caviar EIDE 2MB Cache"
-"WDC WD1200JB-00(EV|FU|GV)A0"					194 C "Western Digital Caviar 120GB Special Edition 8MB" 
+"WDC WD1200JB-00(EV|FU|GV|RE)A0"				194 C "Western Digital Caviar 120GB Special Edition 8MB" 
 "WDC WD1200JB-22GVA0"						194 C "Western Digital Caviar 120GB"
-"WDC WD1200JD-00(GBB|HBC)0"					194 C "Western Digital WD1200JD"
+"WDC WD1200JD-00(FYB|GBB|HBC)0"					194 C "Western Digital WD1200JD"
 "WDC WD1200LB-55EDA0"						194 C "Western Digital WD1220LB"
 "WDC WD1200SB-01KB[AC]0"					194 C "Western Digital Caviar RE (Raid Edition) 120 GB"
 "WDC WD1600BB-00DWA0"						194 C "Western Digital Caviar WD1600BB"

@@ -443,10 +448,11 @@
 "WDC WD2000BB-00FTA0"						194 C "Western Digital WD2000BB"
 "WDC WD2000JB-(00EV|32EV|34EV|00FU|00GV|55GV|98GV|00KF)A0"	194 C "Western Digital Caviar 200GB Special Edition 8MB"
 "WDC WD2000JB-00GVC0"						194 C "Western Digital WD2000JB"
+"WDC WD2000JD-00FYB0"						194 C "Western Digital WD2000JD"
 "WDC WD2000JS-00MHB1"						194 C "Western Digital SATA 200GB"
 "WDC WD2500JB-(00RE|00EV|00FU|32FU|00GV|55GV)A0"		194 C "Western Digital Caviar 250GB Special Edition 8MB"
 "WDC WD2500JB-00GVC0"						194 C "Western Digital 250GB"
-"WDC WD2500JD-(00G|32H)BB0"					194 C "Western Digital SATA Caviar 250GB Special Edition 8MB"
+"WDC WD2500JD-(00G|32H|75H)BB0"					194 C "Western Digital SATA Caviar 250GB Special Edition 8MB"
 "WDC WD2500JD-40HBC0"						194 C "Western Digital WD2500JD-40HBC0" 
 "WDC WD2500PB-98FBA0"						194 C "Western Digital Caviar 250GB Special Edition 8MB"
 "WDC WD2500PD-00FZB1"						194 C "Western Digital WD2500PD-00FZB1" 

@@ -510,7 +516,7 @@
 "Maxtor 7(L|V)300(F|R|S)0"		194 C "Maxtor MaXLine III 300GB 7200rpm"
 "MAXTOR STM3320620AS"			194 C ""
 
-"WDC WD1500ADFD-00NLR1"                                         194 C "Western Digital Raptor 150GB"
+"WDC WD1500ADFD-00NLR[01]"                                         194 C "Western Digital Raptor 150GB"
 "WDC WD1600JS-00NCB1"						194 C "Western Digital Caviar 1600JS 160GB Sata"
 "WDC WD1600SD-01KCC0"						194 C "Western Digital Caviar RE Serial ATA series"
 "WDC WD2500JD-57HBC0"                                           194 C "Western Digital Caviar SE (Serial ATA) 250 GB"

@@ -518,6 +524,8 @@
 "WDC WD2500JS-41MVB1"						194 C "Western Digital SATAII Caviar 250GB Special Edition 8MB"
 "WDC WD2500JD-00HBB0"						194 C   "Western Digital SATA 250GB" 
 "WDC WD2500KS-00MJB0"						194 C "Western Digital SATA-II Caviar 250GB Special Edition 16MB"
+"WDC WD2500YD-01NVB1"						194 C "Western Digital Caviar RE 250GB 16MB"
 "WDC WD3000JS-00PDB0"						194 C "Western Digital WD3000JS"
-"WDC WD3200KS-00PFB0"						194 C	""
+"WDC WD3200KS-00PFB0"						194 C "Western Digital Caviar 320GB 16MB"
 "WDC WD3200JD-22KLB0"                                           194 C "Western Digital Caviar SE 320GB 8MB" 
+"WDC WD3200SD-01KNB0"						194 C "Western Digital Caviar RE 320GB SATA 8MB"

index a0bc4e6..9483b5c 100644
@@ -2,11 +2,12 @@ SUMMARY = "Hard disk temperature monitor daemon"
 SECTION = "console/network"
 LICENSE = "GPLv2+"
 
+PR = "r1"
+
 SRC_URI = "http://download.savannah.nongnu.org/releases/hddtemp/hddtemp-0.3-beta15.tar.bz2 \
            file://hddtemp-no-nls-support.patch \
            file://hddtemp_0.3-beta15-52.diff \
            file://hddtemp-0.3-beta15-autodetect-717479.patch \
-           file://hddtemp-db.patch;striplevel=0 \
            file://hddtemp.db \
            file://init \
            "

index 27584da..c237a96 100644
@@ -7,9 +7,9 @@ DEPENDS = "git-native boost libusb1 uhd-firmware orc-native"
 RDEPENDS_${PN} += "uhd-firmware"
 
 PE = "1"
-INC_PR = "r2"
+INC_PR = "r3"
 
-inherit cmake
+inherit cmake pythonnative
 
 PACKAGES =+ "${PN}-tests ${PN}-examples ${PN}-e1xx"
 

index 5dc4451..19de470 100644
@@ -6,11 +6,13 @@ LICENSE="GPLv2 & LGPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=f08a446809913fc9b3c718f0eaea0426 \
                     file://COPYING.LIB;md5=f30a9716ef3762e3467a2f62bf790f0a"
 
-PR = "r2"
+PR = "r3"
 
 DEPENDS = "libnotify3 gtk+3 libunique gvfs librsvg libexif gnome-desktop3"
 # optional: tracker
 
+# to include nautilus3/no-try-run-strftime.diff before the rest
+FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
 BPN = "nautilus"
 inherit gnome
 

index 0fb9b4e..134e2e5 100644
@@ -4,7 +4,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=9331186f4f80db7da0e724bdd6554ee5"
 
 DEPENDS = "libgcrypt curl"
 
-SRC_URI = "ftp://ftp.nluug.nl/pub/gnu/libmicrohttpd//libmicrohttpd-${PV}.tar.gz"
+# ftp://ftp.nluug.nl/pub/gnu/${PN}/ has only 0.9.* and newer now
+SRC_URI = "http://mirrors.usc.edu/pub/gnu/${PN}/${P}.tar.gz"
 SRC_URI[md5sum] = "61698da6aa04744ea076c327f66fc05a"
 SRC_URI[sha256sum] = "0cb09e26678d1531a4fd40a748abff5142bfdad3ae11cfe3bb7ad7317a99e371"
 

similarity index 60%
rename from meta-oe/recipes-devtools/libedit/libedit_20120601.bb
rename to meta-oe/recipes-devtools/libedit/libedit_20121213.bb
index 1be967d..35e619c 100644
@@ -8,9 +8,11 @@ DEPENDS = "ncurses"
 
 inherit autotools
 
+# upstream site does not allow wget's User-Agent
+FETCHCMD_wget += "-U bitbake"
 SRC_URI = "http://www.thrysoee.dk/editline/${PN}-${PV}-3.0.tar.gz"
 
 S = "${WORKDIR}/${PN}-${PV}-3.0"
 
-SRC_URI[md5sum] = "e50f6a7afb4de00c81650f7b1a0f5aea"
-SRC_URI[sha256sum] = "51f0f4b4a97b7ebab26e7b5c2564c47628cdb3042fd8ba8d0605c719d2541918"
+SRC_URI[md5sum] = "f475f50fe7467c1074c0fbae8b5bca1a"
+SRC_URI[sha256sum] = "0379e4a73c219f260e6d16adbc2e87635532ebb4c5a83a7399f231dc40108d1f"

new file mode 100644
index 0000000..c7b6165
@@ -0,0 +1,42 @@
+Imported from gentoo:
+
+http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/net-print/libgnomecups/files/libgnomecups-0.2.3-glib.h.patch
+
+From d84eee9450b3b6f6155074915efc61bedcc8d446 Mon Sep 17 00:00:00 2001
+From: Dominique Leuenberger <[email protected]>
+Date: Sun, 27 Nov 2011 21:36:41 +0100
+Subject: [PATCH] Fix: Only glib.h can be included
+
+---
+ libgnomecups/gnome-cups-i18n.c |    2 +-
+ libgnomecups/gnome-cups-init.h |    3 +--
+ 2 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/libgnomecups/gnome-cups-i18n.c b/libgnomecups/gnome-cups-i18n.c
+index 8987c5c..127756d 100644
+--- a/libgnomecups/gnome-cups-i18n.c
++++ b/libgnomecups/gnome-cups-i18n.c
+@@ -1,5 +1,5 @@
+ #include <config.h>
+-#include <glib/gmacros.h>
++#include <glib.h>
+ #include "gnome-cups-i18n.h"
+ 
+ #ifdef ENABLE_NLS
+diff --git a/libgnomecups/gnome-cups-init.h b/libgnomecups/gnome-cups-init.h
+index 22b682a..c4600fc 100644
+--- a/libgnomecups/gnome-cups-init.h
++++ b/libgnomecups/gnome-cups-init.h
+@@ -1,8 +1,7 @@
+ #ifndef GNOME_CUPS_INIT
+ #define GNOME_CUPS_INIT
+ 
+-#include <glib/gtypes.h>
+-#include <glib/gmacros.h>
++#include <glib.h>
+ 
+ G_BEGIN_DECLS
+ 
+-- 
+1.7.7
+

index c932ba0..199ee72 100644
@@ -4,6 +4,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
 DEPENDS="glib-2.0 gtk+ pango cups intltool libgnomeui"
 
+PR = "r1"
+
 inherit gnome pkgconfig
 
 do_compile_append () {

@@ -11,5 +13,7 @@ do_compile_append () {
 	sed 's:${STAGING_DIR_HOST}::' < libgnomecups-1.0.pc.old > libgnomecups-1.0.pc
 }
 
+SRC_URI += "file://libgnomecups-0.2.3-glib.h.patch"
+
 SRC_URI[archive.md5sum] = "dc4920c15c9f886f73ea74fbff0ae48b"
 SRC_URI[archive.sha256sum] = "e130e80942b386de19a288a4c194ff3dbe9140315b31e982058c8bffbb6a1d29"

new file mode 100644
index 0000000..7df01aa
@@ -0,0 +1,395 @@
+Imported from gentoo:
+https://bugs.gentoo.org/show_bug.cgi?id=428672
+
+diff -Naur hplip-3.12.6_old/prnt/cupsext/cupsext.c hplip-3.12.6/prnt/cupsext/cupsext.c
+--- hplip-3.12.6_old/prnt/cupsext/cupsext.c	2012-08-04 09:18:18.388330038 +0200
++++ hplip-3.12.6/prnt/cupsext/cupsext.c	2012-08-04 09:18:27.855181327 +0200
+@@ -87,6 +87,46 @@
+ #define PY_SSIZE_T_MIN INT_MIN
+ #endif
+ 
++#if (CUPS_VERSION_MAJOR > 1) || (CUPS_VERSION_MINOR > 5)
++#define HAVE_CUPS_1_6 1
++#endif
++
++#ifndef HAVE_CUPS_1_6
++#define ippGetCount(attr)     attr->num_values
++#define ippGetGroupTag(attr)  attr->group_tag
++#define ippGetValueTag(attr)  attr->value_tag
++#define ippGetName(attr)      attr->name
++#define ippGetBoolean(attr, element) attr->values[element].boolean
++#define ippGetInteger(attr, element) attr->values[element].integer
++#define ippGetStatusCode(ipp) ipp->request.status.status_code
++#define ippGetString(attr, element, language) attr->values[element].string.text
++
++static ipp_attribute_t * ippFirstAttribute( ipp_t *ipp )
++{
++    if (!ipp)
++        return (NULL);
++    return (ipp->current = ipp->attrs);
++}
++
++static ipp_attribute_t * ippNextAttribute( ipp_t *ipp )
++{
++    if (!ipp || !ipp->current)
++        return (NULL);
++    return (ipp->current = ipp->current->next);
++}
++
++static int ippSetOperation( ipp_t *ipp, ipp_op_t op )
++{
++    ipp->request.op.operation_id = op;
++    return (1);
++}
++
++static int ippSetRequestId( ipp_t *ipp, int request_id )
++{
++    ipp->request.any.request_id = request_id;
++    return (1);
++}
++#endif
+ 
+ int g_num_options = 0;
+ cups_option_t * g_options;
+@@ -333,8 +373,8 @@
+     request = ippNew();
+     language = cupsLangDefault();
+ 
+-    request->request.op.operation_id = CUPS_GET_PRINTERS;
+-    request->request.any.request_id = 1;
++    ippSetOperation( request, CUPS_GET_PRINTERS );
++    ippSetRequestId ( request, 1);
+ 
+     ippAddString( request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
+                   "attributes-charset", NULL, cupsLangEncoding( language ) );
+@@ -378,10 +418,10 @@
+         ipp_pstate_t state;
+         int i = 0;
+ 
+-        for ( attr = response->attrs; attr != NULL; attr = attr->next )
++        for ( attr = ippFirstAttribute( response ); attr != NULL; attr = ippNextAttribute( response ) )
+         {
+-            while ( attr != NULL && attr->group_tag != IPP_TAG_PRINTER )
+-                attr = attr->next;
++            while ( attr != NULL && ippGetGroupTag( attr ) != IPP_TAG_PRINTER )
++                attr = ippNextAttribute( response );
+ 
+             if ( attr == NULL )
+                 break;
+@@ -390,41 +430,41 @@
+             state = IPP_PRINTER_IDLE;
+             accepting = 0;
+ 
+-            while ( attr != NULL && attr->group_tag == IPP_TAG_PRINTER )
++            while ( attr != NULL && ippGetGroupTag( attr ) == IPP_TAG_PRINTER )
+             {
+-                if ( strcmp( attr->name, "printer-name" ) == 0 &&
+-                        attr->value_tag == IPP_TAG_NAME )
+-                    name = attr->values[ 0 ].string.text;
+-
+-                else if ( strcmp( attr->name, "device-uri" ) == 0 &&
+-                        attr->value_tag == IPP_TAG_URI )
+-                    device_uri = attr->values[ 0 ].string.text;
+-
+-                else if ( strcmp( attr->name, "printer-uri-supported" ) == 0 &&
+-                        attr->value_tag == IPP_TAG_URI )
+-                    printer_uri = attr->values[ 0 ].string.text;
+-
+-                else if ( strcmp( attr->name, "printer-info" ) == 0 &&
+-                        attr->value_tag == IPP_TAG_TEXT )
+-                    info = attr->values[ 0 ].string.text;
+-
+-                else if ( strcmp( attr->name, "printer-location" ) == 0 &&
+-                        attr->value_tag == IPP_TAG_TEXT )
+-                    location = attr->values[ 0 ].string.text;
+-
+-                else if ( strcmp( attr->name, "printer-make-and-model" ) == 0 &&
+-                        attr->value_tag == IPP_TAG_TEXT )
+-                    make_model = attr->values[ 0 ].string.text;
+-
+-                else if ( strcmp( attr->name, "printer-state" ) == 0 &&
+-                        attr->value_tag == IPP_TAG_ENUM )
+-                    state = ( ipp_pstate_t ) attr->values[ 0 ].integer;
+-
+-                else if (!strcmp(attr->name, "printer-is-accepting-jobs") &&
+-                        attr->value_tag == IPP_TAG_BOOLEAN)
+-                    accepting = attr->values[ 0 ].boolean;
++                if ( strcmp( ippGetName( attr ), "printer-name" ) == 0 &&
++                        ippGetValueTag( attr ) == IPP_TAG_NAME )
++                    name = ippGetString( attr, 0, NULL );
++
++                else if ( strcmp( ippGetName( attr ), "device-uri" ) == 0 &&
++                        ippGetValueTag( attr ) == IPP_TAG_URI )
++                    device_uri = ippGetString( attr, 0, NULL );
++
++                else if ( strcmp( ippGetName( attr ), "printer-uri-supported" ) == 0 &&
++                        ippGetValueTag( attr ) == IPP_TAG_URI )
++                    printer_uri = ippGetString( attr, 0, NULL );
++
++                else if ( strcmp( ippGetName( attr ), "printer-info" ) == 0 &&
++                        ippGetValueTag( attr ) == IPP_TAG_TEXT )
++                    info = ippGetString( attr, 0, NULL );
++
++                else if ( strcmp( ippGetName( attr ), "printer-location" ) == 0 &&
++                        ippGetValueTag( attr ) == IPP_TAG_TEXT )
++                    location = ippGetString( attr, 0, NULL );
++
++                else if ( strcmp( ippGetName( attr ), "printer-make-and-model" ) == 0 &&
++                        ippGetValueTag( attr ) == IPP_TAG_TEXT )
++                    make_model = ippGetString( attr, 0, NULL );
++
++                else if ( strcmp( ippGetName( attr ), "printer-state" ) == 0 &&
++                        ippGetValueTag( attr ) == IPP_TAG_ENUM )
++                    state = ( ipp_pstate_t ) ippGetInteger( attr, 0 );
++
++                else if (!strcmp(ippGetName( attr ), "printer-is-accepting-jobs") &&
++                        ippGetValueTag( attr ) == IPP_TAG_BOOLEAN)
++                    accepting = ippGetBoolean( attr, 0 );
+ 
+-                attr = attr->next;
++                attr = ippNextAttribute( response );
+             }
+ 
+             if ( device_uri == NULL )
+@@ -522,8 +562,8 @@
+     request = ippNew();
+     language = cupsLangDefault();
+ 
+-    request->request.op.operation_id = CUPS_ADD_PRINTER;
+-    request->request.any.request_id = 1;
++    ippSetOperation( request, CUPS_ADD_PRINTER );
++    ippSetRequestId ( request, 1 );
+ 
+     ippAddString( request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
+                   "attributes-charset", NULL, cupsLangEncoding( language ) );
+@@ -568,7 +608,7 @@
+     }
+     else
+     {
+-        status = response->request.status.status_code;
++        status = ippGetStatusCode( response );
+         //ippDelete( response );
+         r = 1;
+     }
+@@ -631,8 +671,8 @@
+        */
+     request = ippNew();
+ 
+-    request->request.op.operation_id = CUPS_DELETE_PRINTER;
+-    request->request.op.request_id = 1;
++    ippSetOperation( request, CUPS_DELETE_PRINTER );
++    ippSetRequestId ( request, 1 );
+ 
+     language = cupsLangDefault();
+ 
+@@ -650,7 +690,7 @@
+      */
+     response = cupsDoRequest( http, request, "/admin/" );
+ 
+-    if ( ( response != NULL ) && ( response->request.status.status_code <= IPP_OK_CONFLICT ) )
++    if ( ( response != NULL ) && ( ippGetStatusCode( response ) <= IPP_OK_CONFLICT ) )
+     {
+         r = 1;
+     }
+@@ -721,8 +761,8 @@
+ 
+     request = ippNew();
+ 
+-    request->request.op.operation_id = CUPS_SET_DEFAULT;
+-    request->request.op.request_id = 1;
++    ippSetOperation( request, CUPS_SET_DEFAULT );
++    ippSetRequestId ( request, 1 );
+ 
+     language = cupsLangDefault();
+ 
+@@ -743,7 +783,7 @@
+ 
+     response = cupsDoRequest( http, request, "/admin/" );
+ 
+-    if ( ( response != NULL ) && ( response->request.status.status_code <= IPP_OK_CONFLICT ) )
++    if ( ( response != NULL ) && ( ippGetStatusCode( response ) <= IPP_OK_CONFLICT ) )
+     {
+         r = 1;
+     }
+@@ -797,8 +837,8 @@
+ 
+     request = ippNew();
+ 
+-    request->request.op.operation_id = op;
+-    request->request.op.request_id = 1;
++    ippSetOperation( request, op );
++    ippSetRequestId ( request, 1 );
+ 
+     language = cupsLangDefault();
+ 
+@@ -822,7 +862,7 @@
+ 
+     response = cupsDoRequest(http, request, "/admin/");
+ 
+-    if (( response != NULL ) && (response->request.status.status_code <= IPP_OK_CONFLICT))
++    if (( response != NULL ) && (ippGetStatusCode( response ) <= IPP_OK_CONFLICT))
+     {
+         r = 1;
+     }
+@@ -837,7 +877,7 @@
+     if ( response != NULL )
+         ippDelete( response );
+ 
+-    return Py_BuildValue( "i", r );;
++    return Py_BuildValue( "i", r );
+ }
+ 
+ 
+@@ -1116,8 +1156,8 @@
+ 
+     request = ippNew();
+ 
+-    request->request.op.operation_id = CUPS_GET_PPDS;
+-    request->request.op.request_id   = 1;
++    ippSetOperation( request, CUPS_GET_PPDS );
++    ippSetRequestId ( request, 1 );
+ 
+     language = cupsLangDefault();
+ 
+@@ -1143,43 +1183,43 @@
+     if ((response = cupsDoRequest(http, request, "/")) != NULL)
+     {
+ 
+-        for (attr = response->attrs; attr; attr = attr->next)
++        for (attr = ippFirstAttribute( response ); attr; attr = ippNextAttribute( response ))
+         {
+             PyObject *dict;
+             char *ppdname = NULL;
+ 
+-            while (attr && attr->group_tag != IPP_TAG_PRINTER)
+-                attr = attr->next;
++            while (attr && ippGetGroupTag( attr ) != IPP_TAG_PRINTER)
++                attr = ippNextAttribute( response );
+ 
+             if (!attr)
+                 break;
+ 
+             dict = PyDict_New ();
+ 
+-            for (; attr && attr->group_tag == IPP_TAG_PRINTER; attr = attr->next)
++            for (; attr && ippGetGroupTag( attr ) == IPP_TAG_PRINTER; attr = ippNextAttribute( response ))
+             {
+                 PyObject *val = NULL;
+ 
+-                if (!strcmp (attr->name, "ppd-name") && attr->value_tag == IPP_TAG_NAME)
++                if (!strcmp (ippGetName( attr ), "ppd-name") && ippGetValueTag( attr ) == IPP_TAG_NAME)
+                 {
+-                    ppdname = attr->values[0].string.text;
++                    ppdname = ippGetString( attr, 0, NULL );
+ 
+                     //sprintf( buf, "print '%s'", ppdname);
+                     //PyRun_SimpleString( buf );
+                 }
+ 
+-                else if (attr->value_tag == IPP_TAG_TEXT || attr->value_tag == IPP_TAG_NAME || attr->value_tag == IPP_TAG_KEYWORD)
+-                //else if ((!strcmp (attr->name, "ppd-natural-language") && attr->value_tag == IPP_TAG_LANGUAGE) ||
+-                //    (!strcmp (attr->name, "ppd-make-and-model") && attr->value_tag == IPP_TAG_TEXT) ||
+-                //    (!strcmp (attr->name, "ppd-make") && attr->value_tag == IPP_TAG_TEXT) ||
+-                //    (!strcmp (attr->name, "ppd-device-id") && attr->value_tag == IPP_TAG_TEXT))
++                else if (ippGetValueTag( attr ) == IPP_TAG_TEXT || ippGetValueTag( attr ) == IPP_TAG_NAME || ippGetValueTag( attr ) == IPP_TAG_KEYWORD)
++                //else if ((!strcmp (ippGetName( attr ), "ppd-natural-language") && ippGetValueTag( attr ) == IPP_TAG_LANGUAGE) ||
++                //    (!strcmp (ippGetName( attr ), "ppd-make-and-model") && ippGetValueTag( attr ) == IPP_TAG_TEXT) ||
++                //    (!strcmp (ippGetName( attr ), "ppd-make") && ippGetValueTag( attr ) == IPP_TAG_TEXT) ||
++                //    (!strcmp (ippGetName( attr ), "ppd-device-id") && ippGetValueTag( attr ) == IPP_TAG_TEXT))
+                 {
+-                    val = PyObj_from_UTF8(attr->values[0].string.text);
++                    val = PyObj_from_UTF8(ippGetString( attr, 0, NULL ));
+                 }
+ 
+                 if (val)
+                 {
+-                    PyDict_SetItemString (dict, attr->name, val);
++                    PyDict_SetItemString (dict, ippGetName( attr ), val);
+                     Py_DECREF (val);
+                 }
+             }
+diff -Naur hplip-3.12.6_old/scan/sane/hpaio.c hplip-3.12.6/scan/sane/hpaio.c
+--- hplip-3.12.6_old/scan/sane/hpaio.c	2012-08-04 09:18:21.458389913 +0200
++++ hplip-3.12.6/scan/sane/hpaio.c	2012-08-04 09:18:27.875181720 +0200
+@@ -47,6 +47,43 @@
+ #define DEBUG_DECLARE_ONLY
+ #include "sanei_debug.h"
+ 
++#if (CUPS_VERSION_MAJOR > 1) || (CUPS_VERSION_MINOR > 5)
++#define HAVE_CUPS_1_6 1
++#endif
++
++#ifndef HAVE_CUPS_1_6
++#define ippGetGroupTag(attr)  attr->group_tag
++#define ippGetValueTag(attr)  attr->value_tag
++#define ippGetName(attr)      attr->name
++#define ippGetString(attr, element, language) attr->values[element].string.text
++
++static ipp_attribute_t * ippFirstAttribute( ipp_t *ipp )
++{
++    if (!ipp)
++        return (NULL);
++    return (ipp->current = ipp->attrs);
++}
++
++static ipp_attribute_t * ippNextAttribute( ipp_t *ipp )
++{
++    if (!ipp || !ipp->current)
++        return (NULL);
++    return (ipp->current = ipp->current->next);
++}
++
++static int ippSetOperation( ipp_t *ipp, ipp_op_t op )
++{
++    ipp->request.op.operation_id = op;
++    return (1);
++}
++
++static int ippSetRequestId( ipp_t *ipp, int request_id )
++{
++    ipp->request.any.request_id = request_id;
++    return (1);
++}
++#endif
++
+ static SANE_Device **DeviceList = NULL;
+ 
+ static int AddDeviceList(char *uri, char *model, SANE_Device ***pd)
+@@ -186,8 +223,8 @@
+    /* Assemble the IPP request */
+    request = ippNew();
+ 
+-   request->request.op.operation_id = CUPS_GET_PRINTERS;
+-   request->request.any.request_id  = 1;
++   ippSetOperation( request, CUPS_GET_PRINTERS );
++   ippSetRequestId( request, 1 );
+ 
+    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET, "attributes-charset", NULL, "utf-8");
+    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE, "attributes-natural-language", NULL, "en");
+@@ -197,20 +234,20 @@
+    if ((response = cupsDoRequest(http, request, "/")) == NULL)
+       goto bugout;
+ 
+-   for (attr = response->attrs; attr != NULL; attr = attr->next)
++   for (attr = ippFirstAttribute ( response ); attr != NULL; attr = ippNextAttribute( response ))
+    {
+       /* Skip leading attributes until we hit a printer. */
+-      while (attr != NULL && attr->group_tag != IPP_TAG_PRINTER)
+-         attr = attr->next;
++      while (attr != NULL && ippGetGroupTag( attr ) != IPP_TAG_PRINTER)
++         attr = ippNextAttribute( response );
+ 
+       if (attr == NULL)
+          break;
+ 
+-      while (attr != NULL && attr->group_tag == IPP_TAG_PRINTER)
++      while (attr != NULL && ippGetGroupTag( attr ) == IPP_TAG_PRINTER)
+       {
+-         if (strcmp(attr->name, "device-uri") == 0 && attr->value_tag == IPP_TAG_URI && AddCupsList(attr->values[0].string.text, printer) == 0)
++         if (strcmp(ippGetName( attr ), "device-uri") == 0 && ippGetValueTag( attr ) == IPP_TAG_URI && AddCupsList(ippGetString( attr, 0, NULL ), printer) == 0)
+             cnt++;
+-         attr = attr->next;
++         attr = ippNextAttribute( response );
+       }
+ 
+       if (attr == NULL)

index 2826a76..b9c270d 100644
@@ -2,9 +2,12 @@ DESCRIPTION = "HP Linux Imaging and Printing"
 LICENSE="GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=442bb3cbbeeb60643a87325718b8a8ee"
 
+PR = "r1"
+
 SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.gz \
            file://setup-add-sleep-after-cups-reset.patch \
            file://fix-libusb-paths.patch \
+           file://cups-1.6.patch \
 	  "
 
 DEPENDS += "cups python libusb"

index 1ee6d6d..48373bc 100644
@@ -3,10 +3,11 @@ require gvfs.inc
 DEPENDS = "libsoup-2.4 gnome-keyring glib-2.0 fuse avahi fuse gconf libgphoto2"
 # optional: obexftp libcdio libimobiledevice 
 
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
 # in case of gnome-disk-utility was alresdy built: avoid double files
-EXTRA_OECONF += "--disable-gdu"
+# afc is enabled when it detects libimobiledevice
+EXTRA_OECONF += "--disable-gdu --disable-afc"
 
 PACKAGES =+ "gvfsd-ftp gvfsd-sftp gvfsd-trash"
 

deleted file mode 100644
index 8d3a416..0000000
@@ -1,76 +0,0 @@
-Upstream-Status: Pending
-
-Description: Fix g++ error "taking address of temporary array"
-Author: Gilles Filippini <[email protected]>
-Forwarded: no
-Bug-Debian: http://bugs.debian.org/676006
-Last-Update: 2012-06-05
-Index: navit/navit/graphics/qt_qpainter/RenderArea.cpp
-===================================================================
---- navit.orig/navit/graphics/qt_qpainter/RenderArea.cpp	2012-06-05 23:16:42.000000000 +0200
-+++ navit/navit/graphics/qt_qpainter/RenderArea.cpp	2012-06-05 23:15:47.000000000 +0200
-@@ -239,13 +239,14 @@
- #else
- 	const char *text=str.toUtf8().constData();
- #endif
-+	char text1[2] = { '\0', '\0' };
- 	dbg(0,"enter text='%s' 0x%x (%d) key=%d\n", text, text[0], strlen(text), event->key());
- 	if (!text || !text[0] || text[0] == 0x7f) {
- 		dbg(0,"special key\n");
- 		switch (event->key()) {
- 		case 4099:
- 			{
--				text=(char []){NAVIT_KEY_BACKSPACE,'\0'};
-+				text1[0] = NAVIT_KEY_BACKSPACE;
- 			}
- 			break;
- 		case 4101:
-@@ -253,7 +254,7 @@
- 		QT_QPAINTER_CUSTOM_RETURN
- #endif
- 			{
--				text=(char []){NAVIT_KEY_RETURN,'\0'};
-+				text1[0] = NAVIT_KEY_RETURN;
- 			}
- 			break;
- 		case 4114:
-@@ -261,7 +262,7 @@
- 		QT_QPAINTER_CUSTOM_LEFT
- #endif
- 			{
--				text=(char []){NAVIT_KEY_LEFT,'\0'};
-+				text1[0] = NAVIT_KEY_LEFT;
- 			}
- 			break;
- 		case 4115:
-@@ -269,7 +270,7 @@
- 		QT_QPAINTER_CUSTOM_UP
- #endif
- 			{
--				text=(char []){NAVIT_KEY_UP,'\0'};
-+				text1[0] = NAVIT_KEY_UP;
- 			}
- 			break;
- 		case 4116:
-@@ -277,7 +278,7 @@
- 		QT_QPAINTER_CUSTOM_RIGHT
- #endif
- 			{
--				text=(char []){NAVIT_KEY_RIGHT,'\0'};
-+				text1[0] = NAVIT_KEY_RIGHT;
- 			}
- 			break;
- 		case 4117:
-@@ -285,10 +286,11 @@
- 		QT_QPAINTER_CUSTOM_DOWN
- #endif
- 			{
--				text=(char []){NAVIT_KEY_DOWN,'\0'};
-+				text1[0] = NAVIT_KEY_DOWN;
- 			}
- 			break;
- 		}
-+		if (text1[0]) text = text1;
- 	}
- 	callback_list_call_attr_1(this->cbl, attr_keypress, (void *)text);
- 	event->accept();

index a8df317..6e81a4b 100644
@@ -1,10 +1,9 @@
 require navit.inc
 
-SRCREV = "5159"
+SRCREV = "5310"
 PV = "0.2.0+svnr${SRCPV}"
 PR = "${INC_PR}.3"
 
 S = "${WORKDIR}/${PN}"
 SRC_URI += "svn://[email protected]/svnroot/navit/trunk;module=navit;protocol=http \
-  file://taking-address-of-temporary-array.patch \
 "

new file mode 100644
index 0000000..dba60ca
@@ -0,0 +1,288 @@
+Imported from gentoo:
+http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/net-print/libgnomecups/files/libgnomecups-0.2.3-cups-1.6.patch
+
+From ae783efde4fa69578651994505462f02b8639220 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <[email protected]>
+Date: Tue, 7 Aug 2012 06:53:09 -0400
+Subject: [PATCH] Use CUPS-1.6 IPP API getter/setter functions
+
+CUPS 1.6 makes various structures private and introduces these ippGet
+and ippSet functions for all of the fields in these structures.
+http://www.cups.org/str.php?L3928
+
+We define our own accessors when building against CUPS < 1.6.
+
+Based on work by Jiri Popelka <[email protected]> at
+https://bugzilla.gnome.org/show_bug.cgi?id=679759
+---
+ libgnomecups/gnome-cups-printer.c |   48 +++++++++++++++++++++++++++++-------
+ libgnomecups/gnome-cups-queue.c   |   43 +++++++++++++++++++++++++++------
+ libgnomecups/gnome-cups-request.c |   44 ++++++++++++++++++++++++++++-----
+ 3 files changed, 110 insertions(+), 25 deletions(-)
+
+diff --git a/libgnomecups/gnome-cups-printer.c b/libgnomecups/gnome-cups-printer.c
+index c924af0..f5e1ef7 100644
+--- a/libgnomecups/gnome-cups-printer.c
++++ b/libgnomecups/gnome-cups-printer.c
+@@ -37,6 +37,34 @@
+ 
+ #define UPDATE_TIMEOUT 5000
+ 
++#if (CUPS_VERSION_MAJOR > 1) || (CUPS_VERSION_MINOR > 5)
++#define HAVE_CUPS_1_6 1
++#endif
++
++#ifndef HAVE_CUPS_1_6
++#define ippGetCount(attr)     attr->num_values
++#define ippGetName(attr)      attr->name
++#define ippGetInteger(attr, element) attr->values[element].integer
++#define ippGetString(attr, element, language) attr->values[element].string.text
++
++static ipp_attribute_t *
++ippFirstAttribute(ipp_t *ipp)
++{
++  if (!ipp)
++    return (NULL);
++  return (ipp->current = ipp->attrs);
++}
++
++static ipp_attribute_t *
++ippNextAttribute(ipp_t *ipp)
++{
++  if (!ipp || !ipp->current)
++    return (NULL);
++  return (ipp->current = ipp->current->next);
++}
++#endif
++
++
+ struct _GnomeCupsPPDFile {
+ 	char name[1];
+ };
+@@ -173,9 +201,9 @@ map_reasons (GnomeCupsPrinter *printer,
+ 	printer->details->state_reasons = NULL;
+ 
+ 	/* cf. RFC2911 4.4.12 */
+-	for (i = 0; i < attr->num_values; i++) {
++	for (i = 0; i < ippGetCount (attr); i++) {
+ 		const char *p;
+-		const char *keyword = attr->values [i].string.text;
++		const char *keyword = ippGetString (attr, i, NULL);
+ 
+ 		reason = g_new (GnomeCupsPrinterReason, 1);
+ 
+@@ -224,8 +252,8 @@ gnome_cups_printer_get_info (GnomeCupsPrinter *printer)
+ 	return printer->details->info;
+ }
+ 
+-#define MAP_INT(v,a) {if (!g_ascii_strcasecmp (attr->name, (a))) { if ((v) != attr->values[0].integer) { changed = TRUE; } (v) = attr->values[0].integer; }}
+-#define MAP_STRING(v,a) {if (!g_ascii_strcasecmp (attr->name, (a))) { if (!v || strcmp (v, attr->values[0].string.text)) { g_free (v); changed = TRUE; (v) = g_strdup (attr->values[0].string.text); }}}
++#define MAP_INT(v,a) {if (!g_ascii_strcasecmp (ippGetName (attr), (a))) { if ((v) != ippGetInteger (attr, 0)) { changed = TRUE; } (v) = ippGetInteger (attr, 0); }}
++#define MAP_STRING(v,a) {if (!g_ascii_strcasecmp (ippGetName (attr), (a))) { if (!v || strcmp (v, ippGetString (attr, 0, NULL))) { g_free (v); changed = TRUE; (v) = g_strdup (ippGetString (attr, 0, NULL)); }}}
+ 
+ static void
+ attributes_update_cb (guint id,
+@@ -243,14 +271,14 @@ attributes_update_cb (guint id,
+ 	changed = FALSE;
+ 
+ 	if (!error && response) {
+-		for (attr = response->attrs; attr != NULL; attr = attr->next) {
+-			if (!attr->name) {
++		for (attr = ippFirstAttribute (response); attr != NULL; attr = ippNextAttribute (response)) {
++			if (!ippGetName (attr)) {
+ 				continue;
+ 			} 
+-			if (!g_ascii_strcasecmp (attr->name, "attributes-charset") || !strcmp (attr->name, "attributes-charset")) {
++			if (!g_ascii_strcasecmp (ippGetName (attr), "attributes-charset") || !strcmp (ippGetName (attr), "attributes-charset")) {
+ 				continue;
+ 			}
+-			if (!g_ascii_strcasecmp (attr->name, "printer-state-reasons")) {
++			if (!g_ascii_strcasecmp (ippGetName (attr), "printer-state-reasons")) {
+ 				map_reasons (printer, attr);
+ 			}
+ 			MAP_INT (printer->details->state, "printer-state");
+@@ -570,7 +598,7 @@ get_default (void)
+ 	
+ 	attr = ippFindAttribute (response, "printer-name", IPP_TAG_NAME);
+ 	if (attr) {
+-		name = g_strdup (attr->values[0].string.text);
++		name = g_strdup (ippGetString (attr, 0, NULL));
+ 	} else {
+ 		name = NULL;
+ 	}
+@@ -698,7 +726,7 @@ get_printer_names (void)
+ 	attr = ippFindAttribute (response, "printer-name", IPP_TAG_NAME);
+ 	while (attr) {
+ 		ret = g_list_prepend (ret, 
+-				      g_strdup (attr->values[0].string.text));
++				      g_strdup (ippGetString (attr, 0, NULL)));
+ 		
+ 		attr = ippFindNextAttribute (response, 
+ 					     "printer-name", 
+diff --git a/libgnomecups/gnome-cups-queue.c b/libgnomecups/gnome-cups-queue.c
+index 9f98ed9..298db42 100644
+--- a/libgnomecups/gnome-cups-queue.c
++++ b/libgnomecups/gnome-cups-queue.c
+@@ -15,6 +15,33 @@
+ 
+ #define UPDATE_TIMEOUT 3000
+ 
++#if (CUPS_VERSION_MAJOR > 1) || (CUPS_VERSION_MINOR > 5)
++#define HAVE_CUPS_1_6 1
++#endif
++
++#ifndef HAVE_CUPS_1_6
++#define ippGetName(attr)      attr->name
++#define ippGetInteger(attr, element) attr->values[element].integer
++#define ippGetString(attr, element, language) attr->values[element].string.text
++
++static ipp_attribute_t *
++ippFirstAttribute(ipp_t *ipp)
++{
++  if (!ipp)
++    return (NULL);
++  return (ipp->current = ipp->attrs);
++}
++
++static ipp_attribute_t *
++ippNextAttribute(ipp_t *ipp)
++{
++  if (!ipp || !ipp->current)
++    return (NULL);
++  return (ipp->current = ipp->current->next);
++}
++#endif
++
++
+ struct _GnomeCupsQueueDetails {
+ 	char *queue_name;
+ 	GList *jobs;
+@@ -199,8 +226,8 @@ finish_job (GnomeCupsJob *job)
+ 	job->size = job->size * 1024;
+ }
+ 
+-#define MAP_STR(dest, src) { if (!g_ascii_strcasecmp (attr->name, (src))) { if ((dest) != NULL) g_free (dest); (dest) = g_strdup (attr->values[0].string.text);}}
+-#define MAP_INT(dest, src) { if (!g_ascii_strcasecmp (attr->name, (src))) { (dest) = attr->values[0].integer; } }
++#define MAP_STR(dest, src) { if (!g_ascii_strcasecmp (ippGetName (attr), (src))) { if ((dest) != NULL) g_free (dest); (dest) = g_strdup (ippGetString (attr, 0, NULL));}}
++#define MAP_INT(dest, src) { if (!g_ascii_strcasecmp (ippGetName (attr), (src))) { (dest) = ippGetInteger (attr, 0); } }
+ 
+ static void
+ get_jobs_cb (guint id,
+@@ -231,8 +258,8 @@ get_jobs_cb (guint id,
+ 	
+ 	if (response) {
+ 		job = g_new0 (GnomeCupsJob, 1);
+-		for (attr = response->attrs; attr != NULL; attr = attr->next) {
+-			if (attr->name == NULL) {
++		for (attr = ippFirstAttribute (response); attr != NULL; attr = ippNextAttribute (response)) {
++			if (ippGetName (attr) == NULL) {
+ 				if (job->name) {
+ 					finish_job (job);
+ 					jobs = g_list_prepend (jobs, job);	
+@@ -244,7 +271,7 @@ get_jobs_cb (guint id,
+ 				continue;
+ 			}
+ 			
+-			if (!g_ascii_strcasecmp (attr->name, "attributes-charset") || !g_ascii_strcasecmp (attr->name, "attributes-charset")) {
++			if (!g_ascii_strcasecmp (ippGetName (attr), "attributes-charset") || !g_ascii_strcasecmp (ippGetName (attr), "attributes-charset")) {
+ 				continue;
+ 				
+ 			}
+@@ -355,8 +382,8 @@ gnome_cups_queue_get_job_nocache (GnomeCupsQueue *queue,
+ 
+ 	if (response) {
+ 		job = g_new0 (GnomeCupsJob, 1);
+-		for (attr = response->attrs; attr != NULL; attr = attr->next) {
+-			if (attr->name == NULL) {
++		for (attr = ippFirstAttribute (response); attr != NULL; attr = ippNextAttribute (response)) {
++			if (ippGetName (attr) == NULL) {
+ 				if (job->name) {
+ 					finish_job (job);
+ 				} else {
+@@ -366,7 +393,7 @@ gnome_cups_queue_get_job_nocache (GnomeCupsQueue *queue,
+ 				break;
+ 			}
+ 			
+-			if (!g_ascii_strcasecmp (attr->name, "attributes-charset") || !g_ascii_strcasecmp (attr->name, "attributes-charset")) {
++			if (!g_ascii_strcasecmp (ippGetName (attr), "attributes-charset") || !g_ascii_strcasecmp (ippGetName (attr), "attributes-charset")) {
+ 				continue;
+ 			}
+ 			
+diff --git a/libgnomecups/gnome-cups-request.c b/libgnomecups/gnome-cups-request.c
+index c94f623..13f0948 100644
+--- a/libgnomecups/gnome-cups-request.c
++++ b/libgnomecups/gnome-cups-request.c
+@@ -19,6 +19,36 @@
+ #define STOP_UNUSED_THREADS_TIMEOUT 60
+ #define CLOSE_UNUSED_CONNECTIONS_TIMEOUT 30
+ 
++#if (CUPS_VERSION_MAJOR > 1) || (CUPS_VERSION_MINOR > 5)
++#define HAVE_CUPS_1_6 1
++#endif
++
++#ifndef HAVE_CUPS_1_6
++#define ippGetCount(attr)     attr->num_values
++#define ippGetValueTag(attr)  attr->value_tag
++#define ippGetName(attr)      attr->name
++#define ippGetBoolean(attr, element) attr->values[element].boolean
++#define ippGetInteger(attr, element) attr->values[element].integer
++#define ippGetString(attr, element, language) attr->values[element].string.text
++
++static ipp_attribute_t *
++ippFirstAttribute(ipp_t *ipp)
++{
++  if (!ipp)
++    return (NULL);
++  return (ipp->current = ipp->attrs);
++}
++
++static ipp_attribute_t *
++ippNextAttribute(ipp_t *ipp)
++{
++  if (!ipp || !ipp->current)
++    return (NULL);
++  return (ipp->current = ipp->current->next);
++}
++#endif
++
++
+ typedef struct
+ {
+ 	GMutex *mutex;
+@@ -276,14 +306,14 @@ dump_request (ipp_t const *req)
+ 	unsigned i;
+ 	ipp_attribute_t *attr;
+ 
+-	for (attr = req->attrs; attr != NULL; attr = attr->next) {
+-		g_print ("%s", attr->name);
+-		for (i = 0 ; i < attr->num_values ; i++) {
++	for (attr = ippFirstAttribute (req); attr != NULL; attr = ippNextAttribute (req)) {
++		g_print ("%s", ippGetName (attr));
++		for (i = 0 ; i < ippGetCount (attr) ; i++) {
+ 			g_print ("\t[%d] = ", i);
+-			switch (attr->value_tag & ~IPP_TAG_COPY) {
++			switch (ippGetValueTag (attr) & ~IPP_TAG_COPY) {
+ 			case IPP_TAG_INTEGER:
+ 			case IPP_TAG_ENUM:
+-				g_print ("%d\n", attr->values[i].integer);
++				g_print ("%d\n", ippGetInteger (attr, i));
+ 				break;
+ 
+ 			case IPP_TAG_STRING:
+@@ -294,11 +324,11 @@ dump_request (ipp_t const *req)
+ 			case IPP_TAG_CHARSET:
+ 			case IPP_TAG_LANGUAGE:
+ 			case IPP_TAG_MIMETYPE:
+-				g_print ("'%s'\n", attr->values[i].string.text);
++				g_print ("'%s'\n", ippGetString (attr, i, NULL));
+ 				break;
+ 
+ 			case IPP_TAG_BOOLEAN:
+-				g_print ("%s\n", (int)attr->values[i].boolean ? "true" : "false");
++				g_print ("%s\n", (int)ippGetBoolean (attr, i) ? "true" : "false");
+ 				break;
+ 
+ 			default:
+-- 
+1.7.8.6
+

index 199ee72..f317997 100644
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
 DEPENDS="glib-2.0 gtk+ pango cups intltool libgnomeui"
 
-PR = "r1"
+PR = "r2"
 
 inherit gnome pkgconfig
 

@@ -13,7 +13,10 @@ do_compile_append () {
 	sed 's:${STAGING_DIR_HOST}::' < libgnomecups-1.0.pc.old > libgnomecups-1.0.pc
 }
 
-SRC_URI += "file://libgnomecups-0.2.3-glib.h.patch"
+SRC_URI += "\
+  file://libgnomecups-0.2.3-glib.h.patch \
+  file://libgnomecups-0.2.3-cups-1.6.patch \
+"
 
 SRC_URI[archive.md5sum] = "dc4920c15c9f886f73ea74fbff0ae48b"
 SRC_URI[archive.sha256sum] = "e130e80942b386de19a288a4c194ff3dbe9140315b31e982058c8bffbb6a1d29"

new file mode 100644
index 0000000..53235a1
@@ -0,0 +1,11 @@
+diff -uNr libgnomeprint-2.18.7.orig/libgnomeprint/modules/cups/gnome-print-cups-transport.c libgnomeprint-2.18.7/libgnomeprint/modules/cups/gnome-print-cups-transport.c
+--- libgnomeprint-2.18.7.orig/libgnomeprint/modules/cups/gnome-print-cups-transport.c	2009-04-19 19:45:36.000000000 +0200
++++ libgnomeprint-2.18.7/libgnomeprint/modules/cups/gnome-print-cups-transport.c	2012-12-23 12:34:52.058643537 +0100
+@@ -35,6 +35,7 @@
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ #include <unistd.h>
++#include <stdio.h>
+ #include <locale.h>
+ 
+ #include <cups/cups.h>

index c0ea12a..328da68 100644
@@ -1,12 +1,16 @@
 LICENSE = "GPLv2"
 SECTION = "x11/gnome/libs"
 
+PR = "r1"
+
 DEPENDS = "libxml2 libgnomecups glib-2.0 pango libart-lgpl fontconfig popt gnome-common"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
 inherit pkgconfig gnome
 
+SRC_URI += "file://fix.includes.patch"
+
 SRC_URI[archive.md5sum] = "d66b81ee8aa3b3a33f5efc9a47ce07e3"
 SRC_URI[archive.sha256sum] = "8b34f81599423ef3da9c43775495da602f83cbbee069c9e760ffeae6aa4768e6"
 

index 328da68..4a3ba05 100644
@@ -1,7 +1,7 @@
 LICENSE = "GPLv2"
 SECTION = "x11/gnome/libs"
 
-PR = "r1"
+PR = "r2"
 
 DEPENDS = "libxml2 libgnomecups glib-2.0 pango libart-lgpl fontconfig popt gnome-common"
 

@@ -14,6 +14,11 @@ SRC_URI += "file://fix.includes.patch"
 SRC_URI[archive.md5sum] = "d66b81ee8aa3b3a33f5efc9a47ce07e3"
 SRC_URI[archive.sha256sum] = "8b34f81599423ef3da9c43775495da602f83cbbee069c9e760ffeae6aa4768e6"
 
-FILES_${PN}-dbg += "${libdir}/libgnomeprint/${PV}/modules/transports/.debug \
-		    ${libdir}/libgnomeprint/${PV}/modules/.debug  ${libdir}/libgnomeprint/${PV}/modules/*/.debug"
-
+FILES_${PN}-dbg += "\
+  ${libdir}/${PN}/${PV}/modules/.debug \
+  ${libdir}/${PN}/${PV}/modules/*/.debug \
+"
+FILES_${PN}-staticdev += "\
+  ${libdir}/${PN}/${PV}/modules/.a \
+  ${libdir}/${PN}/${PV}/modules/*/.a \
+"

similarity index 89%
rename from meta-gnome/recipes-gnome/nautilus/nautilus3_3.0.2.bb
rename to meta-gnome/recipes-gnome/nautilus/nautilus3_3.2.1.bb
index 19de470..728e718 100644
@@ -17,8 +17,8 @@ BPN = "nautilus"
 inherit gnome
 
 SRC_URI += "file://no-try-run-strftime.diff"
-SRC_URI[archive.md5sum] = "949187b1f241137ad3a5e6bdca3dfb0b"
-SRC_URI[archive.sha256sum] = "6a4c6b75593f0e815763d0040878cd908da72318f18b05f33d24040e0d602b22"
+SRC_URI[archive.md5sum] = "ecd100ed94431363fa68b217351649c0"
+SRC_URI[archive.sha256sum] = "584e97d3eb093ee16a779809b679150a636bcd4a3767fb604993013b523d2df1"
 
 EXTRA_OECONF = " --disable-gtk-doc  --disable-update-mimedb --enable-nst-extension"
 export SYSROOT = "${STAGING_DIR_HOST}"

new file mode 100644
index 0000000..b648351
@@ -0,0 +1,13 @@
+DESCRIPTION = "PulseAudio Volume Control (pavucontrol) is a simple GTK based volume control tool ("mixer") for the PulseAudio sound server."
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe"
+
+DEPENDS = "intltool gtkmm libcanberra pulseaudio"
+
+inherit gnome
+
+SRC_URI = "http://freedesktop.org/software/pulseaudio/${BPN}/${BP}.tar.xz"
+SRC_URI[md5sum] = "0ab6b13542af9b4417438527d2524316"
+SRC_URI[sha256sum] = "3dbe2865b6e3a195a8951967d9234f62cd254c30b08bdea1ecf8997b58f68cde"
+
+EXTRA_OECONF = " --disable-gtk3 --disable-lynx "

deleted file mode 100644
index 0975e9b..0000000
@@ -1,17 +0,0 @@
-DESCRIPTION = "ulseAudio Volume Control (pavucontrol) is a simple GTK based volume control tool ("mixer") for the PulseAudio sound server."
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe"
-
-DEPENDS = "intltool gtkmm libcanberra pulseaudio"
-
-inherit gnome
-
-PV = "0.9.10+git"
-
-SRCREV = "50efee1180a785f297ce6dc38b349ee7e28c8129"
-SRC_URI = "git://anongit.freedesktop.org/pulseaudio/pavucontrol;protocol=git"
-S = "${WORKDIR}/git"
-
-EXTRA_OECONF = " --disable-gtk3 "
-
-

index 728e718..488df1c 100644
@@ -6,7 +6,7 @@ LICENSE="GPLv2 & LGPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=f08a446809913fc9b3c718f0eaea0426 \
                     file://COPYING.LIB;md5=f30a9716ef3762e3467a2f62bf790f0a"
 
-PR = "r3"
+PR = "r4"
 
 DEPENDS = "libnotify3 gtk+3 libunique gvfs librsvg libexif gnome-desktop3"
 # optional: tracker

@@ -35,7 +35,8 @@ FILES_${PN} += "${datadir}/icons \
                 ${datadir}/dbus-1 \
                 ${libdir}/nautilus/extensions*/*.so \
                "
-FILES_${PN}-dbg += "/usr/libexec/.debug"
+FILES_${PN}-dbg += "/usr/libexec/.debug \
+  ${libdir}/nautilus/extensions*/.debug"
 
 # Don't make nautils drag us in
 PRIVATE_LIBS = "libnautilus-extension.so.1"

index cce9af1..292a88a 100644
@@ -4,9 +4,9 @@ HOMEPAGE = "http://sourceforge.net/projects/f2fs-tools/"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=15667d9b3cb737b57471c148b7c50734"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/project/f2fs-tools/f2fs-tools-${PV}.tar.gz"
-SRC_URI[md5sum] = "cf3608ea7475c8f9a03159d7f22e4d07"
-SRC_URI[sha256sum] = "afd774b80f73721f2c4300c0b4780a24b705b8328df229f3ae37315c8bfbff1d"
+SRCREV = "da59f6146c37e727bb83ae4922ca56d42958e61c"
+SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git;protocol=git"
+S = "${WORKDIR}/git"
 
 inherit autotools
 

index 1939f09..f52e338 100644
@@ -4,10 +4,10 @@ BPN = "gvfs"
 
 DEPENDS = "gvfs gnome-disk-utility"
 
-PR = "${INC_PR}.3"
+PR = "${INC_PR}.4"
 
 # we need gdu files only: reduce files to delete in libexecdir
-EXTRA_OECONF += "--disable-gphoto2"
+EXTRA_OECONF += "--disable-gphoto2 --disable-afc"
 
 do_install_append() {
 	rm -rf ${D}${sysconfdir}

index b4a9a47..a1fa786 100644
@@ -2,14 +2,17 @@ DESCRIPTION = "Display dialog boxes from the commandline and shell scripts"
 LICENSE = "LGPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
 
+PR = "r1"
+
 DEPENDS = "gtk+ glib-2.0 libnotify gnome-doc-utils"
 
 inherit gnome
 SRC_URI[archive.md5sum] = "aa66ec35451b16e424519b4973082170"
 SRC_URI[archive.sha256sum] = "8838be041a07364b62a4281c971392e4a09bb01bb3237a836ec0457ec0ea18ac"
 
+EXTRA_OECONF += "--disable-scrollkeeper"
 # remove -I/usr/include from zenity_CPPFLAGS
-do_cconfigure_prepend() {
+do_configure_prepend() {
 	sed -i -e '/-I$(includedir)/d' src/Makefile.am
 }