From: Koen Kooi Date: Mon, 21 Nov 2011 13:15:59 +0000 (+0100) Subject: abiword: update to 2.8.6 X-Git-Tag: rev_ivi_2015_02_04~5303 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fe8db97444432ba47c31d8e3464973583c7f9ef2;p=scm%2Fbb%2Ftizen-distro.git abiword: update to 2.8.6 (From meta-openembedded rev: dea4a2dce2d247dcc9f6233e195b8497039f8547) Signed-off-by: Koen Kooi Signed-off-by: Patrick Ohly --- diff --git a/meta-openembedded/meta-gnome/recipes-gnome/abiword/abiword-2.5/fix.double.install.patch b/meta-openembedded/meta-gnome/recipes-gnome/abiword/abiword-2.5/fix.double.install.patch deleted file mode 100644 index 67db139..0000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/abiword/abiword-2.5/fix.double.install.patch +++ /dev/null @@ -1,34 +0,0 @@ -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 - -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 diff --git a/meta-openembedded/meta-gnome/recipes-gnome/abiword/abiword-embedded_2.5.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/abiword/abiword-embedded_2.5.2.bb deleted file mode 100644 index edb55dd..0000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/abiword/abiword-embedded_2.5.2.bb +++ /dev/null @@ -1,12 +0,0 @@ -require abiword-2.5.inc -FILESEXTRAPATHS_prepend := "${THISDIR}/abiword-${SHRT_VER}:" -PR = "r2" - -EXTRA_OECONF += "--enable-embedded" - -S = "${WORKDIR}/abiword-${PV}" - -RCONFLICTS = "abiword" -RPROVIDES += "abiword" - - diff --git a/meta-openembedded/meta-gnome/recipes-gnome/abiword/abiword/abiword-cxx-for-ld-fix.patch b/meta-openembedded/meta-gnome/recipes-gnome/abiword/abiword/abiword-cxx-for-ld-fix.patch new file mode 100644 index 0000000..e49b1e9 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/abiword/abiword/abiword-cxx-for-ld-fix.patch @@ -0,0 +1,12 @@ +libstc++ isn't in staging anymore, so we must use g++ for linking + +--- /tmp/configure.ac 2008-03-31 11:39:13.130631737 +0200 ++++ abiword-plugins-2.6.0/configure.ac 2008-03-31 11:39:22.754586487 +0200 +@@ -14,6 +14,7 @@ + AC_PROG_INSTALL + AC_PROG_LN_S + AC_PROG_MAKE_SET ++AC_LANG_CPLUSPLUS + + AM_INIT_AUTOMAKE + diff --git a/meta-openembedded/meta-gnome/recipes-gnome/abiword/abiword/autogen-common.sh b/meta-openembedded/meta-gnome/recipes-gnome/abiword/abiword/autogen-common.sh new file mode 100755 index 0000000..c1f10e1 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/abiword/abiword/autogen-common.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +# find plugins Makefile templates +find plugins -name Makefile.am | sed 's|.am$||g' > plugin-makefiles.m4 + +# create plugin list +(cd plugins && find . -maxdepth 1 -type d | grep -v '^\.$' | grep -v '\./\.' | sed 's|\./||g' | xargs echo) > plugin-list.m4 + +# create conditionals for builtin plugins +(for plugin in `cat plugin-list.m4`; do + u=`echo $plugin | tr '[:lower:]' '[:upper:]'` + echo 'AM_CONDITIONAL(['$u'_BUILTIN], test "$enable_'$plugin'_builtin" == "yes")' +done) > plugin-builtin.m4 + +# create plugin configuration +find plugins -name plugin.m4 | xargs cat > plugin-configure.m4 +#to debug if plugin configuration code misbehaves (instead of the above line): +#rm plugin-configure.m4 +#for f in $(find plugins -name plugin.m4); do +# echo "AC_MSG_RESULT([plugin: $f])" >> plugin-configure.m4 +# cat $f >> plugin-configure.m4 +#done + +# find extra m4 files provided by plugins and symlink them +for f in ` find ./plugins -name '*.m4' | grep -v 'plugin\.m4'`; do + ln -sf $f +done + diff --git a/meta-openembedded/meta-gnome/recipes-gnome/abiword/abiword/cdump.pl b/meta-openembedded/meta-gnome/recipes-gnome/abiword/abiword/cdump.pl new file mode 100755 index 0000000..76f9c88 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/abiword/abiword/cdump.pl @@ -0,0 +1,32 @@ +#!/usr/bin/perl + +# This script replace the cdump tool we used to build the ap_wp_Splash.cpp +# Because the cdump tool has to be run as a part of building the AW package, +# it breaks cross-compilation. A perl script seemed like a generic solution + + +if ($#ARGV != 1 ) +{ + print "Usage: $0 datafile arrayname $#ARGV $ARGV[0] $ARGV[1]\n"; + exit(-1); +} + +open FROM, "<$ARGV[0]" or die "Could not open file $ARGV[0]"; +binmode FROM; + +print "unsigned char $ARGV[1] [] = {\n"; + +while ($len = read(FROM, $buf, 16)) +{ + foreach(split(//,$buf)) + { + printf("0x%02x,", ord($_)); + } + + print "\n"; +} + + +printf "};\nunsigned long $ARGV[1]_sizeof = sizeof($ARGV[1]);\n"; + +close FROM; \ No newline at end of file diff --git a/meta-openembedded/meta-gnome/recipes-gnome/abiword/abiword/nodolt.patch b/meta-openembedded/meta-gnome/recipes-gnome/abiword/abiword/nodolt.patch new file mode 100644 index 0000000..1546720 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/abiword/abiword/nodolt.patch @@ -0,0 +1,12 @@ +Index: abiword-2.8.1/configure.in +=================================================================== +--- abiword-2.8.1.orig/configure.in ++++ abiword-2.8.1/configure.in +@@ -132,7 +132,6 @@ AC_PROG_INSTALL + #AC_DISABLE_STATIC + AC_LIBTOOL_WIN32_DLL + AC_PROG_LIBTOOL +-DOLT + AC_PROG_LN_S + + AC_MSG_CHECKING([for platform and toolkit]) diff --git a/meta-openembedded/meta-gnome/recipes-gnome/abiword/abiword_2.5.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/abiword/abiword_2.5.2.bb deleted file mode 100644 index 91e05d3..0000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/abiword/abiword_2.5.2.bb +++ /dev/null @@ -1,5 +0,0 @@ -require abiword-2.5.inc -FILESEXTRAPATHS_prepend := "${THISDIR}/abiword-${SHRT_VER}:" -PR = "r3" - -RCONFLICTS_${PN} = "abiword-embedded" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/abiword/abiword_2.8.6.bb b/meta-openembedded/meta-gnome/recipes-gnome/abiword/abiword_2.8.6.bb new file mode 100644 index 0000000..1746769 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/abiword/abiword_2.8.6.bb @@ -0,0 +1,59 @@ +require abiword-2.5.inc +DEPENDS += " loudmouth libwmf-native gtkmathview asio" +RCONFLICTS_${PN} = "abiword-embedded" + +SRC_URI = "http://www.abisource.com/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz;name=abiword \ + file://autogen-common.sh \ + file://nodolt.patch" + +LIC_FILES_CHKSUM = "file://COPYING;md5=ecd3ac329fca77e2d0e412bec38e1c20" + +SRC_URI[abiword.md5sum] = "f883b0a7f26229a9c66fd6a1a94381aa" +SRC_URI[abiword.sha256sum] = "d99089a63a6cfc1a6a4a026be9278028d47d224088d24b1853acb67e95683a15" + + +EXTRA_OECONF = " --disable-static \ + --enable-plugins \ + --without-gnomevfs \ + --enable-collab-backend-xmpp \ + --enable-collab-backend-tcp \ + --enable-collab-backend-service \ + --with-libwmf-config=${STAGING_DIR} \ +" + +do_configure() { + install -m 0755 ${WORKDIR}/autogen-common.sh ${S}/autogen-common.sh + cd ${S} + ./autogen-common.sh + 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*" + +PACKAGES_DYNAMIC = "abiword-meta abiword-plugin-*" + +python populate_packages_prepend () { + abiword_libdir = bb.data.expand('${libdir}/abiword-2.8/plugins', d) + do_split_packages(d, abiword_libdir, '(.*)\.so$', 'abiword-plugin-%s', 'Abiword plugin for %s', extra_depends='') + + metapkg = "abiword-meta" + bb.data.setVar('ALLOW_EMPTY_' + metapkg, "1", d) + bb.data.setVar('FILES_' + metapkg, "", d) + blacklist = [ 'abiword-plugins-dbg', 'abiword-plugins', 'abiword-plugins-doc', 'abiword-plugins-dev', 'abiword-plugins-locale' ] + 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) + 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) +} + +FILES_${PN}-dev += "${libdir}/abiword-${SHRT_VER}/plugins/*.la" +FILES_${PN}-dbg += "${libdir}/abiword-${SHRT_VER}/plugins/.debug" +FILES_${PN}-doc += "${datadir}/abiword-*/readme*"