* [meta-oe][PATCH 0/5] navit, abiword fix
@ 2012-06-23 21:15 Martin Jansa
2012-06-23 21:15 ` [meta-oe][PATCH 1/5] navit: package whole ${datadir}/icons dir Martin Jansa
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: Martin Jansa @ 2012-06-23 21:15 UTC (permalink / raw)
To: openembedded-devel
The following changes since commit f3b72f9f147b27d2a9566cb417f7f84d746184df:
meta-initramfs: append to BBPATH instead of prepend so order of bblayers.conf is respected (2012-06-21 21:22:23 +0200)
are available in the git repository at:
git://git.openembedded.org/meta-openembedded-contrib jansa/pull
http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=jansa/pull
Martin Jansa (5):
navit: package whole ${datadir}/icons dir
navit: bump SRCREV and add patch from debian to fix build with
gcc-4.7.1
abiword: fix packaging after PACKAGES reorder
abiword: merge abiword-2.5.inc to abiword_2.8.6.bb
abiword: reorder and simplify
meta-gnome/recipes-gnome/abiword/abiword-2.5.inc | 66 -------------
meta-gnome/recipes-gnome/abiword/abiword_2.8.6.bb | 97 ++++++++++++++++----
meta-oe/recipes-navigation/navit/navit.inc | 10 +--
.../navit/taking-address-of-temporary-array.patch | 76 +++++++++++++++
meta-oe/recipes-navigation/navit/navit_svn.bb | 6 +-
5 files changed, 161 insertions(+), 94 deletions(-)
delete mode 100644 meta-gnome/recipes-gnome/abiword/abiword-2.5.inc
create mode 100644 meta-oe/recipes-navigation/navit/navit/taking-address-of-temporary-array.patch
--
1.7.8.6
^ permalink raw reply [flat|nested] 6+ messages in thread
* [meta-oe][PATCH 1/5] navit: package whole ${datadir}/icons dir
2012-06-23 21:15 [meta-oe][PATCH 0/5] navit, abiword fix Martin Jansa
@ 2012-06-23 21:15 ` Martin Jansa
2012-06-23 21:15 ` [meta-oe][PATCH 2/5] navit: bump SRCREV and add patch from debian to fix build with gcc-4.7.1 Martin Jansa
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Martin Jansa @ 2012-06-23 21:15 UTC (permalink / raw)
To: openembedded-devel
* no need to install icon and .desktop file manually, now it's done by autotools
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta-oe/recipes-navigation/navit/navit.inc | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/meta-oe/recipes-navigation/navit/navit.inc b/meta-oe/recipes-navigation/navit/navit.inc
index 1baa145..b2b89e5 100644
--- a/meta-oe/recipes-navigation/navit/navit.inc
+++ b/meta-oe/recipes-navigation/navit/navit.inc
@@ -13,7 +13,7 @@ RRECOMMENDS_${PN} = "gpsd ${PN}-dbus ${PN}-speech-cmdline ${PN}-gui-internal ${P
RSUGGESTS_${PN} = "flite-alsa espeak ${PN}-speech-dbus ${PN}-gui-gtk ${PN}-gui-qml ${PN}-graphics-sdl ${PN}-graphics-qt ${PN}-maptool"
PE = "1"
-INC_PR = "r8"
+INC_PR = "r9"
inherit autotools gettext
@@ -52,7 +52,7 @@ SRC_URI += "file://navit.xml \
file://plugins.xml \
"
-FILES_${PN} += "${libdir}/${PN}/*/*.so"
+FILES_${PN} += "${libdir}/${PN}/*/*.so ${datadir}/icons"
FILES_${PN}-dbg += "${libdir}/${PN}/*/.debug"
FILES_${PN}-maptool = " ${bindir}/maptool "
FILES_${PN}-config = " ${datadir}/navit/*.xml "
@@ -73,10 +73,6 @@ do_configure_prepend() {
}
do_install_append() {
- install -d ${D}${datadir}/applications/
- install -m 0644 ${S}/navit/xpm/desktop_icons/navit.desktop ${D}${datadir}/applications/
- install -d ${D}${datadir}/pixmaps/
- install -m 0644 ${S}/navit/xpm/desktop_icons/128x128/navit.png ${D}${datadir}/pixmaps/
# fix QA issue
sed -i 's#Categories=GTK;Utility;Geography;#Categories=Graphics;#g' ${D}${datadir}/applications/navit.desktop
--
1.7.8.6
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [meta-oe][PATCH 2/5] navit: bump SRCREV and add patch from debian to fix build with gcc-4.7.1
2012-06-23 21:15 [meta-oe][PATCH 0/5] navit, abiword fix Martin Jansa
2012-06-23 21:15 ` [meta-oe][PATCH 1/5] navit: package whole ${datadir}/icons dir Martin Jansa
@ 2012-06-23 21:15 ` Martin Jansa
2012-06-23 21:15 ` [meta-oe][PATCH 3/5] abiword: fix packaging after PACKAGES reorder Martin Jansa
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Martin Jansa @ 2012-06-23 21:15 UTC (permalink / raw)
To: openembedded-devel
* COPYING was updated in
http://navit.svn.sourceforge.net/viewvc/navit/trunk/navit/COPYING?r1=5023&r2=5022&pathrev=5023
just 2 more files listed in GPLv2, rest is in LGPL
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta-oe/recipes-navigation/navit/navit.inc | 2 +-
.../navit/taking-address-of-temporary-array.patch | 76 ++++++++++++++++++++
meta-oe/recipes-navigation/navit/navit_svn.bb | 6 +-
3 files changed, 81 insertions(+), 3 deletions(-)
create mode 100644 meta-oe/recipes-navigation/navit/navit/taking-address-of-temporary-array.patch
diff --git a/meta-oe/recipes-navigation/navit/navit.inc b/meta-oe/recipes-navigation/navit/navit.inc
index b2b89e5..dc2370b 100644
--- a/meta-oe/recipes-navigation/navit/navit.inc
+++ b/meta-oe/recipes-navigation/navit/navit.inc
@@ -1,6 +1,6 @@
DESCRIPTION = "Navit is a car navigation system with routing engine."
LICENSE = "GPLv2 LGPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=a4c51733b63d82df87995454bdc4b654 \
+LIC_FILES_CHKSUM = "file://COPYING;md5=ed539d099d6ce08de6ea0dfed9ecb333 \
file://LGPL-2;md5=3214f080875748938ba060314b4f727d \
file://GPL-2;md5=751419260aa954499f7abaabaa882bbe \
"
diff --git a/meta-oe/recipes-navigation/navit/navit/taking-address-of-temporary-array.patch b/meta-oe/recipes-navigation/navit/navit/taking-address-of-temporary-array.patch
new file mode 100644
index 0000000..8d3a416
--- /dev/null
+++ b/meta-oe/recipes-navigation/navit/navit/taking-address-of-temporary-array.patch
@@ -0,0 +1,76 @@
+Upstream-Status: Pending
+
+Description: Fix g++ error "taking address of temporary array"
+Author: Gilles Filippini <pini@debian.org>
+Forwarded: no
+Bug-Debian: http://bugs.debian.org/676006
+Last-Update: 2012-06-05
+Index: navit/navit/graphics/qt_qpainter/RenderArea.cpp
+===================================================================
+--- navit.orig/navit/graphics/qt_qpainter/RenderArea.cpp 2012-06-05 23:16:42.000000000 +0200
++++ navit/navit/graphics/qt_qpainter/RenderArea.cpp 2012-06-05 23:15:47.000000000 +0200
+@@ -239,13 +239,14 @@
+ #else
+ const char *text=str.toUtf8().constData();
+ #endif
++ char text1[2] = { '\0', '\0' };
+ dbg(0,"enter text='%s' 0x%x (%d) key=%d\n", text, text[0], strlen(text), event->key());
+ if (!text || !text[0] || text[0] == 0x7f) {
+ dbg(0,"special key\n");
+ switch (event->key()) {
+ case 4099:
+ {
+- text=(char []){NAVIT_KEY_BACKSPACE,'\0'};
++ text1[0] = NAVIT_KEY_BACKSPACE;
+ }
+ break;
+ case 4101:
+@@ -253,7 +254,7 @@
+ QT_QPAINTER_CUSTOM_RETURN
+ #endif
+ {
+- text=(char []){NAVIT_KEY_RETURN,'\0'};
++ text1[0] = NAVIT_KEY_RETURN;
+ }
+ break;
+ case 4114:
+@@ -261,7 +262,7 @@
+ QT_QPAINTER_CUSTOM_LEFT
+ #endif
+ {
+- text=(char []){NAVIT_KEY_LEFT,'\0'};
++ text1[0] = NAVIT_KEY_LEFT;
+ }
+ break;
+ case 4115:
+@@ -269,7 +270,7 @@
+ QT_QPAINTER_CUSTOM_UP
+ #endif
+ {
+- text=(char []){NAVIT_KEY_UP,'\0'};
++ text1[0] = NAVIT_KEY_UP;
+ }
+ break;
+ case 4116:
+@@ -277,7 +278,7 @@
+ QT_QPAINTER_CUSTOM_RIGHT
+ #endif
+ {
+- text=(char []){NAVIT_KEY_RIGHT,'\0'};
++ text1[0] = NAVIT_KEY_RIGHT;
+ }
+ break;
+ case 4117:
+@@ -285,10 +286,11 @@
+ QT_QPAINTER_CUSTOM_DOWN
+ #endif
+ {
+- text=(char []){NAVIT_KEY_DOWN,'\0'};
++ text1[0] = NAVIT_KEY_DOWN;
+ }
+ break;
+ }
++ if (text1[0]) text = text1;
+ }
+ callback_list_call_attr_1(this->cbl, attr_keypress, (void *)text);
+ event->accept();
diff --git a/meta-oe/recipes-navigation/navit/navit_svn.bb b/meta-oe/recipes-navigation/navit/navit_svn.bb
index 6d0b152..b3057b5 100644
--- a/meta-oe/recipes-navigation/navit/navit_svn.bb
+++ b/meta-oe/recipes-navigation/navit/navit_svn.bb
@@ -1,8 +1,10 @@
require navit.inc
-SRCREV = "4841"
+SRCREV = "5159"
PV = "0.2.0+svnr${SRCPV}"
PR = "${INC_PR}.2"
S = "${WORKDIR}/${PN}"
-SRC_URI += "svn://anonymous@navit.svn.sourceforge.net/svnroot/navit/trunk;module=navit;proto=http "
+SRC_URI += "svn://anonymous@navit.svn.sourceforge.net/svnroot/navit/trunk;module=navit;proto=http \
+ file://taking-address-of-temporary-array.patch \
+"
--
1.7.8.6
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [meta-oe][PATCH 3/5] abiword: fix packaging after PACKAGES reorder
2012-06-23 21:15 [meta-oe][PATCH 0/5] navit, abiword fix Martin Jansa
2012-06-23 21:15 ` [meta-oe][PATCH 1/5] navit: package whole ${datadir}/icons dir Martin Jansa
2012-06-23 21:15 ` [meta-oe][PATCH 2/5] navit: bump SRCREV and add patch from debian to fix build with gcc-4.7.1 Martin Jansa
@ 2012-06-23 21:15 ` Martin Jansa
2012-06-23 21:15 ` [meta-oe][PATCH 4/5] abiword: merge abiword-2.5.inc to abiword_2.8.6.bb Martin Jansa
2012-06-23 21:15 ` [meta-oe][PATCH 5/5] abiword: reorder and simplify Martin Jansa
4 siblings, 0 replies; 6+ messages in thread
From: Martin Jansa @ 2012-06-23 21:15 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta-gnome/recipes-gnome/abiword/abiword-2.5.inc | 1 +
meta-gnome/recipes-gnome/abiword/abiword_2.8.6.bb | 6 ++++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/meta-gnome/recipes-gnome/abiword/abiword-2.5.inc b/meta-gnome/recipes-gnome/abiword/abiword-2.5.inc
index 67a5ef4..9b5adcc 100644
--- a/meta-gnome/recipes-gnome/abiword/abiword-2.5.inc
+++ b/meta-gnome/recipes-gnome/abiword/abiword-2.5.inc
@@ -55,6 +55,7 @@ do_configure() {
do_install_append() {
install -d ${D}${datadir}/pixmaps/
mv ${D}${datadir}/icons/* ${D}${datadir}/pixmaps/
+ rmdir ${D}${datadir}/icons
}
PACKAGES += " abiword-clipart abiword-icons abiword-strings abiword-systemprofiles abiword-templates "
diff --git a/meta-gnome/recipes-gnome/abiword/abiword_2.8.6.bb b/meta-gnome/recipes-gnome/abiword/abiword_2.8.6.bb
index 53a980e..ba0b979 100644
--- a/meta-gnome/recipes-gnome/abiword/abiword_2.8.6.bb
+++ b/meta-gnome/recipes-gnome/abiword/abiword_2.8.6.bb
@@ -2,7 +2,7 @@ require abiword-2.5.inc
DEPENDS += " librsvg loudmouth libwmf-native gtkmathview asio"
RCONFLICTS_${PN} = "abiword-embedded"
-PR = "r3"
+PR = "r4"
SRC_URI = "http://www.abisource.com/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz;name=abiword \
file://autogen-common.sh \
@@ -58,6 +58,8 @@ python populate_packages_prepend () {
bb.data.setVar('PACKAGES', ' '.join(packages), d)
}
-FILES_${PN}-dev += "${libdir}/abiword-${SHRT_VER}/plugins/*.la"
+# don't steal /usr/lib/libabiword-2.8.so from ${PN}
+# in this case it's needed in ${PN}
+FILES_${PN}-dev = "${includedir} ${libdir}/pkgconfig ${libdir}/abiword*.la ${libdir}/abiword-${SHRT_VER}/plugins/*.la ${libdir}/libabiword*.la"
FILES_${PN}-dbg += "${libdir}/abiword-${SHRT_VER}/plugins/.debug"
FILES_${PN}-doc += "${datadir}/abiword-*/readme*"
--
1.7.8.6
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [meta-oe][PATCH 4/5] abiword: merge abiword-2.5.inc to abiword_2.8.6.bb
2012-06-23 21:15 [meta-oe][PATCH 0/5] navit, abiword fix Martin Jansa
` (2 preceding siblings ...)
2012-06-23 21:15 ` [meta-oe][PATCH 3/5] abiword: fix packaging after PACKAGES reorder Martin Jansa
@ 2012-06-23 21:15 ` Martin Jansa
2012-06-23 21:15 ` [meta-oe][PATCH 5/5] abiword: reorder and simplify Martin Jansa
4 siblings, 0 replies; 6+ messages in thread
From: Martin Jansa @ 2012-06-23 21:15 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta-gnome/recipes-gnome/abiword/abiword-2.5.inc | 67 --------------------
meta-gnome/recipes-gnome/abiword/abiword_2.8.6.bb | 69 ++++++++++++++++++++-
2 files changed, 68 insertions(+), 68 deletions(-)
delete mode 100644 meta-gnome/recipes-gnome/abiword/abiword-2.5.inc
diff --git a/meta-gnome/recipes-gnome/abiword/abiword-2.5.inc b/meta-gnome/recipes-gnome/abiword/abiword-2.5.inc
deleted file mode 100644
index 9b5adcc..0000000
--- a/meta-gnome/recipes-gnome/abiword/abiword-2.5.inc
+++ /dev/null
@@ -1,67 +0,0 @@
-DESCRIPTION = "AbiWord is free word processing program similar to Microsoft(r) Word"
-HOMEPAGE = "http://www.abiword.org"
-SECTION = "x11/office"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=ecd3ac329fca77e2d0e412bec38e1c20"
-DEPENDS = "perl-native wv libgsf libglade libfribidi jpeg libpng libxml2"
-RDEPENDS_${PN} = "glibc-gconv-ibm850 glibc-gconv-cp1252 \
- glibc-gconv-iso8859-15 glibc-gconv-iso8859-1"
-
-SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz \
- file://fix.double.install.patch \
-"
-SRC_URI[md5sum] = "bbc9c124f8072875129bd67092f0fa0b"
-SRC_URI[sha256sum] = "db34eeb5457fb7572fc76ec2a73cdb4f7a67307e7468b6c4bde820b58c598b3f"
-
-#want 2.x from 2.x.y for the installation directory
-SHRT_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
-
-FILES_${PN} += " \
- ${datadir}/icons/* \
- ${datadir}/abiword-${SHRT_VER}/glade \
- ${datadir}/abiword-${SHRT_VER}/scripts \
- ${datadir}/abiword-${SHRT_VER}/system.profile-en \
- ${datadir}/abiword-${SHRT_VER}/system.profile-en_GB \
- ${datadir}/abiword-${SHRT_VER}/templates/normal.awt \
- ${datadir}/abiword-${SHRT_VER}/templates/normal.awt-en_GB \
- ${datadir}/abiword-${SHRT_VER}/templates/Employee-Directory.awt \
- ${datadir}/abiword-${SHRT_VER}/templates/Business-Report.awt \
- ${datadir}/abiword-${SHRT_VER}/templates/Fax-Coversheet.awt \
- ${datadir}/abiword-${SHRT_VER}/templates/Resume.awt \
- ${datadir}/abiword-${SHRT_VER}/templates/Two-Columns.awt \
- ${datadir}/abiword-${SHRT_VER}/templates/Memo.awt \
- ${datadir}/abiword-${SHRT_VER}/templates/Press-Release.awt "
-
-inherit autotools pkgconfig
-
-PARALLEL_MAKE = ""
-
-EXTRA_OECONF = " --disable-pspell \
- --disable-spellcheck \
- --disable-printing \
- --disable-exports \
- --with-sys-wv"
-
-# AbiWord configure.ac does not play nicely with autoreconf
-# so use the autogen.sh script that comes with AbiWord
-#
-do_configure() {
- cd ${S}
- export NOCONFIGURE="no"; ./autogen.sh
- oe_runconf
-}
-
-
-do_install_append() {
- install -d ${D}${datadir}/pixmaps/
- mv ${D}${datadir}/icons/* ${D}${datadir}/pixmaps/
- rmdir ${D}${datadir}/icons
-}
-
-PACKAGES += " abiword-clipart abiword-icons abiword-strings abiword-systemprofiles abiword-templates "
-
-FILES_abiword-clipart += "${datadir}/abiword-${SHRT_VER}/clipart"
-FILES_abiword-icons += "${datadir}/abiword-${SHRT_VER}/icons"
-FILES_abiword-strings += "${datadir}/abiword-${SHRT_VER}/AbiWord/strings"
-FILES_abiword-systemprofiles += "${datadir}/abiword-${SHRT_VER}/AbiWord/system.profile*"
-FILES_abiword-templates += "${datadir}/abiword-${SHRT_VER}/templates"
diff --git a/meta-gnome/recipes-gnome/abiword/abiword_2.8.6.bb b/meta-gnome/recipes-gnome/abiword/abiword_2.8.6.bb
index ba0b979..927c33a 100644
--- a/meta-gnome/recipes-gnome/abiword/abiword_2.8.6.bb
+++ b/meta-gnome/recipes-gnome/abiword/abiword_2.8.6.bb
@@ -1,4 +1,71 @@
-require abiword-2.5.inc
+DESCRIPTION = "AbiWord is free word processing program similar to Microsoft(r) Word"
+HOMEPAGE = "http://www.abiword.org"
+SECTION = "x11/office"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=ecd3ac329fca77e2d0e412bec38e1c20"
+DEPENDS = "perl-native wv libgsf libglade libfribidi jpeg libpng libxml2"
+RDEPENDS_${PN} = "glibc-gconv-ibm850 glibc-gconv-cp1252 \
+ glibc-gconv-iso8859-15 glibc-gconv-iso8859-1"
+
+SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz \
+ file://fix.double.install.patch \
+"
+SRC_URI[md5sum] = "bbc9c124f8072875129bd67092f0fa0b"
+SRC_URI[sha256sum] = "db34eeb5457fb7572fc76ec2a73cdb4f7a67307e7468b6c4bde820b58c598b3f"
+
+#want 2.x from 2.x.y for the installation directory
+SHRT_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
+
+FILES_${PN} += " \
+ ${datadir}/icons/* \
+ ${datadir}/abiword-${SHRT_VER}/glade \
+ ${datadir}/abiword-${SHRT_VER}/scripts \
+ ${datadir}/abiword-${SHRT_VER}/system.profile-en \
+ ${datadir}/abiword-${SHRT_VER}/system.profile-en_GB \
+ ${datadir}/abiword-${SHRT_VER}/templates/normal.awt \
+ ${datadir}/abiword-${SHRT_VER}/templates/normal.awt-en_GB \
+ ${datadir}/abiword-${SHRT_VER}/templates/Employee-Directory.awt \
+ ${datadir}/abiword-${SHRT_VER}/templates/Business-Report.awt \
+ ${datadir}/abiword-${SHRT_VER}/templates/Fax-Coversheet.awt \
+ ${datadir}/abiword-${SHRT_VER}/templates/Resume.awt \
+ ${datadir}/abiword-${SHRT_VER}/templates/Two-Columns.awt \
+ ${datadir}/abiword-${SHRT_VER}/templates/Memo.awt \
+ ${datadir}/abiword-${SHRT_VER}/templates/Press-Release.awt "
+
+inherit autotools pkgconfig
+
+PARALLEL_MAKE = ""
+
+EXTRA_OECONF = " --disable-pspell \
+ --disable-spellcheck \
+ --disable-printing \
+ --disable-exports \
+ --with-sys-wv"
+
+# AbiWord configure.ac does not play nicely with autoreconf
+# so use the autogen.sh script that comes with AbiWord
+#
+do_configure() {
+ cd ${S}
+ export NOCONFIGURE="no"; ./autogen.sh
+ oe_runconf
+}
+
+
+do_install_append() {
+ install -d ${D}${datadir}/pixmaps/
+ mv ${D}${datadir}/icons/* ${D}${datadir}/pixmaps/
+ rmdir ${D}${datadir}/icons
+}
+
+PACKAGES += " abiword-clipart abiword-icons abiword-strings abiword-systemprofiles abiword-templates "
+
+FILES_abiword-clipart += "${datadir}/abiword-${SHRT_VER}/clipart"
+FILES_abiword-icons += "${datadir}/abiword-${SHRT_VER}/icons"
+FILES_abiword-strings += "${datadir}/abiword-${SHRT_VER}/AbiWord/strings"
+FILES_abiword-systemprofiles += "${datadir}/abiword-${SHRT_VER}/AbiWord/system.profile*"
+FILES_abiword-templates += "${datadir}/abiword-${SHRT_VER}/templates"
+
DEPENDS += " librsvg loudmouth libwmf-native gtkmathview asio"
RCONFLICTS_${PN} = "abiword-embedded"
--
1.7.8.6
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [meta-oe][PATCH 5/5] abiword: reorder and simplify
2012-06-23 21:15 [meta-oe][PATCH 0/5] navit, abiword fix Martin Jansa
` (3 preceding siblings ...)
2012-06-23 21:15 ` [meta-oe][PATCH 4/5] abiword: merge abiword-2.5.inc to abiword_2.8.6.bb Martin Jansa
@ 2012-06-23 21:15 ` Martin Jansa
4 siblings, 0 replies; 6+ messages in thread
From: Martin Jansa @ 2012-06-23 21:15 UTC (permalink / raw)
To: openembedded-devel
* there was overlap from .inc and bb (e.g. do_configure/EXTRA_OECONF twice)
* simplify SRC_URI
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta-gnome/recipes-gnome/abiword/abiword_2.8.6.bb | 152 ++++++++++-----------
1 files changed, 71 insertions(+), 81 deletions(-)
diff --git a/meta-gnome/recipes-gnome/abiword/abiword_2.8.6.bb b/meta-gnome/recipes-gnome/abiword/abiword_2.8.6.bb
index 927c33a..6e1dc4e 100644
--- a/meta-gnome/recipes-gnome/abiword/abiword_2.8.6.bb
+++ b/meta-gnome/recipes-gnome/abiword/abiword_2.8.6.bb
@@ -3,75 +3,13 @@ HOMEPAGE = "http://www.abiword.org"
SECTION = "x11/office"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=ecd3ac329fca77e2d0e412bec38e1c20"
-DEPENDS = "perl-native wv libgsf libglade libfribidi jpeg libpng libxml2"
+DEPENDS = "perl-native wv libgsf libglade libfribidi jpeg libpng libxml2 \
+ librsvg loudmouth libwmf-native gtkmathview asio"
RDEPENDS_${PN} = "glibc-gconv-ibm850 glibc-gconv-cp1252 \
glibc-gconv-iso8859-15 glibc-gconv-iso8859-1"
+RCONFLICTS_${PN} = "${PN}-embedded"
-SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz \
- file://fix.double.install.patch \
-"
-SRC_URI[md5sum] = "bbc9c124f8072875129bd67092f0fa0b"
-SRC_URI[sha256sum] = "db34eeb5457fb7572fc76ec2a73cdb4f7a67307e7468b6c4bde820b58c598b3f"
-
-#want 2.x from 2.x.y for the installation directory
-SHRT_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
-
-FILES_${PN} += " \
- ${datadir}/icons/* \
- ${datadir}/abiword-${SHRT_VER}/glade \
- ${datadir}/abiword-${SHRT_VER}/scripts \
- ${datadir}/abiword-${SHRT_VER}/system.profile-en \
- ${datadir}/abiword-${SHRT_VER}/system.profile-en_GB \
- ${datadir}/abiword-${SHRT_VER}/templates/normal.awt \
- ${datadir}/abiword-${SHRT_VER}/templates/normal.awt-en_GB \
- ${datadir}/abiword-${SHRT_VER}/templates/Employee-Directory.awt \
- ${datadir}/abiword-${SHRT_VER}/templates/Business-Report.awt \
- ${datadir}/abiword-${SHRT_VER}/templates/Fax-Coversheet.awt \
- ${datadir}/abiword-${SHRT_VER}/templates/Resume.awt \
- ${datadir}/abiword-${SHRT_VER}/templates/Two-Columns.awt \
- ${datadir}/abiword-${SHRT_VER}/templates/Memo.awt \
- ${datadir}/abiword-${SHRT_VER}/templates/Press-Release.awt "
-
-inherit autotools pkgconfig
-
-PARALLEL_MAKE = ""
-
-EXTRA_OECONF = " --disable-pspell \
- --disable-spellcheck \
- --disable-printing \
- --disable-exports \
- --with-sys-wv"
-
-# AbiWord configure.ac does not play nicely with autoreconf
-# so use the autogen.sh script that comes with AbiWord
-#
-do_configure() {
- cd ${S}
- export NOCONFIGURE="no"; ./autogen.sh
- oe_runconf
-}
-
-
-do_install_append() {
- install -d ${D}${datadir}/pixmaps/
- mv ${D}${datadir}/icons/* ${D}${datadir}/pixmaps/
- rmdir ${D}${datadir}/icons
-}
-
-PACKAGES += " abiword-clipart abiword-icons abiword-strings abiword-systemprofiles abiword-templates "
-
-FILES_abiword-clipart += "${datadir}/abiword-${SHRT_VER}/clipart"
-FILES_abiword-icons += "${datadir}/abiword-${SHRT_VER}/icons"
-FILES_abiword-strings += "${datadir}/abiword-${SHRT_VER}/AbiWord/strings"
-FILES_abiword-systemprofiles += "${datadir}/abiword-${SHRT_VER}/AbiWord/system.profile*"
-FILES_abiword-templates += "${datadir}/abiword-${SHRT_VER}/templates"
-
-DEPENDS += " librsvg loudmouth libwmf-native gtkmathview asio"
-RCONFLICTS_${PN} = "abiword-embedded"
-
-PR = "r4"
-
-SRC_URI = "http://www.abisource.com/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz;name=abiword \
+SRC_URI = "http://www.abisource.com/downloads/${BPN}/${PV}/source/${BP}.tar.gz \
file://autogen-common.sh \
file://nodolt.patch \
file://fix.no.undefined.param.patch \
@@ -79,9 +17,17 @@ SRC_URI = "http://www.abisource.com/downloads/abiword/${PV}/source/abiword-${PV}
LIC_FILES_CHKSUM = "file://COPYING;md5=ecd3ac329fca77e2d0e412bec38e1c20"
-SRC_URI[abiword.md5sum] = "f883b0a7f26229a9c66fd6a1a94381aa"
-SRC_URI[abiword.sha256sum] = "d99089a63a6cfc1a6a4a026be9278028d47d224088d24b1853acb67e95683a15"
+SRC_URI[md5sum] = "f883b0a7f26229a9c66fd6a1a94381aa"
+SRC_URI[sha256sum] = "d99089a63a6cfc1a6a4a026be9278028d47d224088d24b1853acb67e95683a15"
+
+#want 2.x from 2.x.y for the installation directory
+SHRT_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
+
+PR = "r6"
+
+inherit autotools pkgconfig
+PARALLEL_MAKE = ""
EXTRA_OECONF = " --disable-static \
--enable-plugins \
@@ -92,6 +38,8 @@ EXTRA_OECONF = " --disable-static \
--with-libwmf-config=${STAGING_DIR} \
"
+# AbiWord configure.ac does not play nicely with autoreconf
+# so use the autogen.sh script that comes with AbiWord
do_configure() {
install -m 0755 ${WORKDIR}/autogen-common.sh ${S}/autogen-common.sh
cd ${S}
@@ -99,11 +47,59 @@ do_configure() {
autotools_do_configure
}
-FILES_${PN} += "${libdir}/libabiword-*.so ${datadir}/mime-info ${datadir}/abiword-${SHRT_VER}/certs ${datadir}/abiword-${SHRT_VER}/ui ${datadir}/abiword-${SHRT_VER}/xsl* ${datadir}/abiword-${SHRT_VER}/mime-info ${datadir}/abiword-${SHRT_VER}/Pr*.xml"
-FILES_abiword-strings += "${datadir}/abiword-${SHRT_VER}/strings"
-FILES_abiword-systemprofiles += "${datadir}/abiword-${SHRT_VER}/system.profile*"
+do_install_append() {
+ install -d ${D}${datadir}/pixmaps/
+ mv ${D}${datadir}/icons/* ${D}${datadir}/pixmaps/
+ rmdir ${D}${datadir}/icons
+}
+
+PACKAGES += " ${PN}-clipart ${PN}-icons ${PN}-strings ${PN}-systemprofiles ${PN}-templates "
-PACKAGES_DYNAMIC = "abiword-meta abiword-plugin-*"
+FILES_${PN} += " \
+ ${libdir}/lib${PN}-*.so \
+ ${datadir}/mime-info \
+ ${datadir}/icons/* \
+ ${datadir}/${PN}-${SHRT_VER}/glade \
+ ${datadir}/${PN}-${SHRT_VER}/scripts \
+ ${datadir}/${PN}-${SHRT_VER}/system.profile-en \
+ ${datadir}/${PN}-${SHRT_VER}/system.profile-en_GB \
+ ${datadir}/${PN}-${SHRT_VER}/templates/normal.awt \
+ ${datadir}/${PN}-${SHRT_VER}/templates/normal.awt-en_GB \
+ ${datadir}/${PN}-${SHRT_VER}/templates/Employee-Directory.awt \
+ ${datadir}/${PN}-${SHRT_VER}/templates/Business-Report.awt \
+ ${datadir}/${PN}-${SHRT_VER}/templates/Fax-Coversheet.awt \
+ ${datadir}/${PN}-${SHRT_VER}/templates/Resume.awt \
+ ${datadir}/${PN}-${SHRT_VER}/templates/Two-Columns.awt \
+ ${datadir}/${PN}-${SHRT_VER}/templates/Memo.awt \
+ ${datadir}/${PN}-${SHRT_VER}/templates/Press-Release.awt \
+ ${datadir}/${PN}-${SHRT_VER}/certs \
+ ${datadir}/${PN}-${SHRT_VER}/ui \
+ ${datadir}/${PN}-${SHRT_VER}/xsl* \
+ ${datadir}/${PN}-${SHRT_VER}/mime-info \
+ ${datadir}/${PN}-${SHRT_VER}/Pr*.xml \
+"
+
+# don't steal /usr/lib/libabiword-2.8.so from ${PN}
+# in this case it's needed in ${PN}
+FILES_${PN}-dev = " \
+ ${includedir} \
+ ${libdir}/pkgconfig \
+ ${libdir}/${PN}*.la \
+ ${libdir}/lib${PN}*.la \
+ ${libdir}/${PN}-${SHRT_VER}/plugins/*.la \
+"
+FILES_${PN}-dbg += "${libdir}/${PN}-${SHRT_VER}/plugins/.debug"
+FILES_${PN}-doc += "${datadir}/${PN}-*/readme*"
+
+FILES_${PN}-strings += "${datadir}/${PN}-${SHRT_VER}/strings"
+FILES_${PN}-systemprofiles += "${datadir}/${PN}-${SHRT_VER}/system.profile*"
+FILES_${PN}-clipart += "${datadir}/${PN}-${SHRT_VER}/clipart"
+FILES_${PN}-icons += "${datadir}/${PN}-${SHRT_VER}/icons"
+FILES_${PN}-strings += "${datadir}/${PN}-${SHRT_VER}/AbiWord/strings"
+FILES_${PN}-systemprofiles += "${datadir}/${PN}-${SHRT_VER}/AbiWord/system.profile*"
+FILES_${PN}-templates += "${datadir}/${PN}-${SHRT_VER}/templates"
+
+PACKAGES_DYNAMIC = "${PN}-meta ${PN}-plugin-*"
python populate_packages_prepend () {
abiword_libdir = bb.data.expand('${libdir}/abiword-2.8/plugins', d)
@@ -116,17 +112,11 @@ python populate_packages_prepend () {
metapkg_rdepends = []
packages = bb.data.getVar('PACKAGES', d, 1).split()
for pkg in packages[1:]:
- if not pkg in blacklist and not pkg in metapkg_rdepends and not pkg.count("-dev") and not pkg.count("-dbg") and not pkg.count("static") and not pkg.count("locale") and not pkg.count("abiword-doc"):
- print "Modifying ", pkg
- metapkg_rdepends.append(pkg)
+ if not pkg in blacklist and not pkg in metapkg_rdepends and not pkg.count("-dev") and not pkg.count("-dbg") and not pkg.count("static") and not pkg.count("locale") and not pkg.count("abiword-doc"):
+ print "Modifying ", pkg
+ metapkg_rdepends.append(pkg)
bb.data.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends), d)
bb.data.setVar('DESCRIPTION_' + metapkg, 'abiword-plugin meta package', d)
packages.append(metapkg)
bb.data.setVar('PACKAGES', ' '.join(packages), d)
}
-
-# don't steal /usr/lib/libabiword-2.8.so from ${PN}
-# in this case it's needed in ${PN}
-FILES_${PN}-dev = "${includedir} ${libdir}/pkgconfig ${libdir}/abiword*.la ${libdir}/abiword-${SHRT_VER}/plugins/*.la ${libdir}/libabiword*.la"
-FILES_${PN}-dbg += "${libdir}/abiword-${SHRT_VER}/plugins/.debug"
-FILES_${PN}-doc += "${datadir}/abiword-*/readme*"
--
1.7.8.6
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-06-23 21:27 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-06-23 21:15 [meta-oe][PATCH 0/5] navit, abiword fix Martin Jansa
2012-06-23 21:15 ` [meta-oe][PATCH 1/5] navit: package whole ${datadir}/icons dir Martin Jansa
2012-06-23 21:15 ` [meta-oe][PATCH 2/5] navit: bump SRCREV and add patch from debian to fix build with gcc-4.7.1 Martin Jansa
2012-06-23 21:15 ` [meta-oe][PATCH 3/5] abiword: fix packaging after PACKAGES reorder Martin Jansa
2012-06-23 21:15 ` [meta-oe][PATCH 4/5] abiword: merge abiword-2.5.inc to abiword_2.8.6.bb Martin Jansa
2012-06-23 21:15 ` [meta-oe][PATCH 5/5] abiword: reorder and simplify Martin Jansa
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox