From eb8dc40360f0cfef56fb6947cc817a547d6d9bc6 Mon Sep 17 00:00:00 2001 From: Dave Cobbley Date: Tue, 14 Aug 2018 10:05:37 -0700 Subject: [Subtree] Removing import-layers directory As part of the move to subtrees, need to bring all the import layers content to the top level. Change-Id: I4a163d10898cbc6e11c27f776f60e1a470049d8f Signed-off-by: Dave Cobbley Signed-off-by: Brad Bishop --- ...saurus-Makefile.am-remove-uncomplete-opti.patch | 39 ++++++ .../recipes-gnome/abiword/abiword_3.0.2.bb | 142 +++++++++++++++++++++ 2 files changed, 181 insertions(+) create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/abiword/abiword/0001-plugins-aiksaurus-Makefile.am-remove-uncomplete-opti.patch create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/abiword/abiword_3.0.2.bb (limited to 'meta-openembedded/meta-gnome/recipes-gnome/abiword') diff --git a/meta-openembedded/meta-gnome/recipes-gnome/abiword/abiword/0001-plugins-aiksaurus-Makefile.am-remove-uncomplete-opti.patch b/meta-openembedded/meta-gnome/recipes-gnome/abiword/abiword/0001-plugins-aiksaurus-Makefile.am-remove-uncomplete-opti.patch new file mode 100644 index 000000000..0dff1411d --- /dev/null +++ b/meta-openembedded/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?= +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 +--- + 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-openembedded/meta-gnome/recipes-gnome/abiword/abiword_3.0.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/abiword/abiword_3.0.2.bb new file mode 100644 index 000000000..d2c0186b5 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/abiword/abiword_3.0.2.bb @@ -0,0 +1,142 @@ +SUMMARY = "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 \ + gtk+ \ + gtkmathview \ + wv \ + libfribidi \ + jpeg \ + libpng \ + librsvg \ + libwmf-native \ + asio \ + evolution-data-server \ + libxslt \ + ${@bb.utils.contains('BBFILE_COLLECTIONS', 'office-layer', 'redland rasqal', '', d)} \ +" +RDEPENDS_${PN}_append_libc-glibc = " \ + 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://0001-plugins-aiksaurus-Makefile.am-remove-uncomplete-opti.patch \ +" + +LIC_FILES_CHKSUM = "file://COPYING;md5=c5edcc3ccd864b19004d14e9c1c9a26a" + +SRC_URI[md5sum] = "cda6dd58c747c133b421cc7eb18f5796" +SRC_URI[sha256sum] = "afbfd458fd02989d8b0c6362ba8a4c14686d89666f54cfdb5501bd2090cf3522" + +#want 3.x from 3.x.y for the installation directory +SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" + +inherit distro_features_check autotools-brokensep pkgconfig + +REQUIRED_DISTRO_FEATURES = "x11" + +PACKAGECONFIG ??= " \ + collab-backend-xmpp collab-backend-tcp \ + ${@bb.utils.contains('BBFILE_COLLECTIONS', 'office-layer', 'libical', '', d)} \ +" +PACKAGECONFIG[libical] = "--with-libical,--without-libical,libical raptor2" +PACKAGECONFIG[spell] = "--enable-spell,--disable-spell,enchant" +PACKAGECONFIG[collab-backend-xmpp] = "--enable-collab-backend-xmpp,--disable-collab-backend-xmpp,libgsf libxml2 loudmouth" +PACKAGECONFIG[collab-backend-tcp] = "--enable-collab-backend-tcp,--disable-collab-backend-tcp,libgsf libxml2" +PACKAGECONFIG[collab-backend-service] = "--enable-collab-backend-service,--disable-collab-backend-service,libgsf libxml2 libsoup-2.4 gnutls" +PACKAGECONFIG[collab-backend-telepathy] = "--enable-collab-backend-telepathy,--disable-collab-backend-telepathy,libgsf libxml2 telepathy-glib telepathy-mission-control" +PACKAGECONFIG[collab-backend-sugar] = "--enable-collab-backend-sugar,--disable-collab-backend-sugar,libgsf libxml2 dbus-glib" + +EXTRA_OECONF = " --disable-static \ + --enable-plugins \ + --enable-clipart \ + --enable-templates \ + --without-gnomevfs \ + --with-gtk2 \ + --with-libwmf-config=${STAGING_DIR} \ +" + +LDFLAGS += "-lgmodule-2.0" + +do_compile() { + cd goffice-bits2 + make goffice-paths.h + make libgoffice.la + cd ${B} + oe_runmake +} + +PACKAGES += " ${PN}-clipart ${PN}-strings ${PN}-systemprofiles ${PN}-templates " + +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-3.0.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}-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 = d.expand('${libdir}/${PN}-${SHRT_VER}/plugins') + do_split_packages(d, abiword_libdir, '(.*)\.so$', 'abiword-plugin-%s', 'Abiword plugin for %s', extra_depends='') + + metapkg = "abiword-meta" + d.setVar('ALLOW_EMPTY_' + metapkg, "1") + d.setVar('FILES_' + metapkg, "") + blacklist = [ 'abiword-plugins-dbg', 'abiword-plugins', 'abiword-plugins-doc', 'abiword-plugins-dev', 'abiword-plugins-locale' ] + metapkg_rdepends = [] + packages = d.getVar('PACKAGES').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 %s" % pkg) + metapkg_rdepends.append(pkg) + d.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends)) + d.setVar('DESCRIPTION_' + metapkg, 'abiword-plugin meta package') + packages.append(metapkg) + d.setVar('PACKAGES', ' '.join(packages)) +} + +FILES_${PN}-plugin-openxml += "${datadir}/${PN}-${SHRT_VER}/omml_xslt" -- cgit v1.2.3