--- conf/distro/include/preferred-shr-versions.inc | 25 ++++++------ conf/distro/include/sane-srcrevs.inc | 3 +- recipes/aceofpenguins/aceofpenguins_1.2.bb | 6 ++- recipes/blueman/blueman_1.10.bb | 27 +++++++++++++ recipes/connman/mokonnect_svn.bb | 39 +++++++++++++++++++ recipes/e17/exhibit_svn.bb | 2 + recipes/ffalarms/ffalarms_svn.bb | 5 +- recipes/freesmartphone/libeflvala_git.bb | 15 ------- recipes/freesmartphone/opimd-utils_git.bb | 46 ++++++++++++++++------ recipes/libeflvala/libeflvala_git.bb | 18 +++++++++ recipes/navit/navit_svn.bb | 2 - recipes/python/python-epsilon_svn.bb | 1 + recipes/python/python-pygtk/nodocs-2.16.0.patch | 13 ++++++ 13 files changed, 155 insertions(+), 47 deletions(-) create mode 100644 recipes/blueman/blueman_1.10.bb create mode 100644 recipes/connman/mokonnect_svn.bb delete mode 100644 recipes/freesmartphone/libeflvala_git.bb create mode 100644 recipes/libeflvala/libeflvala_git.bb create mode 100644 recipes/python/python-pygtk/nodocs-2.16.0.patch
diff --git a/conf/distro/include/preferred-shr-versions.inc b/conf/distro/include/preferred-shr-versions.inc index 625fe24..8f07134 100644 --- a/conf/distro/include/preferred-shr-versions.inc +++ b/conf/distro/include/preferred-shr-versions.inc @@ -470,8 +470,8 @@ PREFERRED_VERSION_glib-1.2 ?= "1.2.10" PREFERRED_VERSION_glib-1.2-native ?= "1.2.10" PREFERRED_VERSION_glib-2.0 ?= "2.22.1" PREFERRED_VERSION_glib-2.0-native ?= "2.22.1" -PREFERRED_VERSION_glibc ?= "2.6.1" -PREFERRED_VERSION_glibc-initial ?= "2.6.1" +PREFERRED_VERSION_glibc ?= "2.9" +PREFERRED_VERSION_glibc-initial ?= "2.9" PREFERRED_VERSION_glibmm ?= "2.22.1" PREFERRED_VERSION_glider ?= "1.0.0" PREFERRED_VERSION_gloox ?= "0.8.9" @@ -611,13 +611,13 @@ PREFERRED_VERSION_gspcav1 ?= "20070110" PREFERRED_VERSION_gst-ffmpeg ?= "0.10.2" PREFERRED_VERSION_gst-meta-base ?= "0.10" PREFERRED_VERSION_gst-plugin-pulse ?= "0.9.7" -PREFERRED_VERSION_gst-plugins-bad ?= "0.10.6" -PREFERRED_VERSION_gst-plugins-base ?= "0.10.17" +PREFERRED_VERSION_gst-plugins-bad ?= "0.10.11" +PREFERRED_VERSION_gst-plugins-base ?= "0.10.23" PREFERRED_VERSION_gst-plugins-farsight ?= "0.10.1" -PREFERRED_VERSION_gst-plugins-good ?= "0.10.7" -PREFERRED_VERSION_gst-plugins-ugly ?= "0.10.7" +PREFERRED_VERSION_gst-plugins-good ?= "0.10.15" +PREFERRED_VERSION_gst-plugins-ugly ?= "0.10.11" PREFERRED_VERSION_gst-pulse ?= "0.9.7" -PREFERRED_VERSION_gstreamer ?= "0.10.17" +PREFERRED_VERSION_gstreamer ?= "0.10.25" PREFERRED_VERSION_gthumb ?= "2.6.9" PREFERRED_VERSION_gtk+ ?= "2.18.0" PREFERRED_VERSION_gtk2-ssh-askpass ?= "0.3" @@ -984,7 +984,7 @@ PREFERRED_VERSION_libparams-util-perl ?= "0.20" PREFERRED_VERSION_libparams-util-perl-native ?= "0.20" PREFERRED_VERSION_libparams-validate-perl ?= "0.86" PREFERRED_VERSION_libparams-validate-perl-native ?= "0.86" -PREFERRED_VERSION_libpcap ?= "0.9.8" +PREFERRED_VERSION_libpcap ?= "1.0.0" PREFERRED_VERSION_libpcl ?= "1.4" PREFERRED_VERSION_libpcre ?= "7.6" PREFERRED_VERSION_libpcre-native ?= "7.6" @@ -1006,7 +1006,7 @@ PREFERRED_VERSION_libschedule ?= "0.17" PREFERRED_VERSION_libsdl-directfb ?= "1.2.9" PREFERRED_VERSION_libsdl-gfx ?= "2.0.11" PREFERRED_VERSION_libsdl-image ?= "1.2.6" -PREFERRED_VERSION_libsdl-mixer ?= "1.2.6" +PREFERRED_VERSION_libsdl-mixer ?= "1.2.8" PREFERRED_VERSION_libsdl-native ?= "1.2.11" PREFERRED_VERSION_libsdl-net ?= "1.2.7" PREFERRED_VERSION_libsdl-ttf ?= "2.0.3" @@ -1020,6 +1020,7 @@ PREFERRED_VERSION_libsm ?= "1.0.3" PREFERRED_VERSION_libsndfile1 ?= "1.0.17" PREFERRED_VERSION_libsoundgen ?= "0.6" PREFERRED_VERSION_libsoup ?= "2.2.100" +PREFERRED_VERSION_libsoup-2.4 ?= "2.26.2" PREFERRED_VERSION_libspf2 ?= "1.0.4" PREFERRED_VERSION_libspiff ?= "0.8.2" PREFERRED_VERSION_libssh ?= "0.11" @@ -1278,7 +1279,7 @@ PREFERRED_VERSION_modutils-collateral ?= "1.0" PREFERRED_VERSION_modutils-cross ?= "2.4.27" PREFERRED_VERSION_modutils-initscripts ?= "1.0" PREFERRED_VERSION_moin ?= "1.5.8" -PREFERRED_VERSION_mokomaze ?= "0.5.5" +PREFERRED_VERSION_mokomaze ?= "0.5.5+git8" PREFERRED_VERSION_mono ?= "1.2.5.1" PREFERRED_VERSION_mono-mcs-intermediate ?= "1.2.5.1" PREFERRED_VERSION_mono-native ?= "1.2.5.1" @@ -1370,7 +1371,7 @@ PREFERRED_VERSION_openal ?= "0.0.8" PREFERRED_VERSION_openh323 ?= "1.13.5.4" PREFERRED_VERSION_openjade ?= "1.3.2" PREFERRED_VERSION_openjade-native ?= "1.3.2" -PREFERRED_VERSION_openldap ?= "2.3.11" +PREFERRED_VERSION_openldap ?= "2.4.17" PREFERRED_VERSION_openntpd ?= "3.9p1" PREFERRED_VERSION_openobex ?= "1.5" PREFERRED_VERSION_openpbx.org ?= "1.2_rc3" @@ -1494,7 +1495,7 @@ PREFERRED_VERSION_proj-4-native ?= "4.9" PREFERRED_VERSION_psmisc ?= "22.2" PREFERRED_VERSION_psplash-zap ?= "1.0" PREFERRED_VERSION_pth ?= "2.0.2" -PREFERRED_VERSION_pulseaudio ?= "0.9.10" +PREFERRED_VERSION_pulseaudio ?= "0.9.15" PREFERRED_VERSION_puppy ?= "1.11" PREFERRED_VERSION_puzz-le ?= "2.0.0" PREFERRED_VERSION_puzzles ?= "r7436" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index c957ff2..711a137 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -56,6 +56,7 @@ SRCREV_pn-etk-theme-neo ?= "9b2ea6fcd034c494a6346f1ec7464ccbefc08ecc" SRCREV_pn-etk-theme-ninja ?= "5" SRCREV_pn-e-wm-theme-illume-neo ?= "9b2ea6fcd034c494a6346f1ec7464ccbefc08ecc" SRCREV_pn-fbgrab-viewer-native ?= "1943" +SRCREV_pn-ffalarms ?= "58" SRCREV_pn-flashrom ?= "3682" SRCREV_pn-fstests ?= "204" SRCREV_pn-gabriel ?= "38" @@ -188,7 +189,7 @@ SRCREV_pn-openmoko-mediaplayer2 ?= "4750" SRCREV_pn-openmoko-messages2 ?= "4340" SRCREV_pn-openmoko-panel-battery ?= "3360" SRCREV_pn-openmoko-panel-bt ?= "4331" -SRCREV_pn-openmoko-panel-clock ?= "2567" +SRCREV_pn-openhttp://docs.enlightenment.org/auto/epdf/moko-panel-clock ?= "2567" SRCREV_pn-openmoko-panel-demo ?= "1622" SRCREV_pn-openmoko-panel-demo-simple ?= "1328" SRCREV_pn-openmoko-panel-gps ?= "4330" diff --git a/recipes/aceofpenguins/aceofpenguins_1.2.bb b/recipes/aceofpenguins/aceofpenguins_1.2.bb index c9db20e..758aeae 100644 --- a/recipes/aceofpenguins/aceofpenguins_1.2.bb +++ b/recipes/aceofpenguins/aceofpenguins_1.2.bb @@ -4,7 +4,7 @@ AUTHOR = "[email protected]" HOMEPAGE = "http://www.delorie.com/store/ace/"; SECTION = "games" DEPENDS = "libpng zlib libxpm" -PR = "r0" +PR = "r1" SRC_URI = "\ http://www.delorie.com/store/ace/ace-${PV}.tar.gz\ @@ -15,3 +15,7 @@ S = "${WORKDIR}/ace-${PV}" inherit autotools +do_configure_prepend() { + # Workaround QA issue + export CC="${CC} ${LDFLAGS}" +} \ No newline at end of file diff --git a/recipes/blueman/blueman_1.10.bb b/recipes/blueman/blueman_1.10.bb new file mode 100644 index 0000000..6130902 --- /dev/null +++ b/recipes/blueman/blueman_1.10.bb @@ -0,0 +1,27 @@ +DESCRIPTION = "Blueman is a GTK+ Bluetooth Manager" +HOMEPAGE = "http://www.blueman-project.org/"; +SECTION = "optional" +DEPENDS = "gtk+ glib-2.0 bluez4 intltool python python-native python-pyrex startup-notification" +RDEPENDS = "python-dbus python-pygobject python dbus bluez4 python-pygtk python-notify obex-data-server \ +" + +PR = "r1" + +inherit autotools pkgconfig + +EXTRA_OECONF += "--with-no-runtime-deps-check" + +BLUEZ_LIBS = "-L${libdir} -lbluetooth" +BLUEZ_CFLAGS = "-I${includedir}" + +SRC_URI = "\ + http://download.tuxfamily.org/blueman/blueman-${PV}.tar.gz\ + " + +FILES_${PN}-dbg += "${libdir}/python2.6/site-packages/.debug" +FILES_${PN} += "${libdir} ${datadir}" + +do_configure_prepend() { + sed -i "s/py_prefix=.*$/py_prefix=\"${@"${STAGING_DIR_TARGET}".replace("/","\/")}\/usr\"/" ${S}/acinclude.m4 + sed -i "s/py_exec_prefix=.*$/py_exec_prefix=\"${@"${STAGING_DIR_TARGET}".replace("/","\/")}\/usr\"/" ${S}/acinclude.m4 +} diff --git a/recipes/connman/mokonnect_svn.bb b/recipes/connman/mokonnect_svn.bb new file mode 100644 index 0000000..70fd859 --- /dev/null +++ b/recipes/connman/mokonnect_svn.bb @@ -0,0 +1,39 @@ +DESCRIPTION = "mokonnect is an e17 frontend to connmand" +HOMEPAGE = "http://www.assembla.com/wiki/show/shrdev"; +AUTHOR = "Fate" +LICENSE = "GPLv2" +SECTION = "e/apps" +RDEPENDS = "python-elementary connman connman-plugin-wifi" + +PV = "0.4+svnr${SRCREV}" +PR = "r2" + +SRC_URI = "svn://subversion.assembla.com/svn/shrdev;module=Mokonnect/trunk;proto=http" + +S = "${WORKDIR}/Mokonnect/trunk" + +do_install() { + install -d ${D}${datadir}/mokonnect + for pyfile in *.py + do + install -m 644 $pyfile ${D}${datadir}/mokonnect/ + done + chmod 755 ${D}${datadir}/mokonnect/mokonnect.py + + install -d ${D}${datadir}/applications + install -m 644 mokonnect.desktop ${D}${datadir}/applications/ + + install -d ${D}${datadir}/pixmaps + install -m 644 mokonnect.png ${D}${datadir}/pixmaps/ + + install -d ${D}${bindir} + ln -sf ${datadir}/mokonnect/mokonnect.py ${D}${bindir}/mokonnect +} + +FILES_${PN} = "\ +${datadir}/mokonnect \ +${datadir}/applications/* \ +${datadir}/pixmaps/* \ +${bindir}/mokonnect \ +" + diff --git a/recipes/e17/exhibit_svn.bb b/recipes/e17/exhibit_svn.bb index 2035bc1..c574092 100644 --- a/recipes/e17/exhibit_svn.bb +++ b/recipes/e17/exhibit_svn.bb @@ -5,3 +5,5 @@ PV = "0.1.1+svnr${SRCREV}" PR = "r1" inherit e + +SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk/OLD;module=${SRCNAME};proto=http" diff --git a/recipes/ffalarms/ffalarms_svn.bb b/recipes/ffalarms/ffalarms_svn.bb index 2293748..ff72405 100644 --- a/recipes/ffalarms/ffalarms_svn.bb +++ b/recipes/ffalarms/ffalarms_svn.bb @@ -1,8 +1,8 @@ DESCRIPTION = "Finger friendly alarms" HOMEPAGE = "http://ffalarms.projects.openmoko.org/"; LICENSE = "GPLv3" -AUTHOR = "?ukasz Pankowski <[email protected]>" -MAINTAINER = "?ukasz Pankowski <[email protected]>" +AUTHOR = "Lukasz Pankowski <[email protected]>" +MAINTAINER = "Lukasz Pankowski <[email protected]>" SECTION = "x11/applications" PRIORITY = "optional" DEPENDS = "elementary libeflvala" @@ -13,7 +13,6 @@ PR = "r0" inherit vala SRC_URI = "svn://svn.projects.openmoko.org/svnroot/ffalarms;module=trunk;proto=https" -SRC_URI_append_shr += "file://shr.patch;patch=1" S = "${WORKDIR}/trunk" diff --git a/recipes/freesmartphone/libeflvala_git.bb b/recipes/freesmartphone/libeflvala_git.bb deleted file mode 100644 index 9040bbd..0000000 --- a/recipes/freesmartphone/libeflvala_git.bb +++ /dev/null @@ -1,15 +0,0 @@ -DESCRIPTION = "Vala meets the Enlightenment Foundation Libraries" -AUTHOR = "Michael 'Mickey' Lauer <[email protected]>" -LICENSE = "LGPL" -SECTION = "devel" -DEPENDS = "vala-native glib-2.0 dbus dbus-glib eina eet evas ecore edje elementary" -PV = "0.0.1.0+gitr${SRCREV}" -PR = "r0" - -SRC_URI = "${FREESMARTPHONE_GIT}/libeflvala;protocol=git;branch=master" -S = "${WORKDIR}/git" - -inherit autotools_stage pkgconfig vala - -PACKAGES =+ "${PN}-examples" -FILES_${PN}-examples = "${datadir}/libeflvala ${bindir}/*" diff --git a/recipes/freesmartphone/opimd-utils_git.bb b/recipes/freesmartphone/opimd-utils_git.bb index 5031ae5..312ac53 100644 --- a/recipes/freesmartphone/opimd-utils_git.bb +++ b/recipes/freesmartphone/opimd-utils_git.bb @@ -1,27 +1,47 @@ DESCRIPTION = "Test scripts for freesmartphone.org opimd interface" HOMEPAGE = "http://freesmartphone.org"; +SHR_RELEASE ?= "shr" LICENSE ?= "GPL" +RDEPENDS = "python-elementary python-dbus python-codecs python-shell python python-core python-edbus frameworkd" SECTION = "x11/application" -PV = "0.0.2+gitr${SRCREV}" -PR = "r0" +PV = "0.0.3+gitr${SRCPV}" +PR = "r2" inherit setuptools -SRC_URI = "git://git.shr-project.org/repo/opimd-utils.git;protocol=http" -S = "${WORKDIR}/git" +PACKAGES =+ "\ + ${PN}-cli \ + ${PN}-notes \ + ${PN}-data \ +" -RDEPENDS = "\ - python-elementary \ - python-edbus \ - python-codecs \ - python-shell \ - \ +RDEPENDS_${PN} = "\ + ${PN}-data \ shr-settings \ - shr-theme \ - frameworkd \ pyphonelog \ + shr-theme \ +" + +RDEPENDS_${PN}-notes = "\ + ${PN}-data \ +" + +RRECOMMENDS_${PN} = "\ + ${PN}-notes \ + ${PN}-cli \ " +PACKAGE_ARCH_${PN}-cli = "all" +PACKAGE_ARCH_${PN}-data = "all" +PACKAGE_ARCH_${PN}-notes = "all" + +SRC_URI = "git://git.shr-project.org/repo/opimd-utils.git;protocol=http" +S = "${WORKDIR}/git" FILES_${PN} += "${sysconfdir}/X11/Xsession.d/89opimd-notifier" FILES_${PN} += "${prefix}/share/applications/" -FILES_${PN} += "${prefix}/share/pixmaps/opimd-utils/" +FILES_${PN} += "${prefix}/share/pixmaps/" +FILES_${PN}-data += "${prefix}/share/pixmaps/opimd-utils/" +FILES_${PN}-cli += "${prefix}/bin/opimd-cli" +FILES_${PN}-notes += "${prefix}/bin/opimd-notes" +FILES_${PN}-notes += "${prefix}/share/pixmaps/opimd-notes.png" +FILES_${PN}-notes += "${prefix}/share/applications/opimd-notes.desktop" diff --git a/recipes/libeflvala/libeflvala_git.bb b/recipes/libeflvala/libeflvala_git.bb new file mode 100644 index 0000000..4e63e29 --- /dev/null +++ b/recipes/libeflvala/libeflvala_git.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "Vala meets the Enlightenment Foundation Libraries" +AUTHOR = "Michael 'Mickey' Lauer <[email protected]>" +LICENSE = "LGPL" +SECTION = "devel" +DEPENDS = "vala-native glib-2.0 dbus dbus-glib eina eet evas ecore edje elementary" +PV = "0.0.0.0+gitr${SRCREV}" +PR = "r0" + +#don't need examples for building vala programs +EXTRA_OECONF = "--disable-examples --disable-library" + +SRC_URI = "${FREESMARTPHONE_GIT}/libeflvala;protocol=git;branch=master" +S = "${WORKDIR}/git" + +inherit autotools_stage pkgconfig vala + +PACKAGES =+ "${PN}-examples" +FILES_${PN}-examples = "${datadir}/libeflvala ${bindir}" \ No newline at end of file diff --git a/recipes/navit/navit_svn.bb b/recipes/navit/navit_svn.bb index 64f5574..a8e3b64 100644 --- a/recipes/navit/navit_svn.bb +++ b/recipes/navit/navit_svn.bb @@ -3,8 +3,6 @@ require navit.inc PV = "0.2.0+svnrev${SRCREV}" PR = "r0" -DEFAULT_PREFERENCE = "-1" - EXTRA_OECONF_shr += " --enable-cache-size=20971520 --with-svg2png-use-convert" S = "${WORKDIR}/navit" diff --git a/recipes/python/python-epsilon_svn.bb b/recipes/python/python-epsilon_svn.bb index 97b0660..9f535e5 100644 --- a/recipes/python/python-epsilon_svn.bb +++ b/recipes/python/python-epsilon_svn.bb @@ -2,3 +2,4 @@ require python-efl.inc DEPENDS += "epsilon python-ecore" RDEPENDS += "python-ecore" +SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk/OLD/BINDINGS/python;module=${PN};proto=http" diff --git a/recipes/python/python-pygtk/nodocs-2.16.0.patch b/recipes/python/python-pygtk/nodocs-2.16.0.patch new file mode 100644 index 0000000..b19ae44 --- /dev/null +++ b/recipes/python/python-pygtk/nodocs-2.16.0.patch @@ -0,0 +1,13 @@ +Index: pygtk-2.10.4/Makefile.am +=================================================================== +--- pygtk-2.10.4.orig/Makefile.am ++++ pygtk-2.10.4/Makefile.am +@@ -4,7 +4,7 @@ if BUILD_GTK + GTK_SUBDIR = gtk + endif + +-SUBDIRS = . $(GTK_SUBDIR) examples tests docs ++SUBDIRS = . $(GTK_SUBDIR) examples tests + + PLATFORM_VERSION = 2.0 + -- 1.6.4.3 _______________________________________________ Shr-devel mailing list [email protected] http://lists.shr-project.org/mailman/listinfo/shr-devel
