summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2011-10-18 00:57:40 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2011-10-18 01:31:11 +0200
commit6e5b1534132d8cd754623a830deff1ed55ecf447 (patch)
treec42c15180266f06c8b5e849b20ac10f2d62e7cf7
parente5e2e10689c13de55ba1bf26cfafce177154d9c0 (diff)
downloadmeta-openembedded-6e5b1534132d8cd754623a830deff1ed55ecf447.tar.gz
abiword: fix install, newer versions doesn't allow to overwrite just installed files
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--meta-gnome/recipes-gnome/abiword/abiword-2.5.inc4
-rw-r--r--meta-gnome/recipes-gnome/abiword/abiword-2.5/fix.double.install.patch34
-rw-r--r--meta-gnome/recipes-gnome/abiword/abiword-embedded_2.5.2.bb4
-rw-r--r--meta-gnome/recipes-gnome/abiword/abiword_2.5.2.bb4
4 files changed, 41 insertions, 5 deletions
diff --git a/meta-gnome/recipes-gnome/abiword/abiword-2.5.inc b/meta-gnome/recipes-gnome/abiword/abiword-2.5.inc
index c469369d2..67a5ef4bf 100644
--- a/meta-gnome/recipes-gnome/abiword/abiword-2.5.inc
+++ b/meta-gnome/recipes-gnome/abiword/abiword-2.5.inc
@@ -7,7 +7,9 @@ DEPENDS = "perl-native wv libgsf libglade libfribidi jpeg libpng libxml2"
7RDEPENDS_${PN} = "glibc-gconv-ibm850 glibc-gconv-cp1252 \ 7RDEPENDS_${PN} = "glibc-gconv-ibm850 glibc-gconv-cp1252 \
8 glibc-gconv-iso8859-15 glibc-gconv-iso8859-1" 8 glibc-gconv-iso8859-15 glibc-gconv-iso8859-1"
9 9
10SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz" 10SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz \
11 file://fix.double.install.patch \
12"
11SRC_URI[md5sum] = "bbc9c124f8072875129bd67092f0fa0b" 13SRC_URI[md5sum] = "bbc9c124f8072875129bd67092f0fa0b"
12SRC_URI[sha256sum] = "db34eeb5457fb7572fc76ec2a73cdb4f7a67307e7468b6c4bde820b58c598b3f" 14SRC_URI[sha256sum] = "db34eeb5457fb7572fc76ec2a73cdb4f7a67307e7468b6c4bde820b58c598b3f"
13 15
diff --git a/meta-gnome/recipes-gnome/abiword/abiword-2.5/fix.double.install.patch b/meta-gnome/recipes-gnome/abiword/abiword-2.5/fix.double.install.patch
new file mode 100644
index 000000000..67db139b8
--- /dev/null
+++ b/meta-gnome/recipes-gnome/abiword/abiword-2.5/fix.double.install.patch
@@ -0,0 +1,34 @@
1Upstream-Status: Pending
2
3Without this patch it fails with:
4| make[6]: Entering directory `/OE/shr-core/tmp/work/armv7a-vfp-neon-oe-linux-gnueabi/abiword-2.5.2-r2/abiword-2.5.2/src/wp/ap/unix'
5| make[6]: Nothing to be done for `install-exec-am'.
6| test -z "/usr/share/abiword-2.5/glade" || /bin/mkdir -p "/OE/shr-core/tmp/work/armv7a-vfp-neon-oe-linux-gnueabi/abiword-2.5.2-r2/image/usr/share/abiword-2.5/glade"
7| /usr/bin/install -c -m 644 ap_UnixDialog_Break.glade ap_UnixDialog_Field.glade ap_UnixDialog_FormatTOC.glade ap_UnixDialog_FormatFootnotes.glade ap_UnixDialog_FormatTable.glade ap_UnixDialog_FormatFrame.gla
8de ap_UnixDialog_Goto.glade ap_UnixDialog_InsertTable.glade ap_UnixDialog_Insert_DateTime.glade ap_UnixDialog_MailMerge.glade ap_UnixDialog_MetaData.glade ap_UnixDialog_Options.glade ap_UnixDialog_HdrFtr.glade
9 ap_UnixDialog_Options_ColorSel.glade ap_UnixDialog_PageNumbers.glade ap_UnixDialog_PageSetup.glade ap_UnixDialog_Replace.glade ap_UnixDialog_New.glade ap_UnixDialog_Styles.glade ap_UnixDialog_Stylist.glade ap
10 _UnixDialog_Stylist_modal.glade ap_UnixDialog_Tab.glade ap_UnixDialog_WordCount.glade ap_UnixDialog_Latex.glade ap_UnixDialog_Options.glade ap_UnixDialog_HdrFtr.glade '/OE/shr-core/tmp/work/armv7a-vfp-neon-oe-
11 linux-gnueabi/abiword-2.5.2-r2/image/usr/share/abiword-2.5/glade'
12 | /usr/bin/install: will not overwrite just-created `/OE/shr-core/tmp/work/armv7a-vfp-neon-oe-linux-gnueabi/abiword-2.5.2-r2/image/usr/share/abiword-2.5/glade/ap_UnixDialog_Options.glade' with `ap_UnixDialog_O
13 ptions.glade'
14 | /usr/bin/install: will not overwrite just-created `/OE/shr-core/tmp/work/armv7a-vfp-neon-oe-linux-gnueabi/abiword-2.5.2-r2/image/usr/share/abiword-2.5/glade/ap_UnixDialog_HdrFtr.glade' with `ap_UnixDialog_Hd
15 rFtr.glade'
16 | make[6]: *** [install-gladeDATA] Error 1
17 | make[6]: Leaving directory `/OE/shr-core/tmp/work/armv7a-vfp-neon-oe-linux-gnueabi/abiword-2.5.2-r2/abiword-2.5.2/src/wp/ap/unix'
18
19Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
20
21diff -uNr abiword-2.5.2.orig/src/wp/ap/unix/GNUmakefile.am abiword-2.5.2/src/wp/ap/unix/GNUmakefile.am
22--- abiword-2.5.2.orig/src/wp/ap/unix/GNUmakefile.am 2007-06-04 17:17:01.000000000 +0200
23+++ abiword-2.5.2/src/wp/ap/unix/GNUmakefile.am 2011-10-18 00:48:05.247378444 +0200
24@@ -69,9 +69,7 @@
25 ap_UnixDialog_Stylist_modal.glade \
26 ap_UnixDialog_Tab.glade \
27 ap_UnixDialog_WordCount.glade \
28- ap_UnixDialog_Latex.glade \
29- ap_UnixDialog_Options.glade \
30- ap_UnixDialog_HdrFtr.glade
31+ ap_UnixDialog_Latex.glade
32
33 if ENABLE_SPELL
34 spellsrc= ap_UnixDialog_Spell.cpp
diff --git a/meta-gnome/recipes-gnome/abiword/abiword-embedded_2.5.2.bb b/meta-gnome/recipes-gnome/abiword/abiword-embedded_2.5.2.bb
index 7ee0f866a..edb55dd7a 100644
--- a/meta-gnome/recipes-gnome/abiword/abiword-embedded_2.5.2.bb
+++ b/meta-gnome/recipes-gnome/abiword/abiword-embedded_2.5.2.bb
@@ -1,6 +1,6 @@
1require abiword-2.5.inc 1require abiword-2.5.inc
2 2FILESEXTRAPATHS_prepend := "${THISDIR}/abiword-${SHRT_VER}:"
3PR = "r1" 3PR = "r2"
4 4
5EXTRA_OECONF += "--enable-embedded" 5EXTRA_OECONF += "--enable-embedded"
6 6
diff --git a/meta-gnome/recipes-gnome/abiword/abiword_2.5.2.bb b/meta-gnome/recipes-gnome/abiword/abiword_2.5.2.bb
index c10d761b0..91e05d3c9 100644
--- a/meta-gnome/recipes-gnome/abiword/abiword_2.5.2.bb
+++ b/meta-gnome/recipes-gnome/abiword/abiword_2.5.2.bb
@@ -1,5 +1,5 @@
1require abiword-2.5.inc 1require abiword-2.5.inc
2 2FILESEXTRAPATHS_prepend := "${THISDIR}/abiword-${SHRT_VER}:"
3PR = "r2" 3PR = "r3"
4 4
5RCONFLICTS_${PN} = "abiword-embedded" 5RCONFLICTS_${PN} = "abiword-embedded"