diff options
author | Andreas Müller <schnitzeltony@googlemail.com> | 2016-02-07 23:35:28 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-02-15 10:21:35 +0100 |
commit | 5f5b1b6667346dbb1477ddfa1fb54aae391bb14e (patch) | |
tree | 185ca6e25ba8811ada7b824da7308d7fa5ff04d3 /meta-gnome | |
parent | e6647cf8f8e4d8eb7403334ec6b8c1da52a9d770 (diff) | |
download | meta-openembedded-contrib-5f5b1b6667346dbb1477ddfa1fb54aae391bb14e.tar.gz |
abiword: update to 3.0.1
* sources checked for debian_patches_boost54.patch: seems applied
* removing tailored configure does not show effects - plugins are build properly
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-gnome')
-rw-r--r-- | meta-gnome/recipes-gnome/abiword/abiword/0001-plugins-aiksaurus-Makefile.am-remove-uncomplete-opti.patch | 39 | ||||
-rwxr-xr-x | meta-gnome/recipes-gnome/abiword/abiword/autogen-common.sh | 28 | ||||
-rw-r--r-- | meta-gnome/recipes-gnome/abiword/abiword/debian_patches_boost54.patch | 32 | ||||
-rw-r--r-- | meta-gnome/recipes-gnome/abiword/abiword_3.0.1.bb (renamed from meta-gnome/recipes-gnome/abiword/abiword_3.0.0.bb) | 18 |
4 files changed, 44 insertions, 73 deletions
diff --git a/meta-gnome/recipes-gnome/abiword/abiword/0001-plugins-aiksaurus-Makefile.am-remove-uncomplete-opti.patch b/meta-gnome/recipes-gnome/abiword/abiword/0001-plugins-aiksaurus-Makefile.am-remove-uncomplete-opti.patch new file mode 100644 index 0000000000..0dff1411d4 --- /dev/null +++ b/meta-gnome/recipes-gnome/abiword/abiword/0001-plugins-aiksaurus-Makefile.am-remove-uncomplete-opti.patch @@ -0,0 +1,39 @@ +From c646159ce817506131b58fdab1cdc1cd6364df7a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> +Date: Sun, 7 Feb 2016 21:45:20 +0100 +Subject: [PATCH] plugins/aiksaurus/Makefile.am: remove uncomplete options + WITH_BUILTIN_AIKSAURUS_GTK +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +* with gtk2 we won't use it +* it is missing in configure.ac causing + +| plugins/aiksaurus/Makefile.am:5: error: WITH_BUILTIN_AIKSAURUS_GTK does not appear in AM_CONDITIONAL + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> +--- + plugins/aiksaurus/Makefile.am | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/plugins/aiksaurus/Makefile.am b/plugins/aiksaurus/Makefile.am +index d402c58..1034e2a 100644 +--- a/plugins/aiksaurus/Makefile.am ++++ b/plugins/aiksaurus/Makefile.am +@@ -2,10 +2,6 @@ SUBDIRS = + + if TOOLKIT_GTK + +-if WITH_BUILTIN_AIKSAURUS_GTK +-SUBDIRS += aiksaurusgtk3 +-platform_lib = aiksaurusgtk3/libAiksaurusGtk3.la +-endif + + endif + +-- +2.5.0 + diff --git a/meta-gnome/recipes-gnome/abiword/abiword/autogen-common.sh b/meta-gnome/recipes-gnome/abiword/abiword/autogen-common.sh deleted file mode 100755 index c1f10e1a4d..0000000000 --- a/meta-gnome/recipes-gnome/abiword/abiword/autogen-common.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/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-gnome/recipes-gnome/abiword/abiword/debian_patches_boost54.patch b/meta-gnome/recipes-gnome/abiword/abiword/debian_patches_boost54.patch deleted file mode 100644 index cf50cb2c90..0000000000 --- a/meta-gnome/recipes-gnome/abiword/abiword/debian_patches_boost54.patch +++ /dev/null @@ -1,32 +0,0 @@ -Last-Update: 2014-02-05 -Forwarded: yes -Author: Dmitry Smirnov <onlyjob@member.fsf.org> -Bug-Debian: http://bugs.debian.org/737551 -Bug-Abiword: http://bugzilla.abisource.com/13602 -Description: fix FTBFS with libboost1.54-dev -Upstream-Status: Applied - ---- a/plugins/collab/core/sync/xp/SynchronizedQueue.h -+++ b/plugins/collab/core/sync/xp/SynchronizedQueue.h -@@ -21,8 +21,9 @@ - - #include <deque> - #include <boost/bind.hpp> - #include <boost/function.hpp> -+#include <boost/noncopyable.hpp> - #include <sync/xp/lock.h> - #include <sync/xp/Synchronizer.h> - - class EmptyQueueException {}; ---- a/plugins/collab/backends/tcp/xp/Session.h -+++ b/plugins/collab/backends/tcp/xp/Session.h -@@ -21,8 +21,9 @@ - - #include <boost/function.hpp> - #include <boost/bind.hpp> - #include <boost/enable_shared_from_this.hpp> -+#include <boost/noncopyable.hpp> - #include <deque> - #include <sync/xp/lock.h> - #include <sync/xp/Synchronizer.h> - diff --git a/meta-gnome/recipes-gnome/abiword/abiword_3.0.0.bb b/meta-gnome/recipes-gnome/abiword/abiword_3.0.1.bb index eb4bba2175..d4c8c56c9e 100644 --- a/meta-gnome/recipes-gnome/abiword/abiword_3.0.0.bb +++ b/meta-gnome/recipes-gnome/abiword/abiword_3.0.1.bb @@ -9,15 +9,15 @@ RDEPENDS_${PN} = "glibc-gconv-ibm850 glibc-gconv-cp1252 \ glibc-gconv-iso8859-15 glibc-gconv-iso8859-1" RCONFLICTS_${PN} = "${PN}-embedded" -SRC_URI = "http://www.abisource.com/downloads/${BPN}/${PV}/source/${BP}.tar.gz \ - file://debian_patches_boost54.patch \ - file://autogen-common.sh \ +SRC_URI = " \ + http://www.abisource.com/downloads/${BPN}/${PV}/source/${BP}.tar.gz \ + file://0001-plugins-aiksaurus-Makefile.am-remove-uncomplete-opti.patch \ " LIC_FILES_CHKSUM = "file://COPYING;md5=c5edcc3ccd864b19004d14e9c1c9a26a" -SRC_URI[md5sum] = "8d9c41cff3a8fbef8d0c835c65600e65" -SRC_URI[sha256sum] = "d17e318c00ff4eb353e0e7994b098b1d4f9ddd8712ac0261a0e38b89081fac01" +SRC_URI[md5sum] = "f3f8052e7b4979a43b75775a381e6cb8" +SRC_URI[sha256sum] = "e094f6fbf0afc5c5538b4894888e7c346f8ee8f49c9d24821dd696d0734865c6" #want 3.x from 3.x.y for the installation directory SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}" @@ -41,14 +41,6 @@ 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 ${B}/autogen-common.sh - ./autogen-common.sh - autotools_do_configure -} - do_compile() { cd goffice-bits2 make goffice-paths.h |