diff options
-rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 9 | ||||
-rw-r--r-- | recipes/e17/e-tasks_svn.bb | 10 | ||||
-rw-r--r-- | recipes/intone-video/intone-video_svn.bb | 19 | ||||
-rw-r--r-- | recipes/intone/intone_svn.bb | 10 | ||||
-rw-r--r-- | recipes/openmoko-3rdparty/guitartune_svn.bb | 28 | ||||
-rw-r--r-- | recipes/shr/shr-launcher_svn.bb | 10 | ||||
-rw-r--r-- | recipes/tasks/task-shr-feed.bb | 1 |
7 files changed, 44 insertions, 43 deletions
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 3c3b671574..895f5519d2 100644 --- 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 ?= "18" +SRCREV_pn-e-tasks ?= "22" SRCREV_pn-e-wm-config-illume-shr ?= "bbcec18f0ebd47e4f6eea88b9b774edf7400e752" SRCREV_pn-e-wm-illume-dict-pl ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" SRCREV_pn-e-wm-menu-shr ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" @@ -104,14 +104,15 @@ SRCREV_pn-gpe-theme-neo ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" SRCREV_pn-gridpad ?= "194" SRCREV_pn-gtk-theme-neo ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" SRCREV_pn-gtkhtml2 ?= "1158" +SRCREV_pn-guitartune ?= "11" SRCREV_pn-gypsy ?= "134" SRCREV_pn-hildon-1 ?= "14429" SRCREV_pn-icon-theme-neo ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" SRCREV_pn-illume-keyboards-shr ?= "c23bde500152c303971b4c2ec5c463d760b7cc14" SRCREV_pn-illume-theme-asu ?= "4881" SRCREV_pn-illume-theme-freesmartphone ?= "b1b0f6adc59e6f72a3929771058e3750bf181bc5" -SRCREV_pn-intone ?= "66" -SRCREV_pn-intone-video ?= "9" +SRCREV_pn-intone ?= "75" +SRCREV_pn-intone-video ?= "12" SRCREV_pn-intuition ?= "194" SRCREV_pn-kismet ?= "2285" SRCREV_pn-kismet-newcore ?= "2285" @@ -292,7 +293,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 ?= "92" +SRCREV_pn-shr-launcher ?= "99" SRCREV_pn-shr-messages ?= "9d7ca1cecb93022e5b890cd87756ac6f072710ca" SRCREV_pn-shr-settings ?= "ef06fe86c49958673889671c46682c0b2f1d74d7" SRCREV_pn-shr-specs ?= "a881cd133439737708d4d4d150500246ceff7c7d" diff --git a/recipes/e17/e-tasks_svn.bb b/recipes/e17/e-tasks_svn.bb index 9556e146d6..5c07a1bd3c 100644 --- a/recipes/e17/e-tasks_svn.bb +++ b/recipes/e17/e-tasks_svn.bb @@ -10,14 +10,8 @@ inherit autotools PV = "0.0.1+svnr${SRCPV}" PR = "r1" -SRC_URI = "svn://e-tasks.googlecode.com/svn/trunk;module=.;proto=http" -S = "${WORKDIR}" - -do_configure_prepend() { - # all links to /usr/share/automake-1.10/ - rm -f ${S}/depcomp ${S}/config.guess ${S}/config.sub ${S}/INSTALL ${S}/install-sh ${S}/missing - touch ${S}/INSTALL -} +SRC_URI = "svn://e-tasks.googlecode.com/svn;module=trunk;proto=http" +S = "${WORKDIR}/trunk" do_install_append() { install -d "${D}/${datadir}/pixmaps" diff --git a/recipes/intone-video/intone-video_svn.bb b/recipes/intone-video/intone-video_svn.bb index 30ac70acd2..0f7979f122 100644 --- a/recipes/intone-video/intone-video_svn.bb +++ b/recipes/intone-video/intone-video_svn.bb @@ -9,26 +9,15 @@ RDEPENDS = "mplayer lame libxv libsdl-x11" PV = "0.13+svnr${SRCPV}" PR = "r1" -SRC_URI = "svn://intone-video.googlecode.com/svn/trunk;module=.;proto=http" -S = "${WORKDIR}" +SRC_URI = "svn://intone-video.googlecode.com/svn;module=trunk;proto=http" +S = "${WORKDIR}/trunk" inherit autotools -do_configure_prepend() { - rm -f "${S}/INSTALL" - touch "${S}/INSTALL" - sed -i 's/intone/intone-video/g' ${S}/configure.ac - sed -i 's/\/doc\/intone$/\/share\/doc\/intone-video/g' ${S}/Makefile.am - sed -i '/^EXTRA_DIST = $(glade_DATA)/d' ${S}/src/Makefile.am - sed -i '/^gladedir = $(datadir)\/intone\/glade/d' ${S}/src/Makefile.am - sed -i '/^glade_DATA = intone.glade/d' ${S}/src/Makefile.am -} - do_install_append() { - mv ${D}/${bindir}/intone ${D}/${bindir}/intone-video - mkdir -p "${D}/${datadir}/pixmaps" + install -d "${D}/${datadir}/pixmaps" install -m 0644 "${S}/resources/intone-video.png" "${D}/${datadir}/pixmaps" - mkdir -p "${D}/${datadir}/applications" + install -d "${D}/${datadir}/applications" install -m 0644 "${S}/resources/intone-video.desktop" "${D}/${datadir}/applications" } diff --git a/recipes/intone/intone_svn.bb b/recipes/intone/intone_svn.bb index e1af70d9aa..29773c2638 100644 --- a/recipes/intone/intone_svn.bb +++ b/recipes/intone/intone_svn.bb @@ -9,18 +9,12 @@ RDEPENDS = "mplayer lame libxv libsdl-x11" PV = "0.66+svnr${SRCPV}" PR = "r2" -SRC_URI = "svn://intone.googlecode.com/svn/trunk;module=.;proto=http \ +SRC_URI = "svn://intone.googlecode.com/svn;module=trunk;proto=http \ file://vorbis-include-id3tag.patch;pnum=1;patch=1;maxrev=18" -S = "${WORKDIR}" +S = "${WORKDIR}/trunk" inherit autotools -do_configure_prepend() { - rm -f "${S}/INSTALL" - touch "${S}/INSTALL" - sed -i 's/{prefix}\/doc\/intone$/{prefix}\/share\/doc\/intone/g' ${S}/Makefile.am -} - do_install_append() { mkdir -p "${D}/${datadir}/pixmaps" install -m 0644 "${S}/resources/intone.png" "${D}/${datadir}/pixmaps" diff --git a/recipes/openmoko-3rdparty/guitartune_svn.bb b/recipes/openmoko-3rdparty/guitartune_svn.bb new file mode 100644 index 0000000000..37fbd5ffa3 --- /dev/null +++ b/recipes/openmoko-3rdparty/guitartune_svn.bb @@ -0,0 +1,28 @@ +DESCRIPTION = "guitar tuner for openmoko phones" +HOMEPAGE = "http://code.google.com/p/guitartune" +AUTHOR = "cchandel" +LICENSE = "GPLv2" +SECTION = "e/apps" +DEPENDS = "gtk+ libglade fftw sqlite3" + +PV = "0.36+svnr${SRCPV}" + +SRC_URI = "svn://guitartune.googlecode.com/svn;module=trunk;proto=http" +S = "${WORKDIR}/trunk" + +inherit autotools + +do_install_append() { + install -d "${D}/${datadir}/pixmaps" + install -m 0644 "${S}/resources/guitartune.png" "${D}/${datadir}/pixmaps" + install -d "${D}/${datadir}/applications" + install -m 0644 "${S}/resources/guitartune.desktop" "${D}/${datadir}/applications" + install -d "${D}/${datadir}/guitartune" + for ico in "${S}/resources/"*.png; do + if [ "$(basename $ico)" != "guitartune.png" ]; then + install -m 0644 $ico "${D}/${datadir}/guitartune" + fi + done +} + +FILES_${PN} += "/usr/share/guitartune/* /usr/share/applications/* /usr/share/pixmaps/*" diff --git a/recipes/shr/shr-launcher_svn.bb b/recipes/shr/shr-launcher_svn.bb index 807d3a2cea..481be9021b 100644 --- a/recipes/shr/shr-launcher_svn.bb +++ b/recipes/shr/shr-launcher_svn.bb @@ -8,15 +8,9 @@ DEPENDS = "elementary eina edbus" PV = "0.0.1+svnr${SRCPV}" PR = "r4" -SRC_URI = "svn://shr-launcher.googlecode.com/svn/trunk;module=.;proto=http" +SRC_URI = "svn://shr-launcher.googlecode.com/svn;module=trunk;proto=http" -do_configure_prepend() { - # all links to /usr/share/automake-1.10/ - rm -f ${S}/depcomp ${S}/config.guess ${S}/config.sub ${S}/INSTALL ${S}/install-sh ${S}/missing - touch ${S}/INSTALL -} - -S = "${WORKDIR}" +S = "${WORKDIR}/trunk" inherit autotools diff --git a/recipes/tasks/task-shr-feed.bb b/recipes/tasks/task-shr-feed.bb index 1e5706d777..4b3e764d5e 100644 --- a/recipes/tasks/task-shr-feed.bb +++ b/recipes/tasks/task-shr-feed.bb @@ -27,6 +27,7 @@ RDEPENDS_${PN} += "\ gpe-timesheet \ gpe-contacts \ gtkmm \ + guitartune \ mc \ mplayer \ navit \ |