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 --- .../pidgin/libotr/fix_qa-issue_include.patch | 18 ++++ .../recipes-support/pidgin/libotr/sepbuild.patch | 16 +++ .../meta-oe/recipes-support/pidgin/libotr_4.1.1.bb | 15 +++ .../recipes-support/pidgin/pidgin-otr_4.0.2.bb | 15 +++ .../pidgin/pidgin/pidgin-cross-python-265.patch | 42 ++++++++ .../pidgin/pidgin/purple-OE-branding-25.patch | 24 +++++ .../pidgin/pidgin/sanitize-configure.ac.patch | 43 ++++++++ .../recipes-support/pidgin/pidgin_2.12.0.bb | 120 +++++++++++++++++++++ 8 files changed, 293 insertions(+) create mode 100644 meta-openembedded/meta-oe/recipes-support/pidgin/libotr/fix_qa-issue_include.patch create mode 100644 meta-openembedded/meta-oe/recipes-support/pidgin/libotr/sepbuild.patch create mode 100644 meta-openembedded/meta-oe/recipes-support/pidgin/libotr_4.1.1.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-otr_4.0.2.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch create mode 100644 meta-openembedded/meta-oe/recipes-support/pidgin/pidgin/purple-OE-branding-25.patch create mode 100644 meta-openembedded/meta-oe/recipes-support/pidgin/pidgin/sanitize-configure.ac.patch create mode 100644 meta-openembedded/meta-oe/recipes-support/pidgin/pidgin_2.12.0.bb (limited to 'meta-openembedded/meta-oe/recipes-support/pidgin') diff --git a/meta-openembedded/meta-oe/recipes-support/pidgin/libotr/fix_qa-issue_include.patch b/meta-openembedded/meta-oe/recipes-support/pidgin/libotr/fix_qa-issue_include.patch new file mode 100644 index 0000000000..ecdbffb513 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/pidgin/libotr/fix_qa-issue_include.patch @@ -0,0 +1,18 @@ +libotr: Fix QA-issue where also files from buildhost would be included + +Warning was: +cc1: warning: include location "/usr/include" is unsafe for +cross-compilation [-Wpoison-system-directories] + +Upstream-Status: Pending + +Signed-off-by: Jakob Drexel + +--- a/toolkit/Makefile.am 2012-05-03 15:52:22.000000000 +0200 ++++ b/toolkit/Makefile.am 2014-01-13 12:12:26.030369357 +0100 +@@ -1,4 +1,4 @@ +-AM_CPPFLAGS = -I$(includedir) -I../src @LIBGCRYPT_CFLAGS@ ++AM_CPPFLAGS = -I../src @LIBGCRYPT_CFLAGS@ + + noinst_HEADERS = aes.h ctrmode.h parse.h sesskeys.h readotr.h sha1hmac.h + diff --git a/meta-openembedded/meta-oe/recipes-support/pidgin/libotr/sepbuild.patch b/meta-openembedded/meta-oe/recipes-support/pidgin/libotr/sepbuild.patch new file mode 100644 index 0000000000..dda17a9577 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/pidgin/libotr/sepbuild.patch @@ -0,0 +1,16 @@ +Fix builds with ${B} != ${S} + +Upstream-Status: Pending + +RP 2014/7/17 + +Index: libotr-4.0.0/toolkit/Makefile.am +=================================================================== +--- libotr-4.0.0.orig/toolkit/Makefile.am 2014-07-16 18:09:59.777858022 +0000 ++++ libotr-4.0.0/toolkit/Makefile.am 2014-07-17 06:28:51.359066155 +0000 +@@ -1,4 +1,4 @@ +-AM_CPPFLAGS = -I../src @LIBGCRYPT_CFLAGS@ ++AM_CPPFLAGS = -I$(top_srcdir)/src @LIBGCRYPT_CFLAGS@ + + noinst_HEADERS = aes.h ctrmode.h parse.h sesskeys.h readotr.h sha1hmac.h + diff --git a/meta-openembedded/meta-oe/recipes-support/pidgin/libotr_4.1.1.bb b/meta-openembedded/meta-oe/recipes-support/pidgin/libotr_4.1.1.bb new file mode 100644 index 0000000000..c701244219 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/pidgin/libotr_4.1.1.bb @@ -0,0 +1,15 @@ +SUMMARY = "(OTR) Messaging allows you to have private conversations over instant messaging" +HOMEPAGE = "http://www.cypherpunks.ca/otr/" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=92fe174bad6da3763f6e9e9eaff6df24" +DEPENDS = "libgcrypt libgpg-error" + +SRC_URI = "http://www.cypherpunks.ca/otr/${BP}.tar.gz \ + file://fix_qa-issue_include.patch \ + file://sepbuild.patch \ +" + +SRC_URI[md5sum] = "dac5a8778a35f674c046ddf5d97e4d81" +SRC_URI[sha256sum] = "8b3b182424251067a952fb4e6c7b95a21e644fbb27fbd5f8af2b2ed87ca419f5" + +inherit autotools pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-otr_4.0.2.bb b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-otr_4.0.2.bb new file mode 100644 index 0000000000..5a21cd3fc9 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-otr_4.0.2.bb @@ -0,0 +1,15 @@ +SUMMARY = "(OTR) Messaging allows you to have private conversations over instant messaging" +HOMEPAGE = "https://otr.cypherpunks.ca/" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=92fe174bad6da3763f6e9e9eaff6df24" +DEPENDS = "libgcrypt libotr pidgin gtk+ intltool-native glib-2.0 glib-2.0-native" +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI = "https://otr.cypherpunks.ca/${BP}.tar.gz \ +" +SRC_URI[md5sum] = "7ef14e1334a4bc80e5d530f9a3cfc626" +SRC_URI[sha256sum] = "f4b59eef4a94b1d29dbe0c106dd00cdc630e47f18619fc754e5afbf5724ebac4" + +FILES_${PN} = "${libdir}/pidgin/*" + +inherit autotools pkgconfig distro_features_check diff --git a/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch new file mode 100644 index 0000000000..312fc8593f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch @@ -0,0 +1,42 @@ +From 855cc20bafa30597ae7a62f7672d42654b25cde0 Mon Sep 17 00:00:00 2001 +From: Herrie +Date: Mon, 24 Jul 2017 21:30:16 +0200 +Subject: [PATCH] Use pkg-config instead of ${PYTHON}-config to find python + +--- + configure.ac | 21 ++++++++------------- + 1 file changed, 8 insertions(+), 13 deletions(-) + +diff --git a/configure.ac b/configure.ac +index d20a18e..c741829 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1567,20 +1567,15 @@ AM_CONDITIONAL(ENABLE_DBUS, test "x$enable_dbus" = "xyes") + dnl Check for Python headers (currently useful only for libgnt) + dnl (Thanks to XChat) + if test "x$enable_consoleui" = "xyes" -a ! -z "$PYTHON" -a x"$PYTHON" != x"no" ; then +- AC_MSG_CHECKING(for Python compile flags) +- if test -f ${PYTHON}-config; then +- PY_CFLAGS=`${PYTHON}-config --includes` +- PY_LIBS=`${PYTHON}-config --libs` +- AC_DEFINE(USE_PYTHON, [1], [Define if python headers are available.]) +- AC_MSG_RESULT(ok) +- else +- AC_MSG_RESULT([Cannot find ${PYTHON}-config]) +- PY_CFLAGS="" +- PY_LIBS="" +- fi ++ AC_MSG_CHECKING(for Python compile flags) ++ PKG_CHECK_MODULES(PY, python, [ ++ AC_SUBST(PY_CFLAGS) ++ AC_SUBST(PY_LIBS) ++ ], [ ++ AC_MSG_RESULT(no) ++ AC_MSG_ERROR([Can't find python]) ++ ]) + fi +-AC_SUBST(PY_CFLAGS) +-AC_SUBST(PY_LIBS) + + dnl ####################################################################### + dnl # Check for Mono support diff --git a/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin/purple-OE-branding-25.patch b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin/purple-OE-branding-25.patch new file mode 100644 index 0000000000..9a24fbbc5f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin/purple-OE-branding-25.patch @@ -0,0 +1,24 @@ +From 43e9db656431ffb22b429d5fca4ce3b4af21bc9e Mon Sep 17 00:00:00 2001 +From: Herrie +Date: Mon, 24 Jul 2017 21:30:16 +0200 + +--- + libpurple/protocols/irc/irc.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libpurple/protocols/irc/irc.h b/libpurple/protocols/irc/irc.h +index fde35c4..66e52dd 100644 +--- a/libpurple/protocols/irc/irc.h ++++ b/libpurple/protocols/irc/irc.h +@@ -40,9 +40,9 @@ + + #define IRC_DEFAULT_CHARSET "UTF-8" + #define IRC_DEFAULT_AUTODETECT FALSE +-#define IRC_DEFAULT_ALIAS "purple" ++#define IRC_DEFAULT_ALIAS "OE-user" + +-#define IRC_DEFAULT_QUIT "Leaving." ++#define IRC_DEFAULT_QUIT "Powered by OE: www.openembedded.org" + + #define IRC_INITIAL_BUFSIZE 1024 + diff --git a/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin/sanitize-configure.ac.patch b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin/sanitize-configure.ac.patch new file mode 100644 index 0000000000..84dbcdc276 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin/sanitize-configure.ac.patch @@ -0,0 +1,43 @@ +From c3058f9eadaf5ff28ba776cfed54b609a93a1249 Mon Sep 17 00:00:00 2001 +From: Herrie +Date: Mon, 24 Jul 2017 21:30:16 +0200 + +--- + configure.ac | 10 +--------- + 1 file changed, 1 insertion(+), 9 deletions(-) + +diff --git a/configure.ac b/configure.ac +index b8acd2a..d20a18e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -642,7 +642,7 @@ if test "x$enable_consoleui" = "xyes"; then + if test "x$enable_consoleui" = "xyes"; then + dnl # Some distros put the headers in ncursesw/, some don't + found_ncurses_h=no +- for location in $ac_ncurses_includes $NCURSES_HEADERS /usr/include/ncursesw /usr/include ++ for location in $ac_ncurses_includes $NCURSES_HEADERS + do + f="$location/ncurses.h" + orig_CFLAGS="$CFLAGS" +@@ -2397,10 +2397,6 @@ if test "$kerberos" != "no" ; then + KRB4_CFLAGS="$KRB4_CFLAGS -I${kerberos}/include/kerberosIV" + fi + KRB4_LDFLAGS="-L${kerberos}/lib" +- elif test -d /usr/local/include/kerberosIV ; then +- KRB4_CFLAGS="-I/usr/local/include/kerberosIV" +- elif test -d /usr/include/kerberosIV ; then +- KRB4_CFLAGS="-I/usr/include/kerberosIV" + fi + AC_DEFINE(ZEPHYR_USES_KERBEROS, 1, [Define if kerberos should be used in Zephyr.]) + +@@ -2433,10 +2429,6 @@ if test "$zephyr" != "no" ; then + ZEPHYR_LDFLAGS="-L${zephyr}/lib" + elif test -d /usr/athena/include/zephyr ; then + ZEPHYR_CFLAGS="-I/usr/athena/include" +- elif test -d /usr/include/zephyr ; then +- ZEPHYR_CFLAGS="-I/usr/include" +- elif test -d /usr/local/include/zephyr ; then +- ZEPHYR_CFLAGS="-I/usr/local/include" + fi + AC_DEFINE(LIBZEPHYR_EXT, 1 , [Define if external libzephyr should be used.]) + AM_CONDITIONAL(EXTERNAL_LIBZEPHYR, test "x$zephyr" != "xno") diff --git a/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin_2.12.0.bb b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin_2.12.0.bb new file mode 100644 index 0000000000..088f08b7d6 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin_2.12.0.bb @@ -0,0 +1,120 @@ +SUMMARY = "multi-protocol instant messaging client" +SECTION = "x11/network" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" +DEPENDS = "python virtual/libintl intltool-native libxml2 gconf glib-2.0-native" + +inherit autotools gettext pkgconfig gconf perlnative + +SRC_URI = "\ + ${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \ + file://sanitize-configure.ac.patch \ + file://purple-OE-branding-25.patch \ + file://pidgin-cross-python-265.patch \ +" + +SRC_URI[md5sum] = "8287400c4e5663e0e7844e868d5152af" +SRC_URI[sha256sum] = "8c3d3536d6d3c971bd433ff9946678af70a0f6aa4e6969cc2a83bb357015b7f8" + +PACKAGECONFIG ??= "gnutls consoleui avahi dbus idn nss \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 gtk startup-notification', '', d)} \ +" +PACKAGECONFIG[farsight2] = "--enable-farstream,--disable-farstream,farsight2" +# --disable-gstreamer compile without GStreamer audio support +# --disable-gstreamer-video +# compile without GStreamer 1.0 Video Overlay support +# --disable-gstreamer-interfaces +# compile without GStreamer 0.10 interface support +# --with-gstreamer= +# compile with GStreamer 0.10 or 1.0 interface +PACKAGECONFIG[gstreamer] = "--enable-gstreamer,--disable-gstreamer,gstreamer" +PACKAGECONFIG[vv] = "--enable-vv,--disable-vv,gstreamer" +PACKAGECONFIG[idn] = "--enable-idn,--disable-idn,libidn" +PACKAGECONFIG[gtk] = "--enable-gtkui,--disable-gtkui,gtk+" +PACKAGECONFIG[x11] = "--with-x=yes --x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR},--with-x=no,virtual/libx11" +PACKAGECONFIG[startup-notification] = "--enable-startup-notification,--disable-startup-notification,startup-notification" +PACKAGECONFIG[consoleui] = "--enable-consoleui --with-ncurses-headers=${STAGING_INCDIR},--disable-consoleui,ncurses" +PACKAGECONFIG[gnutls] = "--enable-gnutls --with-gnutls-includes=${STAGING_INCDIR} --with-gnutls-libs=${STAGING_LIBDIR},--disable-gnutls,gnutls,libpurple-plugin-ssl-gnutls" +PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus dbus-glib" +PACKAGECONFIG[avahi] = "--enable-avahi,--disable-avahi,avahi" +PACKAGECONFIG[nss] = "--enable-nss,--disable-nss,nss nspr,libpurple-plugin-ssl-nss" + +EXTRA_OECONF = " \ + --disable-perl \ + --disable-tcl \ + --disable-gevolution \ + --disable-schemas-install \ + --disable-gtkspell \ + --disable-meanwhile \ + --disable-nm \ + --disable-screensaver \ +" + +do_configure_prepend() { + touch ${S}/po/Makefile + sed -i "s#PY_VERSION=`$PYTHON -c 'import sys ; print sys.version[0:3]'`#PY_VERSION=${PYTHON_BASEVERSION}#g" ${S}/configure.ac +} + +OE_LT_RPATH_ALLOW=":${libdir}/purple-2:" +OE_LT_RPATH_ALLOW[export]="1" + +PACKAGES =+ "libpurple-dbg libpurple-dev libpurple libgnt-dbg libgnt libgnt-dev finch-dbg finch finch-dev ${PN}-data" + +LEAD_SONAME = "libpurple.so.0" +FILES_libpurple = "${libdir}/libpurple*.so.* ${libdir}/purple-2 ${bindir}/purple-* ${sysconfdir}/gconf/schemas/purple* ${datadir}/purple/ca-certs" +FILES_libpurple-dev = "${libdir}/libpurple*.la \ + ${libdir}/libpurple*.so \ + ${libdir}/purple-2/*.la \ + ${libdir}/purple-2/libjabber.so \ + ${libdir}/purple-2/liboscar.so \ + ${libdir}/purple-2/libymsg.so \ + ${datadir}/aclocal" +FILES_libpurple-dbg += "${libdir}/.debug/libpurple* \ + ${libdir}/purple-2/.debug" +FILES_libgnt = "${libdir}/libgnt.so.* ${libdir}/gnt/*.so" +FILES_libgnt-dev = "${libdir}/gnt/*.la" +FILES_libgnt-dbg = "${libdir}/gnt/.debug" +FILES_finch = "${bindir}/finch" +FILES_finch-dev = "${libdir}/finch/*.la" +FILES_finch-dbg = "${bindir}/.debug/finch \ + ${libdir}/finch/.debug" + +FILES_${PN} = "${bindir} ${datadir}/${PN} ${libdir}/${PN}/*.so \ + ${datadir}/applications" +RRECOMMENDS_${PN} = "${PN}-data libpurple-protocol-irc libpurple-protocol-xmpp" + +FILES_${PN}-data = "${datadir}/pixmaps ${datadir}/sounds ${datadir}/icons ${datadir}/appdata" +FILES_${PN}-dev += "${libdir}/${PN}/*.la" + +PACKAGES_DYNAMIC += "^libpurple-protocol-.* ^libpurple-plugin-.* ^pidgin-plugin-.* ^finch-plugin-.*" + +python populate_packages_prepend () { + pidgroot = d.expand('${libdir}/pidgin') + purple = d.expand('${libdir}/purple-2') + finch = d.expand('${libdir}/finch') + + do_split_packages(d, pidgroot, '^([^l][^i][^b].*)\.so$', + output_pattern='pidgin-plugin-%s', + description='Pidgin plugin %s', + prepend=True, extra_depends='') + + do_split_packages(d, purple, '^lib(.*)\.so$', + output_pattern='libpurple-protocol-%s', + description='Libpurple protocol plugin for %s', + prepend=True, extra_depends='') + + do_split_packages(d, purple, '^(ssl-.*)\.so$', + output_pattern='libpurple-plugin-%s', + description='libpurple plugin %s', + prepend=True, extra_depends='libpurple-plugin-ssl') + + do_split_packages(d, purple, '^([^l][^i][^b].*)\.so$', + output_pattern='libpurple-plugin-%s', + description='libpurple plugin %s', + prepend=True, extra_depends='') + + do_split_packages(d, finch, '^([^l][^i][^b].*)\.so$', + output_pattern='finch-plugin-%s', + description='Finch plugin %s', + prepend=True, extra_depends='') +} -- cgit v1.2.3