frameworkd-devel: use mickey/ogsmd-new-timeout branch for now

diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 64e2987..8c9ba4c 100644 (file)
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -54,8 +54,8 @@ SRCREV_pn-epydial ?= "215"
 SRCREV_pn-etk-theme-ninja ?= "5"
 SRCREV_pn-fbgrab-viewer-native ?= "1943"
 SRCREV_pn-flashrom ?= "3682"
-SRCREV_pn-frameworkd ?= "700ab8250582767628165b7cf6f671ef756ba56d"
-SRCREV_pn-frameworkd-devel ?= "${SRCREV_pn-frameworkd}"
+SRCREV_pn-frameworkd ?= "b652f9cc4efbccc1df941c0d93e156631879f174"
+SRCREV_pn-frameworkd-devel ?= "858c8d58d1f7e807f2c09532787c4e7b1a5daa52"
 SRCREV_pn-fsod ?= "3fa5eb6f2edcf7c9f0fc2027fda47b91d9f0f136"
 SRCREV_pn-fso-abyss ?= "fc4324a328834eb55c35d1670efc53f6e8c892a1"
 SRCREV_pn-fso-apm ?= "eb39ce7fb81bfa64e1a9eb5f142ca3d1065be3fa"
@@ -247,7 +247,7 @@ SRCREV_pn-zhone ?= "f38cc52fbf11f7fe945797a6b8ade29ed479d924"
 # Enlightenment Foundation Libraries
 # Caution: This is not alphabetically, but (roughly) dependency-sorted.
 # Please leave it like that.
-EFL_SRCREV ?= "39089"
+EFL_SRCREV ?= "39188"
 SRCREV_pn-edb-native ?= "${EFL_SRCREV}"
 SRCREV_pn-edb ?= "${EFL_SRCREV}"
 SRCREV_pn-eina-native ?= "${EFL_SRCREV}"

diff --git a/packages/freesmartphone/frameworkd-devel_git.bb b/packages/freesmartphone/frameworkd-devel_git.bb
index cb52fbc..f5f6c0b 100644 (file)
--- a/packages/freesmartphone/frameworkd-devel_git.bb
+++ b/packages/freesmartphone/frameworkd-devel_git.bb
@@ -3,18 +3,12 @@ FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/frameworkd', '${FILE_DIRNA
 PROVIDES = "frameworkd"
 RPROVIDES = "frameworkd"
 PV = "0.8.5.x+gitr${SRCREV}"
-PR = "r1"
+PR = "r0"
 
 DEFAULT_PREFERENCE = "-1"
-# skip this package
-COMPATIBLE_MACHINE = ""
 
 SRC_URI = "\
-  ${FREESMARTPHONE_GIT}/framework.git;protocol=git;branch=master \
+  ${FREESMARTPHONE_GIT}/framework.git;protocol=git;branch=mickey/ogsmd-new-timeout \
   file://frameworkd \
   file://frameworkd.conf \
 "
-
-CONFFILES_${PN}-config += "\
-  ${sysconfdir}/freesmartphone/ogsmd/networks.tab \
-"

diff --git a/packages/lyx/lyx_1.6.1.bb b/packages/lyx/lyx_1.6.1.bb
new file mode 100644 (file)
index 0000000..3d5b6c6
--- /dev/null
+++ b/packages/lyx/lyx_1.6.1.bb
@@ -0,0 +1,25 @@
+DESCRIPTION = "LyX is an advanced type setting processor - a frontend for LaTeX"
+SECTION = "x11/office"
+LICENSE = "GPL"
+HOMEPAGE = "http://www.lyx.org"
+DEPENDS = "boost qt4-x11-free"
+RSUGGESTS = "tetex"
+RDEPENDS = "python-shell python-textutils"
+PR = "r0"
+
+SRC_URI = "http://lyx.cybermirror.org/stable/lyx-${PV}.tar.bz2"
+
+inherit qt4x11 autotools
+
+EXTRA_OECONF = " --with-qt4-dir=${QTDIR} -enable-pch"
+EXTRA_QMAKEVARS_POST = "DEFINES+=_LIBC"
+PARALLEL_MAKE = ""
+
+do_configure_prepend() {
+       echo "NOTE: touching missing files, please report to upstream"
+       touch lib/configure.ac lib/doc/LaTeXConfig.lyx lib/textclass.lst
+}
+
+#export UIC="${OE_QMAKE_UIC}"
+#export MOC="${OE_QMAKE_MOC}"
+#export OE_QMAKE_LIBS_X11="-lX11 -lXext"