diff options
author | Andreas Müller <schnitzeltony@googlemail.com> | 2016-09-09 00:36:22 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-09-15 10:22:47 +0200 |
commit | 3e9313cf257e6bb1bc9139df90dcf6ed7233458e (patch) | |
tree | 408c987c36e9bbd0f3fb27ec40d421d820b7007f | |
parent | d70ccece723ca735f6c333e5ed4b91ae82e13a4e (diff) | |
download | meta-openembedded-contrib-3e9313cf257e6bb1bc9139df90dcf6ed7233458e.tar.gz |
geany-plugins: unblacklist / fix known bugs / update to 1.28
* The python LICENSE_DEFAULT snippet was stolen at [1]
* disable plugins not builing due to missing- or not properly detected
dependencies
[1] https://github.com/MentorEmbedded/meta-mentor/pull/843/commits/d85285792fad41d80e7862cc276dfc22ddb06fde
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r-- | meta-oe/recipes-devtools/geany/geany-plugins_1.28.bb (renamed from meta-oe/recipes-devtools/geany/geany-plugins_1.27.bb) | 101 |
1 files changed, 71 insertions, 30 deletions
diff --git a/meta-oe/recipes-devtools/geany/geany-plugins_1.27.bb b/meta-oe/recipes-devtools/geany/geany-plugins_1.28.bb index 2347af18f7..781287a909 100644 --- a/meta-oe/recipes-devtools/geany/geany-plugins_1.27.bb +++ b/meta-oe/recipes-devtools/geany/geany-plugins_1.28.bb @@ -1,15 +1,32 @@ DESCRIPTION = "A fast and lightweight IDE" HOMEPAGE = "http://plugins.geany.org/" -# majority's default -LICENSE = "GPLv2" -DEPENDS = "geany lua libxml2 libsoup-2.4 vte enchant intltool-native libassuan gpgme" +LICENSE_DEFAULT = "GPLv2" +LICENSE = "${LICENSE_DEFAULT} & BSD-2-Clause & GPLv3" + +python () { + for plugin in d.getVar('PLUGINS', True).split(): + if 'LICENSE_%s' % plugin not in d: + d.setVar('LICENSE_' + plugin, '${LICENSE_DEFAULT}') +} + +DEPENDS = " \ + geany \ + libxml2 \ + libsoup-2.4 \ + enchant \ + intltool-native \ + libassuan \ + gpgme \ + vte9 \ + libgit2 \ +" inherit autotools pkgconfig gtk-icon-cache SRC_URI = "http://plugins.geany.org/${PN}/${PN}-${PV}.tar.bz2" -SRC_URI[md5sum] = "31e4aa4b771a4ff8ccfd74efe7ba7b44" -SRC_URI[sha256sum] = "03195a0b7a361ddb2ee4138f46fa87b6d9b9801ff00657456ab9c8b8908c0ce0" +SRC_URI[md5sum] = "54ad042b6f91ff8e7a497c22faa2db4b" +SRC_URI[sha256sum] = "b13471e0a4cb76d04a96bb21c965087b50c16390edee0c6b3bbd920d8ac17745" do_configure_prepend() { rm -f ${S}/build/cache/glib-gettext.m4 @@ -54,11 +71,13 @@ LIC_FILES_CHKSUM += "file://defineformat/COPYING;md5=751419260aa954499f7abaabaa8 FILES_${PN}-defineformat = "${libdir}/geany/defineformat.so" RDEPENDS_${PN}-defineformat = "${PN}" -PLUGINS += "${PN}-devhelp" -LIC_FILES_CHKSUM += "file://devhelp/COPYING;md5=d32239bcb673463ab874e80d47fae504" -LICENSE_${PN}-devhelp = "GPLv3" -FILES_${PN}-devhelp = "${libdir}/geany/devhelp.so" -RDEPENDS_${PN}-devhelp = "${PN}" +# no gnome devhelp in some common layer +EXTRA_OECONF += "--disable-devhelp" +#PLUGINS += "${PN}-devhelp" +#LIC_FILES_CHKSUM += "file://devhelp/COPYING;md5=d32239bcb673463ab874e80d47fae504" +#LICENSE_${PN}-devhelp = "GPLv3" +#FILES_${PN}-devhelp = "${libdir}/geany/devhelp.so" +#RDEPENDS_${PN}-devhelp = "${PN}" PLUGINS += "${PN}-geanyctags" LIC_FILES_CHKSUM += "file://geanyctags/COPYING;md5=c107cf754550e65755c42985a5d4e9c9" @@ -91,10 +110,12 @@ LIC_FILES_CHKSUM += "file://geanylipsum/COPYING;md5=4325afd396febcb659c36b495331 FILES_${PN}-geanylipsum = "${libdir}/geany/geanylipsum.so" RDEPENDS_${PN}-geanylipsum = "${PN}" -PLUGINS += "${PN}-geanylua" -LIC_FILES_CHKSUM += "file://geanylua/COPYING;md5=4325afd396febcb659c36b49533135d4" -FILES_${PN}-geanylua = "${libdir}/geany/geanylua.so ${libdir}/${PN}/geanylua/*.so" -RDEPENDS_${PN}-geanylua = "${PN}" +# no lua: max supported version is 5.2 +EXTRA_OECONF += "--disable-geanylua" +#PLUGINS += "${PN}-geanylua" +#LIC_FILES_CHKSUM += "file://geanylua/COPYING;md5=4325afd396febcb659c36b49533135d4" +#FILES_${PN}-geanylua = "${libdir}/geany/geanylua.so ${libdir}/${PN}/geanylua/*.so" +#RDEPENDS_${PN}-geanylua = "${PN}" PLUGINS += "${PN}-geanymacro" LIC_FILES_CHKSUM += "file://geanymacro/COPYING;md5=c107cf754550e65755c42985a5d4e9c9" @@ -122,10 +143,12 @@ LICENSE_${PN}-geanyprj = "GPLv3" FILES_${PN}-geanyprj = "${libdir}/geany/geanyprj.so" RDEPENDS_${PN}-geanyprj = "${PN}" -PLUGINS += "${PN}-geanysendmail" -LIC_FILES_CHKSUM += "file://geanysendmail/COPYING;md5=c107cf754550e65755c42985a5d4e9c9" -FILES_${PN}-geanysendmail = "${libdir}/geany/geanysendmail.so" -RDEPENDS_${PN}-geanysendmail = "${PN}" +# no gnome pygtk +EXTRA_OECONF += "--disable-geanypy" +#PLUGINS += "${PN}-geanypy" +#LIC_FILES_CHKSUM += "file://geanypy/COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" +#FILES_${PN}-geanypy = "${libdir}/geany/geanypy.so" +#RDEPENDS_${PN}-geanypy = "${PN}" PLUGINS += "${PN}-geanyvc" LIC_FILES_CHKSUM += "file://geanyvc/COPYING;md5=c107cf754550e65755c42985a5d4e9c9" @@ -137,11 +160,24 @@ LIC_FILES_CHKSUM += "file://geniuspaste/COPYING;md5=bfc203269f8862ebfc1198cdc809 FILES_${PN}-geniuspaste = "${libdir}/geany/geniuspaste.so ${datadir}/${PN}/geniuspaste" RDEPENDS_${PN}-geniuspaste = "${PN}" +PLUGINS += "${PN}-git-changebar" +LIC_FILES_CHKSUM += "file://git-changebar/COPYING;md5=d32239bcb673463ab874e80d47fae504" +LICENSE_${PN}-git-changebar = "GPLv3" +FILES_${PN}-git-changebar = "${libdir}/geany/git-changebar.so" +RDEPENDS_${PN}-git-changebar = "${PN}" + PLUGINS += "${PN}-lineoperations" LIC_FILES_CHKSUM += "file://lineoperations/COPYING;md5=c107cf754550e65755c42985a5d4e9c9" FILES_${PN}-lineoperations = "${libdir}/geany/lineoperations.so" RDEPENDS_${PN}-lineoperations = "${PN}" +# no markdown - avoid floating dependencies +EXTRA_OECONF += " --disable-peg-markdown" +#PLUGINS += "${PN}-markdown" +#LIC_FILES_CHKSUM += "file://markdown/COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" +#FILES_${PN}-markdown = "${libdir}/geany/markdown.so" +#RDEPENDS_${PN}-markdown = "${PN}" + PLUGINS += "${PN}-multiterm" LIC_FILES_CHKSUM += "file://multiterm/COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" FILES_${PN}-multiterm = "${libdir}/geany/multiterm.so" @@ -174,16 +210,21 @@ LIC_FILES_CHKSUM += "file://projectorganizer/COPYING;md5=c107cf754550e65755c4298 FILES_${PN}-projectorganizer = "${libdir}/geany/projectorganizer.so" RDEPENDS_${PN}-projectorganizer = "${PN}" -PLUGINS += "${PN}-shiftcolumn" -LIC_FILES_CHKSUM += "file://shiftcolumn/COPYING;md5=751419260aa954499f7abaabaa882bbe" -FILES_${PN}-shiftcolumn = "${libdir}/geany/shiftcolumn.so" -RDEPENDS_${PN}-shiftcolumn = "${PN}" - PLUGINS += "${PN}-scope" LIC_FILES_CHKSUM += "file://scope/COPYING;md5=c107cf754550e65755c42985a5d4e9c9" FILES_${PN}-scope = "${libdir}/geany/scope.so" RDEPENDS_${PN}-scope = "${PN}" +PLUGINS += "${PN}-sendmail" +LIC_FILES_CHKSUM += "file://sendmail/COPYING;md5=c107cf754550e65755c42985a5d4e9c9" +FILES_${PN}-sendmail = "${libdir}/geany/sendmail.so" +RDEPENDS_${PN}-sendmail = "${PN}" + +PLUGINS += "${PN}-shiftcolumn" +LIC_FILES_CHKSUM += "file://shiftcolumn/COPYING;md5=751419260aa954499f7abaabaa882bbe" +FILES_${PN}-shiftcolumn = "${libdir}/geany/shiftcolumn.so" +RDEPENDS_${PN}-shiftcolumn = "${PN}" + PLUGINS += "${PN}-spellcheck" LIC_FILES_CHKSUM += "file://spellcheck/COPYING;md5=4325afd396febcb659c36b49533135d4" FILES_${PN}-spellcheck = "${libdir}/geany/spellcheck.so" @@ -204,11 +245,13 @@ LIC_FILES_CHKSUM += "file://updatechecker/COPYING;md5=4325afd396febcb659c36b4953 FILES_${PN}-updatechecker = "${libdir}/geany/updatechecker.so" RDEPENDS_${PN}-updatechecker = "${PN}" -PLUGINS += "${PN}-webhelper" -LIC_FILES_CHKSUM += "file://webhelper/COPYING;md5=d32239bcb673463ab874e80d47fae504" -LICENSE_${PN}-webhelper = "GPLv3" -FILES_${PN}-webhelper = "${libdir}/geany/webhelper.so" -RDEPENDS_${PN}-webhelper = "${PN}" +# no webkit - lasts ages and is not properly detected +EXTRA_OECONF += " --disable-webhelper" +#PLUGINS += "${PN}-webhelper" +#LIC_FILES_CHKSUM += "file://webhelper/COPYING;md5=d32239bcb673463ab874e80d47fae504" +#LICENSE_${PN}-webhelper = "GPLv3" +#FILES_${PN}-webhelper = "${libdir}/geany/webhelper.so" +#RDEPENDS_${PN}-webhelper = "${PN}" PLUGINS += "${PN}-xmlsnippets" LIC_FILES_CHKSUM += "file://xmlsnippets/COPYING;md5=4325afd396febcb659c36b49533135d4" @@ -218,5 +261,3 @@ RDEPENDS_${PN}-xmlsnippets = "${PN}" PACKAGES =+ "${PLUGINS}" RDEPENDS_${PN} = "${PLUGINS}" ALLOW_EMPTY_${PN} = "1" - -PNBLACKLIST[geany-plugins] ?= "Causes multiple QA errors and LICENSE warnings" |