shr-launcher, e-tasks: bump srcrev, remove sed from recipe as fix applied upstream

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 902c844..7d36ce6 100644 (file)
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -46,7 +46,7 @@ SRCREV_pn-dfu-util-native ?= "4160"
 SRCREV_pn-disko ?= "f52597b8d5d584811cbe8f9e0bf25ea372526953"
 SRCREV_pn-diversity-daemon ?= "571"
 SRCREV_pn-diversity-radar ?= "453"
-SRCREV_pn-e-tasks ?= "15"
+SRCREV_pn-e-tasks ?= "18"
 SRCREV_pn-e-wm-config-illume-shr ?= "bbcec18f0ebd47e4f6eea88b9b774edf7400e752"
 SRCREV_pn-e-wm-illume-dict-pl ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
 SRCREV_pn-e-wm-menu-shr ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
@@ -292,7 +292,7 @@ SRCREV_pn-shr-config ?= "37dd7ac950e2bfd438801faf34c29fccfdbbaccf"
 SRCREV_pn-shr-contacts ?= "9d7ca1cecb93022e5b890cd87756ac6f072710ca"
 SRCREV_pn-shr-dialer ?= "9d7ca1cecb93022e5b890cd87756ac6f072710ca"
 SRCREV_pn-shr-installer ?= "f17fa104639113fb0d3212b6bba366c092854cde"
-SRCREV_pn-shr-launcher ?= "90"
+SRCREV_pn-shr-launcher ?= "92"
 SRCREV_pn-shr-messages ?= "9d7ca1cecb93022e5b890cd87756ac6f072710ca"
 SRCREV_pn-shr-settings ?= "b92390148cf0e979fd4c678a6633bb5e436d5763"
 SRCREV_pn-shr-specs ?= "a881cd133439737708d4d4d150500246ceff7c7d"

diff --git a/recipes/e17/e-tasks_svn.bb b/recipes/e17/e-tasks_svn.bb
index 081a47d..3e22013 100644 (file)
--- a/recipes/e17/e-tasks_svn.bb
+++ b/recipes/e17/e-tasks_svn.bb
@@ -8,7 +8,7 @@ DEPENDS = "elementary eina edbus sqlite3"
 inherit autotools
 
 PV = "0.0.1+svnr${SRCPV}"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "svn://e-tasks.googlecode.com/svn/trunk;module=.;proto=http"
 S = "${WORKDIR}"
@@ -16,8 +16,6 @@ S = "${WORKDIR}"
 do_configure_prepend() {
   rm -f ${S}/config.log
   rm -f ${S}/config.status
-  sed -i "s#tasksdocdir = \$.prefix./doc/tasks#tasksdocdir = \$(datadir)/doc/e-tasks#g" ${S}/Makefile.am
-  sed -i "s#gladedir = \$(datadir)/tasks/glade#gladedir = \$(datadir)/e-tasks/glade#g" ${S}/src/Makefile.am
 }
 
 do_install_append() {

diff --git a/recipes/shr/shr-launcher_svn.bb b/recipes/shr/shr-launcher_svn.bb
index 84e5399..a9da5a6 100644 (file)
--- a/recipes/shr/shr-launcher_svn.bb
+++ b/recipes/shr/shr-launcher_svn.bb
@@ -6,14 +6,13 @@ SECTION = "e/apps"
 DEPENDS = "elementary eina edbus"
 
 PV = "0.0.1+svnr${SRCPV}"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "svn://shr-launcher.googlecode.com/svn/trunk;module=.;proto=http"
 
 do_configure_prepend() {
   rm -f ${S}/config.log
   rm -f ${S}/config.status
-  sed -i "s#launcherdocdir = \$.prefix./doc/launcher#launcherdocdir = \$(datadir)/doc/shr-launcher#g" ${S}/Makefile.am
 }
 
 S = "${WORKDIR}"