* [meta-oe][PATCH 1/8] foxtrotgps: inherit gconf
2012-10-24 23:54 [meta-oe][PATCH 0/8] Small changes #102 Martin Jansa
@ 2012-10-24 23:54 ` Martin Jansa
2012-10-24 23:54 ` [meta-oe][PATCH 2/8] tangogps: " Martin Jansa
` (6 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Martin Jansa @ 2012-10-24 23:54 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta-oe/recipes-navigation/foxtrotgps/foxtrotgps_1.1.1.bb | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta-oe/recipes-navigation/foxtrotgps/foxtrotgps_1.1.1.bb b/meta-oe/recipes-navigation/foxtrotgps/foxtrotgps_1.1.1.bb
index 0cafdde..62860b8 100644
--- a/meta-oe/recipes-navigation/foxtrotgps/foxtrotgps_1.1.1.bb
+++ b/meta-oe/recipes-navigation/foxtrotgps/foxtrotgps_1.1.1.bb
@@ -4,15 +4,15 @@ HOMEPAGE = "http://www.foxtrotgps.org/"
SECTION = "x11/applications"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
-DEPENDS = "curl gtk+ gconf libglade sqlite3 libexif gpsd"
+DEPENDS = "curl gtk+ libglade sqlite3 libexif gpsd"
SRC_URI = "http://www.foxtrotgps.org/releases/${P}.tar.gz"
SRC_URI[md5sum] = "6777d448ee9d3ba195f9d26ea90e3163"
SRC_URI[sha256sum] = "ae9706285510554cc0813ac92522e0d1672b0ddb065307bfacfcff3c328f6adb"
-inherit autotools pkgconfig perlnative
+inherit autotools pkgconfig perlnative gconf
-PR = "r1"
+PR = "r2"
do_configure_prepend() {
if [ -f ${S}/configure.in ] ; then
--
1.7.12.4
^ permalink raw reply related [flat|nested] 9+ messages in thread* [meta-oe][PATCH 2/8] tangogps: inherit gconf
2012-10-24 23:54 [meta-oe][PATCH 0/8] Small changes #102 Martin Jansa
2012-10-24 23:54 ` [meta-oe][PATCH 1/8] foxtrotgps: inherit gconf Martin Jansa
@ 2012-10-24 23:54 ` Martin Jansa
2012-10-24 23:54 ` [meta-oe][PATCH 3/8] imlib2: inherit binconfig Martin Jansa
` (5 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Martin Jansa @ 2012-10-24 23:54 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta-oe/recipes-navigation/tangogps/tangogps_0.99.4.bb | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta-oe/recipes-navigation/tangogps/tangogps_0.99.4.bb b/meta-oe/recipes-navigation/tangogps/tangogps_0.99.4.bb
index 5a4231a..1fb7633 100644
--- a/meta-oe/recipes-navigation/tangogps/tangogps_0.99.4.bb
+++ b/meta-oe/recipes-navigation/tangogps/tangogps_0.99.4.bb
@@ -4,8 +4,8 @@ HOMEPAGE = "http://tangogps.org/"
SECTION = "x11/applications"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
-DEPENDS = "curl gtk+ gconf sqlite3 libexif libsoup-2.4 bluez4"
-PR = "r2"
+DEPENDS = "curl gtk+ sqlite3 libexif libsoup-2.4 bluez4"
+PR = "r3"
SRC_URI = "http://www.tangogps.org/downloads/${P}.tar.gz \
file://remove.unused.header.patch \
@@ -14,6 +14,6 @@ SRC_URI = "http://www.tangogps.org/downloads/${P}.tar.gz \
SRC_URI[md5sum] = "0f07ede94a21eb84f5e017fa88a1fc3d"
SRC_URI[sha256sum] = "660fdf89ef3c379f2fc0c2a9d0c9d3bfa5345835786b72bf9f513ba9ec2c812a"
-inherit autotools pkgconfig
+inherit autotools pkgconfig gconf
RRECOMMENDS_${PN} = "gpsd"
--
1.7.12.4
^ permalink raw reply related [flat|nested] 9+ messages in thread* [meta-oe][PATCH 3/8] imlib2: inherit binconfig
2012-10-24 23:54 [meta-oe][PATCH 0/8] Small changes #102 Martin Jansa
2012-10-24 23:54 ` [meta-oe][PATCH 1/8] foxtrotgps: inherit gconf Martin Jansa
2012-10-24 23:54 ` [meta-oe][PATCH 2/8] tangogps: " Martin Jansa
@ 2012-10-24 23:54 ` Martin Jansa
2012-10-24 23:54 ` [meta-oe][PATCH 4/8] midori: inherit vala Martin Jansa
` (4 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Martin Jansa @ 2012-10-24 23:54 UTC (permalink / raw)
To: openembedded-devel
* it was installing imlib2-config directly to sysroot
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta-efl/recipes-efl/efl/imlib2_svn.bb | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/meta-efl/recipes-efl/efl/imlib2_svn.bb b/meta-efl/recipes-efl/efl/imlib2_svn.bb
index 4cc124e..eeaaf52 100644
--- a/meta-efl/recipes-efl/efl/imlib2_svn.bb
+++ b/meta-efl/recipes-efl/efl/imlib2_svn.bb
@@ -4,10 +4,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=344895f253c32f38e182dcaf30fe8a35"
# can also depend on tiff34, ungif or gif, z, bz2, id3tag
DEPENDS = "freetype libpng jpeg virtual/libx11 libxext"
PROVIDES = "virtual/imlib2"
-PV = "1.4.2.001+svnr${SRCPV}"
+PV = "1.4.5+svnr${SRCPV}"
SRCREV = "${EFL_SRCREV}"
-inherit efl
+inherit efl binconfig
SRC_URI = "${E_SVN}/trunk;module=${SRCNAME};protocol=http;scmdata=keep"
S = "${WORKDIR}/${SRCNAME}"
@@ -20,10 +20,6 @@ EXTRA_OECONF = "--with-x \
OE_LT_RPATH_ALLOW = "any"
OE_LT_RPATH_ALLOW[export]="1"
-do_install_append() {
- install -m 0755 imlib2-config ${STAGING_BINDIR_CROSS}
-}
-
PACKAGES =+ "imlib2-loaders-dbg imlib2-filters-dbg imlib2-loaders imlib2-filters"
FILES_${PN} = "${libdir}/lib*.so.* ${libdir}/imlib2/*/*.so"
FILES_${PN}-dbg = "${libdir}/.debug/ ${bindir}/.debug/ ${prefix}/src/debug/"
--
1.7.12.4
^ permalink raw reply related [flat|nested] 9+ messages in thread* [meta-oe][PATCH 4/8] midori: inherit vala
2012-10-24 23:54 [meta-oe][PATCH 0/8] Small changes #102 Martin Jansa
` (2 preceding siblings ...)
2012-10-24 23:54 ` [meta-oe][PATCH 3/8] imlib2: inherit binconfig Martin Jansa
@ 2012-10-24 23:54 ` Martin Jansa
2012-10-24 23:54 ` [meta-oe][PATCH 5/8] vala-terminal: " Martin Jansa
` (3 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Martin Jansa @ 2012-10-24 23:54 UTC (permalink / raw)
To: openembedded-devel
* we need to export XDG_DATA_DIRS
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta-oe/recipes-connectivity/midori/midori_0.4.6.bb | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta-oe/recipes-connectivity/midori/midori_0.4.6.bb b/meta-oe/recipes-connectivity/midori/midori_0.4.6.bb
index 8b1a982..db2c5e6 100644
--- a/meta-oe/recipes-connectivity/midori/midori_0.4.6.bb
+++ b/meta-oe/recipes-connectivity/midori/midori_0.4.6.bb
@@ -2,16 +2,16 @@ DESCRIPTION = "Midori is a lightweight web browser."
HOMEPAGE = "http://www.twotoasts.de/index.php?/pages/midori_summary.html"
LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
-DEPENDS = "webkit-gtk libsoup-2.4 libsexy openssl vala-native python-native python-docutils-native librsvg-native libnotify"
+DEPENDS = "webkit-gtk libsoup-2.4 libsexy openssl python-native python-docutils-native librsvg-native libnotify"
-PR = "r1"
+PR = "r2"
SRC_URI = "http://archive.xfce.org/src/apps/midori/0.4/midori-${PV}.tar.bz2;name=midori \
"
SRC_URI[midori.md5sum] = "3c3f0030611d9126ab90be48d44cab57"
SRC_URI[midori.sha256sum] = "910f47bd2b5f2998cd4fce45c08f9e282318820b68562d0bade2096b9a17e3ea"
-inherit gtk-icon-cache pkgconfig
+inherit gtk-icon-cache pkgconfig vala
do_configure() {
sed -i -e 's:, shell=False::g' -e s:/usr/X11R6/include::g -e s:/usr/X11R6/lib::g wscript
--
1.7.12.4
^ permalink raw reply related [flat|nested] 9+ messages in thread* [meta-oe][PATCH 5/8] vala-terminal: inherit vala
2012-10-24 23:54 [meta-oe][PATCH 0/8] Small changes #102 Martin Jansa
` (3 preceding siblings ...)
2012-10-24 23:54 ` [meta-oe][PATCH 4/8] midori: inherit vala Martin Jansa
@ 2012-10-24 23:54 ` Martin Jansa
2012-10-24 23:54 ` [meta-oe][PATCH 6/8] loudmouth: depend on libcheck instead of check Martin Jansa
` (2 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Martin Jansa @ 2012-10-24 23:54 UTC (permalink / raw)
To: openembedded-devel
* we need to export XDG_DATA_DIRS
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta-oe/recipes-support/vala-terminal/vala-terminal_git.bb | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/meta-oe/recipes-support/vala-terminal/vala-terminal_git.bb b/meta-oe/recipes-support/vala-terminal/vala-terminal_git.bb
index e81e952..4e76534 100644
--- a/meta-oe/recipes-support/vala-terminal/vala-terminal_git.bb
+++ b/meta-oe/recipes-support/vala-terminal/vala-terminal_git.bb
@@ -1,13 +1,14 @@
DESCRIPTION = "A lightweight Terminal Emulator based on libvte, written in Vala."
SECTION = "x11/applications"
-DEPENDS = "vala-native vte"
+DEPENDS = "vte"
SRCREV = "0fefa38087581f85fa0631b40500b9428369c146"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
PV = "1.3+gitr${SRCPV}"
PE = "1"
+PR = "r1"
-inherit autotools perlnative
+inherit autotools perlnative vala
SRC_URI = "${FREESMARTPHONE_GIT}/vala-terminal.git;protocol=git;branch=master"
S = "${WORKDIR}/git"
--
1.7.12.4
^ permalink raw reply related [flat|nested] 9+ messages in thread* [meta-oe][PATCH 6/8] loudmouth: depend on libcheck instead of check
2012-10-24 23:54 [meta-oe][PATCH 0/8] Small changes #102 Martin Jansa
` (4 preceding siblings ...)
2012-10-24 23:54 ` [meta-oe][PATCH 5/8] vala-terminal: " Martin Jansa
@ 2012-10-24 23:54 ` Martin Jansa
2012-10-24 23:54 ` [meta-oe][PATCH 7/8] check: drop from meta-oe, there is libcheck in oe-core Martin Jansa
2012-10-24 23:54 ` [meta-oe][PATCH 8/8] python-pyqt: don't bypass sstate with sip files Martin Jansa
7 siblings, 0 replies; 9+ messages in thread
From: Martin Jansa @ 2012-10-24 23:54 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta-oe/recipes-connectivity/loudmouth/loudmouth_1.4.3.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta-oe/recipes-connectivity/loudmouth/loudmouth_1.4.3.bb b/meta-oe/recipes-connectivity/loudmouth/loudmouth_1.4.3.bb
index 87852ee..8375386 100644
--- a/meta-oe/recipes-connectivity/loudmouth/loudmouth_1.4.3.bb
+++ b/meta-oe/recipes-connectivity/loudmouth/loudmouth_1.4.3.bb
@@ -4,11 +4,11 @@ HOMEPAGE = "http://www.loudmouth-project.org/"
LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=c4f38aef94828f6b280e00d1173be689"
-DEPENDS = "glib-2.0 check openssl"
+DEPENDS = "glib-2.0 libcheck openssl"
inherit gnomebase
-PR = "r1"
+PR = "r2"
SRC_URI += "file://04-use-pkg-config-for-gnutls.patch \
file://glib-2.32.patch"
--
1.7.12.4
^ permalink raw reply related [flat|nested] 9+ messages in thread* [meta-oe][PATCH 7/8] check: drop from meta-oe, there is libcheck in oe-core
2012-10-24 23:54 [meta-oe][PATCH 0/8] Small changes #102 Martin Jansa
` (5 preceding siblings ...)
2012-10-24 23:54 ` [meta-oe][PATCH 6/8] loudmouth: depend on libcheck instead of check Martin Jansa
@ 2012-10-24 23:54 ` Martin Jansa
2012-10-24 23:54 ` [meta-oe][PATCH 8/8] python-pyqt: don't bypass sstate with sip files Martin Jansa
7 siblings, 0 replies; 9+ messages in thread
From: Martin Jansa @ 2012-10-24 23:54 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../check/check-0.9.8/fix.automake-1.12.x.patch | 26 ----------------------
meta-oe/recipes-support/check/check_0.9.8.bb | 15 -------------
2 files changed, 41 deletions(-)
delete mode 100644 meta-oe/recipes-support/check/check-0.9.8/fix.automake-1.12.x.patch
delete mode 100644 meta-oe/recipes-support/check/check_0.9.8.bb
diff --git a/meta-oe/recipes-support/check/check-0.9.8/fix.automake-1.12.x.patch b/meta-oe/recipes-support/check/check-0.9.8/fix.automake-1.12.x.patch
deleted file mode 100644
index e11aabe..0000000
--- a/meta-oe/recipes-support/check/check-0.9.8/fix.automake-1.12.x.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Fixes this error:
-
-| /var/lib/jenkins/jobs/shr-core-branches/workspace/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/share/automake-1.12/am/ltlibrary.am: warning: 'libcompat.la': linking libtool libraries using a non-POSIX
-| /var/lib/jenkins/jobs/shr-core-branches/workspace/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/share/automake-1.12/am/ltlibrary.am: archiver requires 'AM_PROG_AR' in 'configure.ac'
-| lib/Makefile.am:3: while processing Libtool library 'libcompat.la'
-| /var/lib/jenkins/jobs/shr-core-branches/workspace/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/share/automake-1.12/am/ltlibrary.am: warning: 'libcheck.la': linking libtool libraries using a non-POSIX
-| /var/lib/jenkins/jobs/shr-core-branches/workspace/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/share/automake-1.12/am/ltlibrary.am: archiver requires 'AM_PROG_AR' in 'configure.ac'
-| src/Makefile.am:3: while processing Libtool library 'libcheck.la'
-| /var/lib/jenkins/jobs/shr-core-branches/workspace/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/share/automake-1.12/am/ltlibrary.am: warning: 'libcheckinternal.la': linking libtool libraries using a non-POSIX
-| /var/lib/jenkins/jobs/shr-core-branches/workspace/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/share/automake-1.12/am/ltlibrary.am: archiver requires 'AM_PROG_AR' in 'configure.ac'
-| src/Makefile.am:4: while processing Libtool library 'libcheckinternal.la'
-| autoreconf: automake failed with exit status: 1
-
-Upstream-Status: Pending
-
-diff -uNr check-0.9.8.orig//configure.ac check-0.9.8/configure.ac
---- check-0.9.8.orig//configure.ac 2009-09-23 12:50:08.000000000 +0200
-+++ check-0.9.8/configure.ac 2012-07-19 17:43:51.000000000 +0200
-@@ -102,6 +102,7 @@
- AC_PROG_INSTALL
- AC_PROG_LN_S
- AC_PROG_LIBTOOL
-+AM_PROG_AR
-
- # add these options to CFLAGS if the compiler supports them
- AC_DEFUN([AX_CFLAGS_ADD],[AX_C_CHECK_FLAG($1, , , CFLAGS="$CFLAGS $1")])
diff --git a/meta-oe/recipes-support/check/check_0.9.8.bb b/meta-oe/recipes-support/check/check_0.9.8.bb
deleted file mode 100644
index ca79740..0000000
--- a/meta-oe/recipes-support/check/check_0.9.8.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-DESCRIPTION = "a unit test framework for C"
-LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=2d5025d4aa3495befef8f17206a5b0a1"
-SECTION = "devel"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/check/check-${PV}.tar.gz \
- file://fix.automake-1.12.x.patch \
- "
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF += "--enable-plain-docdir"
-
-SRC_URI[md5sum] = "5d75e9a6027cde79d2c339ef261e7470"
-SRC_URI[sha256sum] = "82acf956bb07584ffea2bf04d5989fe939c3e74ecf93133a21037fd0f7996a7f"
--
1.7.12.4
^ permalink raw reply related [flat|nested] 9+ messages in thread* [meta-oe][PATCH 8/8] python-pyqt: don't bypass sstate with sip files
2012-10-24 23:54 [meta-oe][PATCH 0/8] Small changes #102 Martin Jansa
` (6 preceding siblings ...)
2012-10-24 23:54 ` [meta-oe][PATCH 7/8] check: drop from meta-oe, there is libcheck in oe-core Martin Jansa
@ 2012-10-24 23:54 ` Martin Jansa
7 siblings, 0 replies; 9+ messages in thread
From: Martin Jansa @ 2012-10-24 23:54 UTC (permalink / raw)
To: openembedded-devel
* discovered with http://patchwork.openembedded.org/patch/38521/
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta-oe/recipes-devtools/python/python-pyqt_4.9.5.bb | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/meta-oe/recipes-devtools/python/python-pyqt_4.9.5.bb b/meta-oe/recipes-devtools/python/python-pyqt_4.9.5.bb
index 5eef4c9..e248fbb 100644
--- a/meta-oe/recipes-devtools/python/python-pyqt_4.9.5.bb
+++ b/meta-oe/recipes-devtools/python/python-pyqt_4.9.5.bb
@@ -15,6 +15,7 @@ DEPENDS = "sip-native python-sip"
RDEPENDS_${PN} = "python-core"
PYQT_OE_VERSION = "Qt_4_8_3"
+PR = "r1"
SRC_URI = "\
${SOURCEFORGE_MIRROR}/pyqt/PyQt-x11-gpl-${PV}.tar.gz \
@@ -88,22 +89,15 @@ do_configure_prepend() {
do_install() {
install -d ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4
+ install -d ${D}${datadir}/sip/qt/
for module in ${SIP_MODULES}
do
+ install -m 0644 ${S}/sip/${module}/*.sip ${D}${datadir}/sip/qt/
echo "from PyQt4.${module} import *\n" >> ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/Qt.py
install -m 0755 ${module}/lib${module}.so ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/${module}.so
done
cp -pPR elementtree ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/
cp __init__.py ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/
-
- install -d ${STAGING_SIPDIR}/qt/
- install -d ${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages
- for module in ${SIP_MODULES}
- do
- install -m 0644 ${S}/sip/${module}/*.sip ${STAGING_SIPDIR}/qt/
- install -m 0755 ${module}/lib${module}.so ${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/${module}.so
- done
}
-FILES_${PN} = "${libdir}/${PYTHON_DIR}/site-packages"
-
+FILES_${PN} = "${libdir}/${PYTHON_DIR}/site-packages ${datadir}/sip/qt/"
--
1.7.12.4
^ permalink raw reply related [flat|nested] 9+ messages in thread