mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-05-07 05:10:20 +00:00
Code Issues Projects Releases Wiki Activity

abiword: fix install, newer versions doesn't allow to overwrite just installed files

Browse Source 
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Martin Jansa
2011-10-18 00:57:40 +02:00
parent e5e2e10689
commit 6e5b153413
4 changed files with 41 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-gnome/recipes-gnome/abiword/abiword-2.5.inc
+3 -1
View File
@@ -7,7 +7,9 @@ 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"
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"
meta-gnome/recipes-gnome/abiword/abiword-2.5/fix.double.install.patch
+34
View File
@@ -0,0 +1,34 @@
Upstream-Status: Pending
Without this patch it fails with:
| 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'
| make[6]: Nothing to be done for `install-exec-am'.
| 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"
| /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
de 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
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
_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-
linux-gnueabi/abiword-2.5.2-r2/image/usr/share/abiword-2.5/glade'
| /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
ptions.glade'
| /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
rFtr.glade'
| make[6]: *** [install-gladeDATA] Error 1
| 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'
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
diff -uNr abiword-2.5.2.orig/src/wp/ap/unix/GNUmakefile.am abiword-2.5.2/src/wp/ap/unix/GNUmakefile.am
--- abiword-2.5.2.orig/src/wp/ap/unix/GNUmakefile.am 2007-06-04 17:17:01.000000000 +0200
+++ abiword-2.5.2/src/wp/ap/unix/GNUmakefile.am 2011-10-18 00:48:05.247378444 +0200
@@ -69,9 +69,7 @@
ap_UnixDialog_Stylist_modal.glade \
ap_UnixDialog_Tab.glade \
ap_UnixDialog_WordCount.glade \
- ap_UnixDialog_Latex.glade \
- ap_UnixDialog_Options.glade \
- ap_UnixDialog_HdrFtr.glade
+ ap_UnixDialog_Latex.glade
if ENABLE_SPELL
spellsrc= ap_UnixDialog_Spell.cpp
meta-gnome/recipes-gnome/abiword/abiword-embedded_2.5.2.bb
+2 -2
View File
@@ -1,6 +1,6 @@
require abiword-2.5.inc
PR = "r1"
FILESEXTRAPATHS_prepend := "${THISDIR}/abiword-${SHRT_VER}:"
PR = "r2"
EXTRA_OECONF += "--enable-embedded"
meta-gnome/recipes-gnome/abiword/abiword_2.5.2.bb
+2 -2
View File
@@ -1,5 +1,5 @@
require abiword-2.5.inc
PR = "r2"
FILESEXTRAPATHS_prepend := "${THISDIR}/abiword-${SHRT_VER}:"
PR = "r3"
RCONFLICTS_${PN} = "abiword-embedded"