diff --git a/meta-citadel/licenses/CC-BY-SA-4.0 b/meta-citadel/licenses/CC-BY-SA-4.0 new file mode 100644 index 0000000..fd662a7 --- /dev/null +++ b/meta-citadel/licenses/CC-BY-SA-4.0 @@ -0,0 +1,428 @@ +Attribution-ShareAlike 4.0 International + +======================================================================= + +Creative Commons Corporation ("Creative Commons") is not a law firm and +does not provide legal services or legal advice. Distribution of +Creative Commons public licenses does not create a lawyer-client or +other relationship. Creative Commons makes its licenses and related +information available on an "as-is" basis. Creative Commons gives no +warranties regarding its licenses, any material licensed under their +terms and conditions, or any related information. Creative Commons +disclaims all liability for damages resulting from their use to the +fullest extent possible. + +Using Creative Commons Public Licenses + +Creative Commons public licenses provide a standard set of terms and +conditions that creators and other rights holders may use to share +original works of authorship and other material subject to copyright +and certain other rights specified in the public license below. The +following considerations are for informational purposes only, are not +exhaustive, and do not form part of our licenses. + + Considerations for licensors: Our public licenses are + intended for use by those authorized to give the public + permission to use material in ways otherwise restricted by + copyright and certain other rights. Our licenses are + irrevocable. Licensors should read and understand the terms + and conditions of the license they choose before applying it. + Licensors should also secure all rights necessary before + applying our licenses so that the public can reuse the + material as expected. Licensors should clearly mark any + material not subject to the license. This includes other CC- + licensed material, or material used under an exception or + limitation to copyright. More considerations for licensors: + wiki.creativecommons.org/Considerations_for_licensors + + Considerations for the public: By using one of our public + licenses, a licensor grants the public permission to use the + licensed material under specified terms and conditions. If + the licensor's permission is not necessary for any reason--for + example, because of any applicable exception or limitation to + copyright--then that use is not regulated by the license. Our + licenses grant only permissions under copyright and certain + other rights that a licensor has authority to grant. Use of + the licensed material may still be restricted for other + reasons, including because others have copyright or other + rights in the material. A licensor may make special requests, + such as asking that all changes be marked or described. + Although not required by our licenses, you are encouraged to + respect those requests where reasonable. More_considerations + for the public: + wiki.creativecommons.org/Considerations_for_licensees + +======================================================================= + +Creative Commons Attribution-ShareAlike 4.0 International Public +License + +By exercising the Licensed Rights (defined below), You accept and agree +to be bound by the terms and conditions of this Creative Commons +Attribution-ShareAlike 4.0 International Public License ("Public +License"). To the extent this Public License may be interpreted as a +contract, You are granted the Licensed Rights in consideration of Your +acceptance of these terms and conditions, and the Licensor grants You +such rights in consideration of benefits the Licensor receives from +making the Licensed Material available under these terms and +conditions. + + +Section 1 -- Definitions. + + a. Adapted Material means material subject to Copyright and Similar + Rights that is derived from or based upon the Licensed Material + and in which the Licensed Material is translated, altered, + arranged, transformed, or otherwise modified in a manner requiring + permission under the Copyright and Similar Rights held by the + Licensor. For purposes of this Public License, where the Licensed + Material is a musical work, performance, or sound recording, + Adapted Material is always produced where the Licensed Material is + synched in timed relation with a moving image. + + b. Adapter's License means the license You apply to Your Copyright + and Similar Rights in Your contributions to Adapted Material in + accordance with the terms and conditions of this Public License. + + c. BY-SA Compatible License means a license listed at + creativecommons.org/compatiblelicenses, approved by Creative + Commons as essentially the equivalent of this Public License. + + d. Copyright and Similar Rights means copyright and/or similar rights + closely related to copyright including, without limitation, + performance, broadcast, sound recording, and Sui Generis Database + Rights, without regard to how the rights are labeled or + categorized. For purposes of this Public License, the rights + specified in Section 2(b)(1)-(2) are not Copyright and Similar + Rights. + + e. Effective Technological Measures means those measures that, in the + absence of proper authority, may not be circumvented under laws + fulfilling obligations under Article 11 of the WIPO Copyright + Treaty adopted on December 20, 1996, and/or similar international + agreements. + + f. Exceptions and Limitations means fair use, fair dealing, and/or + any other exception or limitation to Copyright and Similar Rights + that applies to Your use of the Licensed Material. + + g. License Elements means the license attributes listed in the name + of a Creative Commons Public License. The License Elements of this + Public License are Attribution and ShareAlike. + + h. Licensed Material means the artistic or literary work, database, + or other material to which the Licensor applied this Public + License. + + i. Licensed Rights means the rights granted to You subject to the + terms and conditions of this Public License, which are limited to + all Copyright and Similar Rights that apply to Your use of the + Licensed Material and that the Licensor has authority to license. + + j. Licensor means the individual(s) or entity(ies) granting rights + under this Public License. + + k. Share means to provide material to the public by any means or + process that requires permission under the Licensed Rights, such + as reproduction, public display, public performance, distribution, + dissemination, communication, or importation, and to make material + available to the public including in ways that members of the + public may access the material from a place and at a time + individually chosen by them. + + l. Sui Generis Database Rights means rights other than copyright + resulting from Directive 96/9/EC of the European Parliament and of + the Council of 11 March 1996 on the legal protection of databases, + as amended and/or succeeded, as well as other essentially + equivalent rights anywhere in the world. + + m. You means the individual or entity exercising the Licensed Rights + under this Public License. Your has a corresponding meaning. + + +Section 2 -- Scope. + + a. License grant. + + 1. Subject to the terms and conditions of this Public License, + the Licensor hereby grants You a worldwide, royalty-free, + non-sublicensable, non-exclusive, irrevocable license to + exercise the Licensed Rights in the Licensed Material to: + + a. reproduce and Share the Licensed Material, in whole or + in part; and + + b. produce, reproduce, and Share Adapted Material. + + 2. Exceptions and Limitations. For the avoidance of doubt, where + Exceptions and Limitations apply to Your use, this Public + License does not apply, and You do not need to comply with + its terms and conditions. + + 3. Term. The term of this Public License is specified in Section + 6(a). + + 4. Media and formats; technical modifications allowed. The + Licensor authorizes You to exercise the Licensed Rights in + all media and formats whether now known or hereafter created, + and to make technical modifications necessary to do so. The + Licensor waives and/or agrees not to assert any right or + authority to forbid You from making technical modifications + necessary to exercise the Licensed Rights, including + technical modifications necessary to circumvent Effective + Technological Measures. For purposes of this Public License, + simply making modifications authorized by this Section 2(a) + (4) never produces Adapted Material. + + 5. Downstream recipients. + + a. Offer from the Licensor -- Licensed Material. Every + recipient of the Licensed Material automatically + receives an offer from the Licensor to exercise the + Licensed Rights under the terms and conditions of this + Public License. + + b. Additional offer from the Licensor -- Adapted Material. + Every recipient of Adapted Material from You + automatically receives an offer from the Licensor to + exercise the Licensed Rights in the Adapted Material + under the conditions of the Adapter's License You apply. + + c. No downstream restrictions. You may not offer or impose + any additional or different terms or conditions on, or + apply any Effective Technological Measures to, the + Licensed Material if doing so restricts exercise of the + Licensed Rights by any recipient of the Licensed + Material. + + 6. No endorsement. Nothing in this Public License constitutes or + may be construed as permission to assert or imply that You + are, or that Your use of the Licensed Material is, connected + with, or sponsored, endorsed, or granted official status by, + the Licensor or others designated to receive attribution as + provided in Section 3(a)(1)(A)(i). + + b. Other rights. + + 1. Moral rights, such as the right of integrity, are not + licensed under this Public License, nor are publicity, + privacy, and/or other similar personality rights; however, to + the extent possible, the Licensor waives and/or agrees not to + assert any such rights held by the Licensor to the limited + extent necessary to allow You to exercise the Licensed + Rights, but not otherwise. + + 2. Patent and trademark rights are not licensed under this + Public License. + + 3. To the extent possible, the Licensor waives any right to + collect royalties from You for the exercise of the Licensed + Rights, whether directly or through a collecting society + under any voluntary or waivable statutory or compulsory + licensing scheme. In all other cases the Licensor expressly + reserves any right to collect such royalties. + + +Section 3 -- License Conditions. + +Your exercise of the Licensed Rights is expressly made subject to the +following conditions. + + a. Attribution. + + 1. If You Share the Licensed Material (including in modified + form), You must: + + a. retain the following if it is supplied by the Licensor + with the Licensed Material: + + i. identification of the creator(s) of the Licensed + Material and any others designated to receive + attribution, in any reasonable manner requested by + the Licensor (including by pseudonym if + designated); + + ii. a copyright notice; + + iii. a notice that refers to this Public License; + + iv. a notice that refers to the disclaimer of + warranties; + + v. a URI or hyperlink to the Licensed Material to the + extent reasonably practicable; + + b. indicate if You modified the Licensed Material and + retain an indication of any previous modifications; and + + c. indicate the Licensed Material is licensed under this + Public License, and include the text of, or the URI or + hyperlink to, this Public License. + + 2. You may satisfy the conditions in Section 3(a)(1) in any + reasonable manner based on the medium, means, and context in + which You Share the Licensed Material. For example, it may be + reasonable to satisfy the conditions by providing a URI or + hyperlink to a resource that includes the required + information. + + 3. If requested by the Licensor, You must remove any of the + information required by Section 3(a)(1)(A) to the extent + reasonably practicable. + + b. ShareAlike. + + In addition to the conditions in Section 3(a), if You Share + Adapted Material You produce, the following conditions also apply. + + 1. The Adapter's License You apply must be a Creative Commons + license with the same License Elements, this version or + later, or a BY-SA Compatible License. + + 2. You must include the text of, or the URI or hyperlink to, the + Adapter's License You apply. You may satisfy this condition + in any reasonable manner based on the medium, means, and + context in which You Share Adapted Material. + + 3. You may not offer or impose any additional or different terms + or conditions on, or apply any Effective Technological + Measures to, Adapted Material that restrict exercise of the + rights granted under the Adapter's License You apply. + + +Section 4 -- Sui Generis Database Rights. + +Where the Licensed Rights include Sui Generis Database Rights that +apply to Your use of the Licensed Material: + + a. for the avoidance of doubt, Section 2(a)(1) grants You the right + to extract, reuse, reproduce, and Share all or a substantial + portion of the contents of the database; + + b. if You include all or a substantial portion of the database + contents in a database in which You have Sui Generis Database + Rights, then the database in which You have Sui Generis Database + Rights (but not its individual contents) is Adapted Material, + + including for purposes of Section 3(b); and + c. You must comply with the conditions in Section 3(a) if You Share + all or a substantial portion of the contents of the database. + +For the avoidance of doubt, this Section 4 supplements and does not +replace Your obligations under this Public License where the Licensed +Rights include other Copyright and Similar Rights. + + +Section 5 -- Disclaimer of Warranties and Limitation of Liability. + + a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE + EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS + AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF + ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS, + IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION, + WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR + PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS, + ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT + KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT + ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU. + + b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE + TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION, + NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT, + INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES, + COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR + USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN + ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR + DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR + IN PART, THIS LIMITATION MAY NOT APPLY TO YOU. + + c. The disclaimer of warranties and limitation of liability provided + above shall be interpreted in a manner that, to the extent + possible, most closely approximates an absolute disclaimer and + waiver of all liability. + + +Section 6 -- Term and Termination. + + a. This Public License applies for the term of the Copyright and + Similar Rights licensed here. However, if You fail to comply with + this Public License, then Your rights under this Public License + terminate automatically. + + b. Where Your right to use the Licensed Material has terminated under + Section 6(a), it reinstates: + + 1. automatically as of the date the violation is cured, provided + it is cured within 30 days of Your discovery of the + violation; or + + 2. upon express reinstatement by the Licensor. + + For the avoidance of doubt, this Section 6(b) does not affect any + right the Licensor may have to seek remedies for Your violations + of this Public License. + + c. For the avoidance of doubt, the Licensor may also offer the + Licensed Material under separate terms or conditions or stop + distributing the Licensed Material at any time; however, doing so + will not terminate this Public License. + + d. Sections 1, 5, 6, 7, and 8 survive termination of this Public + License. + + +Section 7 -- Other Terms and Conditions. + + a. The Licensor shall not be bound by any additional or different + terms or conditions communicated by You unless expressly agreed. + + b. Any arrangements, understandings, or agreements regarding the + Licensed Material not stated herein are separate from and + independent of the terms and conditions of this Public License. + + +Section 8 -- Interpretation. + + a. For the avoidance of doubt, this Public License does not, and + shall not be interpreted to, reduce, limit, restrict, or impose + conditions on any use of the Licensed Material that could lawfully + be made without permission under this Public License. + + b. To the extent possible, if any provision of this Public License is + deemed unenforceable, it shall be automatically reformed to the + minimum extent necessary to make it enforceable. If the provision + cannot be reformed, it shall be severed from this Public License + without affecting the enforceability of the remaining terms and + conditions. + + c. No term or condition of this Public License will be waived and no + failure to comply consented to unless expressly agreed to by the + Licensor. + + d. Nothing in this Public License constitutes or may be interpreted + as a limitation upon, or waiver of, any privileges and immunities + that apply to the Licensor or You, including from the legal + processes of any jurisdiction or authority. + + +======================================================================= + +Creative Commons is not a party to its public +licenses. Notwithstanding, Creative Commons may elect to apply one of +its public licenses to material it publishes and in those instances +will be considered the “Licensor.” The text of the Creative Commons +public licenses is dedicated to the public domain under the CC0 Public +Domain Dedication. Except for the limited purpose of indicating that +material is shared under a Creative Commons public license or as +otherwise permitted by the Creative Commons policies published at +creativecommons.org/policies, Creative Commons does not authorize the +use of the trademark "Creative Commons" or any other trademark or logo +of Creative Commons without its prior written consent including, +without limitation, in connection with any unauthorized modifications +to any of its public licenses or any other arrangements, +understandings, or agreements concerning use of licensed material. For +the avoidance of doubt, this paragraph does not form part of the +public licenses. + +Creative Commons may be contacted at creativecommons.org. + diff --git a/meta-citadel/licenses/Unicode b/meta-citadel/licenses/Unicode new file mode 100644 index 0000000..d1fa0cf --- /dev/null +++ b/meta-citadel/licenses/Unicode @@ -0,0 +1,50 @@ +UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE + + Unicode Data Files include all data files under the directories +http://www.unicode.org/Public/, http://www.unicode.org/reports/, and +http://www.unicode.org/cldr/data/. Unicode Data Files do not include PDF +online code charts under the directory http://www.unicode.org/Public/. +Software includes any source code published in the Unicode Standard or under +the directories http://www.unicode.org/Public/, +http://www.unicode.org/reports/, and http://www.unicode.org/cldr/data/. + + NOTICE TO USER: Carefully read the following legal agreement. BY +DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S DATA FILES +("DATA FILES"), AND/OR SOFTWARE ("SOFTWARE"), YOU UNEQUIVOCALLY ACCEPT, AND +AGREE TO BE BOUND BY, ALL OF THE TERMS AND CONDITIONS OF THIS AGREEMENT. IF +YOU DO NOT AGREE, DO NOT DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE THE DATA +FILES OR SOFTWARE. + + COPYRIGHT AND PERMISSION NOTICE + + Copyright © 1991-2016 Unicode, Inc. All rights reserved. Distributed under +the Terms of Use in http://www.unicode.org/copyright.html. + + Permission is hereby granted, free of charge, to any person obtaining a +copy of the Unicode data files and any associated documentation (the "Data +Files") or Unicode software and any associated documentation (the "Software") +to deal in the Data Files or Software without restriction, including without +limitation the rights to use, copy, modify, merge, publish, distribute, and/or +sell copies of the Data Files or Software, and to permit persons to whom the +Data Files or Software are furnished to do so, provided that (a) the above +copyright notice(s) and this permission notice appear with all copies of the +Data Files or Software, (b) both the above copyright notice(s) and this +permission notice appear in associated documentation, and (c) there is clear +notice in each modified Data File or in the Software as well as in the +documentation associated with the Data File(s) or Software that the data or +software has been modified. + + THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY +KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD +PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN +THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL +DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR +PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS +ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE +DATA FILES OR SOFTWARE. + + Except as contained in this notice, the name of a copyright holder shall +not be used in advertising or otherwise to promote the sale, use or other +dealings in these Data Files or Software without prior written authorization +of the copyright holder. diff --git a/meta-citadel/recipes-connectivity/modemmanager/modemmanager_1.6.10.bb b/meta-citadel/recipes-connectivity/modemmanager/modemmanager_1.6.10.bb new file mode 100644 index 0000000..7998993 --- /dev/null +++ b/meta-citadel/recipes-connectivity/modemmanager/modemmanager_1.6.10.bb @@ -0,0 +1,27 @@ +LICENSE = "GPLv2 & LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c" + +SRC_URI = "https://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz" +SRC_URI[md5sum] = "67160b94c0eda90ebf95d1b620229ca1" +SRC_URI[sha256sum] = "bc74326fa69ae8012f806e235f3d296144922669b952d4d4987dd0af645d5f68" + +S = "${WORKDIR}/ModemManager-${PV}" + +DEPENDS = "libgudev intltool-native glib-2.0 systemd polkit glib-2.0-native" + +FILES_${PN} += "\ + ${libdir}/ModemManager \ + ${libdir}/rules.d \ + ${datadir}/bash-completion \ + ${datadir}/polkit-1/actions \ + ${datadir}/icons \ + ${datadir}/dbus-1 \ +" +SYSTEMD_SERVICE_${PN} = "ModemManager.service" + +inherit pkgconfig gettext autotools systemd + +# --with-udev-base-dir set for usr merge +EXTRA_OECONF = "--disable-introspection --disable-vala --without-mbim --without-qmi --with-udev-base-dir=/usr/lib" + diff --git a/meta-citadel/recipes-connectivity/networkmanager/files/0001-allow-building-introspection-without-docs.patch b/meta-citadel/recipes-connectivity/networkmanager/files/0001-allow-building-introspection-without-docs.patch new file mode 100644 index 0000000..f1e8546 --- /dev/null +++ b/meta-citadel/recipes-connectivity/networkmanager/files/0001-allow-building-introspection-without-docs.patch @@ -0,0 +1,25 @@ +From d0c44d704d8ad95e9bd2491b60ed6a0f7cc832e7 Mon Sep 17 00:00:00 2001 +From: brl +Date: Mon, 25 Dec 2017 16:59:53 -0500 +Subject: [PATCH] allow building introspection without docs + +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index f8dcd13..ac3b6d7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1258,7 +1258,7 @@ GTK_DOC_CHECK(1.0) + + # check if we can build setting property documentation + build_docs=no +-if test -n "$INTROSPECTION_MAKEFILE"; then ++if test -n "$INTROSPECTION_MAKEFILE" -a "$enable_gtk_doc" = "yes"; then + # If g-i is installed we know we have python, but we might not have pygobject + if ! "$PYTHON" -c 'from gi.repository import GObject' >& /dev/null; then + AC_MSG_ERROR(["--enable-introspection aims to build the settings documentation. This requires GObject introspection for python (pygobject)]) +-- +2.14.3 + diff --git a/meta-citadel/recipes-connectivity/networkmanager/networkmanager.inc b/meta-citadel/recipes-connectivity/networkmanager/networkmanager.inc new file mode 100644 index 0000000..bb69d08 --- /dev/null +++ b/meta-citadel/recipes-connectivity/networkmanager/networkmanager.inc @@ -0,0 +1,125 @@ + +SUMMARY = "NetworkManager" +SECTION = "net/misc" + +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=cbbffd568227ada506640fe950a4823b \ + file://libnm-util/COPYING;md5=1c4fa765d6eb3cd2fbd84344a1b816cd \ + file://docs/api/html/license.html;md5=eb0c003714e5391000fdfd9c9615cccf \ +" + +DEPENDS = "intltool-native libnl dbus dbus-glib dbus-glib-native libgudev util-linux libnewt polkit libndp python3-pygobject-native python3-pygobject xmlto-native" + + +export GI_TYPELIB_PATH = "${STAGING_LIBDIR_NATIVE}/girepository-1.0" +inherit gnomebase gettext systemd bluetooth gobject-introspection upstream-version-is-even python3native gtk-doc + +SRC_URI = "${GNOME_MIRROR}/NetworkManager/${@gnome_verdir("${PV}")}/NetworkManager-${PV}.tar.xz \ + " +S = "${WORKDIR}/NetworkManager-${PV}" + +EXTRA_OECONF = " \ + --disable-ifcfg-rh \ + --disable-ifnet \ + --disable-ifcfg-suse \ + --disable-json-validation \ + --disable-more-warnings \ + --with-iptables=${sbindir}/iptables \ + --disable-vala \ + --without-selinux \ + --without-wext \ + --with-libnm-glib \ + --with-tests \ + --enable-introspection \ + --with-nmtui=yes \ +" + +do_compile_prepend() { + export GIR_EXTRA_LIBS_PATH="${B}/libnm-util/.libs:${B}/libnm/.libs:${B}/libnm-core/.libs:${B}/libnm-glib/.libs" +} + +PACKAGECONFIG ??= "nss ifupdown netconfig dhclient concheck \ + ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','consolekit',d)} \ + ${@bb.utils.contains('DISTRO_FEATURES','bluetooth','${BLUEZ}','',d)} \ + ${@bb.utils.contains('DISTRO_FEATURES','wifi','wifi','',d)} \ +" +PACKAGECONFIG[systemd] = " \ + --with-systemdsystemunitdir=${systemd_unitdir}/system --with-session-tracking=systemd --enable-polkit, \ + --without-systemdsystemunitdir, \ + polkit \ +" +PACKAGECONFIG[bluez5] = "--enable-bluez5-dun,--disable-bluez5-dun,bluez5" +# consolekit is not picked by shlibs, so add it to RDEPENDS too +PACKAGECONFIG[consolekit] = "--with-session-tracking=consolekit,,consolekit,consolekit" +PACKAGECONFIG[modemmanager] = "--with-modem-manager-1=yes,--with-modem-manager-1=no,modemmanager" +PACKAGECONFIG[ppp] = "--enable-ppp,--disable-ppp,ppp,ppp" +# Use full featured dhcp client instead of internal one +PACKAGECONFIG[dhclient] = "--with-dhclient=${base_sbindir}/dhclient,,,dhcp-client" +PACKAGECONFIG[dnsmasq] = "--with-dnsmasq=${bindir}/dnsmasq" +PACKAGECONFIG[nss] = "--with-crypto=nss,,nss" +PACKAGECONFIG[gnutls] = "--with-crypto=gnutls,,gnutls libgcrypt" +PACKAGECONFIG[wifi] = "--enable-wifi=yes,--enable-wifi=no,wireless-tools,wpa-supplicant wireless-tools" +PACKAGECONFIG[ifupdown] = "--enable-ifupdown,--disable-ifupdown" +PACKAGECONFIG[netconfig] = "--with-netconfig=yes,--with-netconfig=no" +PACKAGECONFIG[qt4-x11-free] = "--enable-qt,--disable-qt,qt4-x11-free" +PACKAGECONFIG[concheck] = "--enable-concheck,--disable-concheck,curl,curl" + +PACKAGES =+ "libnmutil libnmglib libnmglib-vpn ${PN}-tests \ + ${PN}-nmtui ${PN}-nmtui-doc \ + ${PN}-adsl \ +" + +FILES_libnmutil += "${libdir}/libnm-util.so.*" +FILES_libnmglib += "${libdir}/libnm-glib.so.*" +FILES_libnmglib-vpn += "${libdir}/libnm-glib-vpn.so.*" + +FILES_${PN}-adsl = "${libdir}/NetworkManager/libnm-device-plugin-adsl.so" + +FILES_${PN} += " \ + ${libexecdir} \ + ${libdir}/NetworkManager \ + ${libdir}/pppd/*/nm-pppd-plugin.so \ + ${libdir}/NetworkManager/*.so \ + ${datadir}/bash-completion \ + ${datadir}/gir-1.0 \ + ${datadir}/polkit-1 \ + ${datadir}/dbus-1 \ + ${base_libdir}/udev/* \ + ${systemd_unitdir}/system \ +" + +RRECOMMENDS_${PN} += "iptables \ + ${@bb.utils.contains('PACKAGECONFIG','dnsmasq','dnsmasq','',d)} \ +" + +FILES_${PN}-dbg += " \ + ${libdir}/NetworkManager/.debug/ \ + ${libdir}/pppd/*/.debug/ \ +" + +FILES_${PN}-dev += " \ + ${datadir}/NetworkManager/gdb-cmd \ + ${libdir}/pppd/*/*.la \ + ${libdir}/NetworkManager/*.la \ +" + +FILES_${PN}-tests = " \ + ${bindir}/nm-online \ +" + +FILES_${PN}-nmtui = " \ + ${bindir}/nmtui \ + ${bindir}/nmtui-edit \ + ${bindir}/nmtui-connect \ + ${bindir}/nmtui-hostname \ +" + +FILES_${PN}-nmtui-doc = " \ + ${mandir}/man1/nmtui* \ +" + +SYSTEMD_SERVICE_${PN} = "NetworkManager.service NetworkManager-dispatcher.service" + +do_install_append() { + rm -rf ${D}/run ${D}${localstatedir}/run +} diff --git a/meta-citadel/recipes-connectivity/networkmanager/networkmanager_1.10.0.bb b/meta-citadel/recipes-connectivity/networkmanager/networkmanager_1.10.0.bb index 6a4679d..34cdbbd 100644 --- a/meta-citadel/recipes-connectivity/networkmanager/networkmanager_1.10.0.bb +++ b/meta-citadel/recipes-connectivity/networkmanager/networkmanager_1.10.0.bb @@ -1,130 +1,4 @@ -# -# meta-openembedded recipe, edited as little as possible -# - -SUMMARY = "NetworkManager" -SECTION = "net/misc" - -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=cbbffd568227ada506640fe950a4823b \ - file://libnm-util/COPYING;md5=1c4fa765d6eb3cd2fbd84344a1b816cd \ - file://docs/api/html/license.html;md5=eb0c003714e5391000fdfd9c9615cccf \ -" - -DEPENDS = "intltool-native libnl dbus dbus-glib dbus-glib-native libgudev util-linux libnewt polkit libndp" - - -inherit gnomebase gettext systemd bluetooth gobject-introspection upstream-version-is-even - -SRC_URI = " \ - ${GNOME_MIRROR}/NetworkManager/${@gnome_verdir("${PV}")}/NetworkManager-${PV}.tar.xz \ - file://0001-build-fix-race-creating-libnm-core-tests-directory-f.patch \ -" +require networkmanager.inc SRC_URI[md5sum] = "c4308b83f77a7cb8c6e0e0ec1a30c89f" SRC_URI[sha256sum] = "8abbd60cf0e56003a7b9428ceb50a58c80e02e045ac31c3399e9227a712e04de" -S = "${WORKDIR}/NetworkManager-${PV}" - -EXTRA_OECONF = " \ - --disable-ifcfg-rh \ - --disable-ifnet \ - --disable-ifcfg-suse \ - --disable-json-validation \ - --disable-more-warnings \ - --with-iptables=${sbindir}/iptables \ - --disable-ovs \ - --disable-vala \ - --without-selinux \ - --without-wext \ - --without-libnm-glib \ - --with-tests \ - --disable-introspection \ - --with-nmtui=yes \ -" - -do_compile_prepend() { - export GIR_EXTRA_LIBS_PATH="${B}/libnm-util/.libs" -} - -PACKAGECONFIG ??= "nss ifupdown netconfig dhclient concheck \ - ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','consolekit',d)} \ - ${@bb.utils.contains('DISTRO_FEATURES','bluetooth','${BLUEZ}','',d)} \ - ${@bb.utils.contains('DISTRO_FEATURES','wifi','wifi','',d)} \ -" -PACKAGECONFIG[systemd] = " \ - --with-systemdsystemunitdir=${systemd_unitdir}/system --with-session-tracking=systemd --enable-polkit, \ - --without-systemdsystemunitdir, \ - polkit \ -" -PACKAGECONFIG[bluez5] = "--enable-bluez5-dun,--disable-bluez5-dun,bluez5" -# consolekit is not picked by shlibs, so add it to RDEPENDS too -PACKAGECONFIG[consolekit] = "--with-session-tracking=consolekit,,consolekit,consolekit" -PACKAGECONFIG[modemmanager] = "--with-modem-manager-1=yes,--with-modem-manager-1=no,modemmanager" -PACKAGECONFIG[ppp] = "--enable-ppp,--disable-ppp,ppp,ppp" -# Use full featured dhcp client instead of internal one -PACKAGECONFIG[dhclient] = "--with-dhclient=${base_sbindir}/dhclient,,,dhcp-client" -PACKAGECONFIG[dnsmasq] = "--with-dnsmasq=${bindir}/dnsmasq" -PACKAGECONFIG[nss] = "--with-crypto=nss,,nss" -PACKAGECONFIG[gnutls] = "--with-crypto=gnutls,,gnutls libgcrypt" -PACKAGECONFIG[wifi] = "--enable-wifi=yes,--enable-wifi=no,wireless-tools,wpa-supplicant wireless-tools" -PACKAGECONFIG[ifupdown] = "--enable-ifupdown,--disable-ifupdown" -PACKAGECONFIG[netconfig] = "--with-netconfig=yes,--with-netconfig=no" -PACKAGECONFIG[qt4-x11-free] = "--enable-qt,--disable-qt,qt4-x11-free" -PACKAGECONFIG[concheck] = "--enable-concheck,--disable-concheck,curl,curl" - -PACKAGES =+ "libnmutil libnmglib libnmglib-vpn ${PN}-tests \ - ${PN}-nmtui ${PN}-nmtui-doc \ - ${PN}-adsl \ -" - -FILES_libnmutil += "${libdir}/libnm-util.so.*" -FILES_libnmglib += "${libdir}/libnm-glib.so.*" -FILES_libnmglib-vpn += "${libdir}/libnm-glib-vpn.so.*" - -FILES_${PN}-adsl = "${libdir}/NetworkManager/libnm-device-plugin-adsl.so" - -FILES_${PN} += " \ - ${libexecdir} \ - ${libdir}/pppd/*/nm-pppd-plugin.so \ - ${libdir}/NetworkManager/*.so \ - ${datadir}/polkit-1 \ - ${datadir}/dbus-1 \ - ${base_libdir}/udev/* \ - ${systemd_unitdir}/system \ -" - -RRECOMMENDS_${PN} += "iptables \ - ${@bb.utils.contains('PACKAGECONFIG','dnsmasq','dnsmasq','',d)} \ -" - -FILES_${PN}-dbg += " \ - ${libdir}/NetworkManager/.debug/ \ - ${libdir}/pppd/*/.debug/ \ -" - -FILES_${PN}-dev += " \ - ${datadir}/NetworkManager/gdb-cmd \ - ${libdir}/pppd/*/*.la \ - ${libdir}/NetworkManager/*.la \ -" - -FILES_${PN}-tests = " \ - ${bindir}/nm-online \ -" - -FILES_${PN}-nmtui = " \ - ${bindir}/nmtui \ - ${bindir}/nmtui-edit \ - ${bindir}/nmtui-connect \ - ${bindir}/nmtui-hostname \ -" - -FILES_${PN}-nmtui-doc = " \ - ${mandir}/man1/nmtui* \ -" - -SYSTEMD_SERVICE_${PN} = "NetworkManager.service NetworkManager-dispatcher.service" - -do_install_append() { - rm -rf ${D}/run ${D}${localstatedir}/run -} diff --git a/meta-citadel/recipes-connectivity/networkmanager/networkmanager_1.8.4.bb b/meta-citadel/recipes-connectivity/networkmanager/networkmanager_1.8.4.bb new file mode 100644 index 0000000..8031976 --- /dev/null +++ b/meta-citadel/recipes-connectivity/networkmanager/networkmanager_1.8.4.bb @@ -0,0 +1,3 @@ +require networkmanager.inc +SRC_URI[md5sum] = "fefd157d884f7fd50384268704c5aa5d" +SRC_URI[sha256sum] = "625e2eb36386dcae599075226200140d010f213b47f7202d83b3b1a202029212" diff --git a/meta-citadel/recipes-core/dbus/dbus_%.bbappend b/meta-citadel/recipes-core/dbus/dbus_%.bbappend new file mode 100644 index 0000000..8cc9fff --- /dev/null +++ b/meta-citadel/recipes-core/dbus/dbus_%.bbappend @@ -0,0 +1 @@ +PACKAGECONFIG_append = " user-session" diff --git a/meta-citadel/recipes-core/systemd/systemd/0001-dont-process-the-same-method-call-twice-in-logind.patch b/meta-citadel/recipes-core/systemd/systemd/0001-dont-process-the-same-method-call-twice-in-logind.patch new file mode 100644 index 0000000..8dda267 --- /dev/null +++ b/meta-citadel/recipes-core/systemd/systemd/0001-dont-process-the-same-method-call-twice-in-logind.patch @@ -0,0 +1,25 @@ +From 4a309893fefb63d91a62a4f959456bd6d8f4703f Mon Sep 17 00:00:00 2001 +From: brl +Date: Tue, 26 Dec 2017 11:32:58 -0500 +Subject: [PATCH] dont process the same method call twice in logind + +--- + src/login/logind-session-dbus.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/login/logind-session-dbus.c b/src/login/logind-session-dbus.c +index 22e5349a6..649f3c155 100644 +--- a/src/login/logind-session-dbus.c ++++ b/src/login/logind-session-dbus.c +@@ -457,7 +457,7 @@ static int method_take_device(sd_bus_message *message, void *userdata, sd_bus_er + goto error; + + session_save(s); +- return 0; ++ return 1; + + error: + session_device_free(sd); +-- +2.14.3 + diff --git a/meta-citadel/recipes-core/systemd/systemd_234.bbappend b/meta-citadel/recipes-core/systemd/systemd_234.bbappend new file mode 100644 index 0000000..ef6aee4 --- /dev/null +++ b/meta-citadel/recipes-core/systemd/systemd_234.bbappend @@ -0,0 +1,10 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +# https://github.com/systemd/systemd/issues/6375 +SRC_URI += "file://0001-dont-process-the-same-method-call-twice-in-logind.patch" + +RDEPENDS_${PN}_remove = "systemd-serialgetty" +GROUPADD_PARAM_${PN} += "; -r kvm" +PACKAGECONFIG = "\ + efi ldconfig pam usrmerge rfkill backlight binfmt hostnamed ima localed logind machined myhostname \ + nss polkit randomseed seccomp timedated utmp vconsole \ +" diff --git a/meta-citadel/recipes-desktop/accountsservice/accountsservice_0.6.45.bb b/meta-citadel/recipes-desktop/accountsservice/accountsservice_0.6.45.bb new file mode 100644 index 0000000..4c27f29 --- /dev/null +++ b/meta-citadel/recipes-desktop/accountsservice/accountsservice_0.6.45.bb @@ -0,0 +1,22 @@ +SUMMARY = "D-Bus service for accessing the list of user accounts and information attached to those accounts." +HOMEPAGE = "https://www.freedesktop.org/wiki/Software/AccountsService" + +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +SRC_URI = "https://www.freedesktop.org/software/accountsservice/accountsservice-${PV}.tar.xz" +SRC_URI[md5sum] = "b4c0a74bb5f8680dda0b7be27b1c02d9" +SRC_URI[sha256sum] = "fb0fc293aa75d59f5ef5db719d37a21831c4dd74a97526ee7e51ce936311ef26" + +DEPENDS = "glib-2.0 intltool-native polkit systemd glib-2.0-native" + +inherit pkgconfig gettext autotools gobject-introspection + +FILES_${PN} += "\ + ${datadir}/dbus-1/interfaces/*.xml \ + ${datadir}/dbus-1/system-services/org.freedesktop.Accounts.service \ + ${datadir}/polkit-1/actions/org.freedesktop.accounts.policy \ + ${systemd_system_unitdir} \ +" +EXTRA_OECONF = "--enable-admin-group=wheel" + diff --git a/meta-citadel/recipes-desktop/adapta-gtk-theme/adapta-gtk-theme_3.93.0.11.bb b/meta-citadel/recipes-desktop/adapta-gtk-theme/adapta-gtk-theme_3.93.0.11.bb new file mode 100644 index 0000000..6ea7002 --- /dev/null +++ b/meta-citadel/recipes-desktop/adapta-gtk-theme/adapta-gtk-theme_3.93.0.11.bb @@ -0,0 +1,21 @@ +SUMMARY = "An adaptive Gtk+ theme based on Material Design Guidelines" +HOMEPAGE = "https://github.com/adapta-project" + +LICENSE = "GPLv2 & CC-BY-SA-4.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://LICENSE_CC_BY_SA4;md5=e277f2eefa979e093628e4fb368f5044" + +SRC_URI = "https://github.com/adapta-project/adapta-gtk-theme/archive/${PV}.tar.gz;downloadfilename=adapta-gtk-theme-${PV}.tar.gz" +SRC_URI[md5sum] = "612fb300b6e54db0044808da9e90c2a4" +SRC_URI[sha256sum] = "6f6ce6cbe0a78606b8c422a1d2c9e4c6a794047be4cfc4a322f89d2c369a0d40" + +S = "${WORKDIR}/${BPN}-${PV}" + +DEPENDS = "gdk-pixbuf glib-2.0 glib-2.0-native sassc-native" + +inherit pkgconfig autotools-brokensep allarch + +FILES_${PN} = "${datadir}/themes" + +EXTRA_OECONF = "--disable-cinnamon --disable-flashback --disable-unity --disable-xfce --disable-mate --disable-openbox --disable-plank --disable-telegram --disable-chrome --disable-gtk_next --disable-parallel" + diff --git a/meta-citadel/recipes-desktop/atk/at-spi2-atk_2.26.1.bb b/meta-citadel/recipes-desktop/atk/at-spi2-atk_2.26.1.bb new file mode 100644 index 0000000..8617bb8 --- /dev/null +++ b/meta-citadel/recipes-desktop/atk/at-spi2-atk_2.26.1.bb @@ -0,0 +1,22 @@ +SUMMARY = "AT-SPI 2 Toolkit Bridge" +HOMEPAGE = "https://wiki.linuxfoundation.org/accessibility/d-bus" +LICENSE = "LGPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=e9f288ba982d60518f375b5898283886" + +MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" + +SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz" +SRC_URI[md5sum] = "eeec6cead3350dca48a235271c105b3e" +SRC_URI[sha256sum] = "b4f0c27b61dbffba7a5b5ba2ff88c8cee10ff8dac774fa5b79ce906853623b75" + +DEPENDS = "dbus glib-2.0 glib-2.0-native atk at-spi2-core" + +inherit autotools pkgconfig distro_features_check upstream-version-is-even + +# The at-spi2-core requires x11 in DISTRO_FEATURES +REQUIRED_DISTRO_FEATURES = "x11" + +PACKAGES =+ "${PN}-gnome ${PN}-gtk2" + +FILES_${PN}-gnome = "${libdir}/gnome-settings-daemon-3.0/gtk-modules" +FILES_${PN}-gtk2 = "${libdir}/gtk-2.0/modules/libatk-bridge.*" diff --git a/meta-citadel/recipes-desktop/atk/at-spi2-core_2.26.2.bb b/meta-citadel/recipes-desktop/atk/at-spi2-core_2.26.2.bb new file mode 100644 index 0000000..1f85b63 --- /dev/null +++ b/meta-citadel/recipes-desktop/atk/at-spi2-core_2.26.2.bb @@ -0,0 +1,29 @@ +SUMMARY = "Assistive Technology Service Provider Interface (dbus core)" +HOMEPAGE = "https://wiki.linuxfoundation.org/accessibility/d-bus" +LICENSE = "LGPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=e9f288ba982d60518f375b5898283886" + +MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" + +FILESEXTRAPATHS_prepend := "${COREBASE}/meta/recipes-support/atk/at-spi2-core:" +SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ + file://0001-build-Add-with-systemduserunitdir.patch \ + " +SRC_URI[md5sum] = "4a042e4c801fdb793788b749eab21485" +SRC_URI[sha256sum] = "c80e0cdf5e3d713400315b63c7deffa561032a6c37289211d8afcfaa267c2615" + +DEPENDS = "dbus glib-2.0 virtual/libx11 libxi libxtst" + +inherit autotools gtk-doc gettext systemd pkgconfig distro_features_check upstream-version-is-even gobject-introspection +# depends on virtual/libx11 +REQUIRED_DISTRO_FEATURES = "x11" + +EXTRA_OECONF = " \ + --with-systemduserunitdir=${systemd_user_unitdir} \ + --with-dbus-daemondir=${bindir}" + +FILES_${PN} += "${datadir}/dbus-1/services/*.service \ + ${datadir}/dbus-1/accessibility-services/*.service \ + ${datadir}/defaults/at-spi2 \ + ${systemd_user_unitdir}/at-spi-dbus-bus.service \ + " diff --git a/meta-citadel/recipes-desktop/atk/atk_2.26.1.bb b/meta-citadel/recipes-desktop/atk/atk_2.26.1.bb new file mode 100644 index 0000000..685b599 --- /dev/null +++ b/meta-citadel/recipes-desktop/atk/atk_2.26.1.bb @@ -0,0 +1,19 @@ +SUMMARY = "Accessibility toolkit for GNOME" +HOMEPAGE = "http://live.gnome.org/GAP/" +BUGTRACKER = "https://bugzilla.gnome.org/" +SECTION = "x11/libs" + +LICENSE = "GPLv2+ & LGPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ + file://atk/atkutil.c;endline=18;md5=6fd31cd2fdc9b30f619ca8d819bc12d3 \ + file://atk/atk.h;endline=18;md5=fcd7710187e0eae485e356c30d1b0c3b" + +DEPENDS = "glib-2.0" + +inherit gnomebase gtk-doc gettext upstream-version-is-even gobject-introspection + +SRC_URI[archive.md5sum] = "7cddcc313b9a3efd19b2ddf079ba68f5" +SRC_URI[archive.sha256sum] = "ef00ff6b83851dddc8db38b4d9faeffb99572ba150b0664ee02e46f015ea97cb" + +BBCLASSEXTEND = "native" + diff --git a/meta-citadel/recipes-desktop/caribou/caribou_0.4.21.bb b/meta-citadel/recipes-desktop/caribou/caribou_0.4.21.bb new file mode 100644 index 0000000..826a2f5 --- /dev/null +++ b/meta-citadel/recipes-desktop/caribou/caribou_0.4.21.bb @@ -0,0 +1,31 @@ +SUMMARY = "Text entry and UI navigation application being developed as an alternative to the GNOME On-Screen Keyboard" +HOMEPAGE = "https://wiki.gnome.org/Projects/Caribou" + +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=e2aa4f66375a24019b0ff5e99cec40ad" + +SRC_URI = "https://download.gnome.org/sources/caribou/0.4/caribou-${PV}.tar.xz" +SRC_URI[md5sum] = "16b76cd7453b99e2871e8d4da88bf976" +SRC_URI[sha256sum] = "9c43d9f4bd30f4fea7f780d4e8b14f7589107c52e9cb6bd202bd0d1c2064de55" + +DEPENDS = "gtk+3 python3-pygobject intltool-native glib-2.0 clutter-1.0 libgee libxklavier glib-2.0-native xmlto-native python3-pygobject-native" + +PYTHON_CARIBOU = "${libdir}/python3.5/site-packages/caribou" +FILES_${PN} += "\ + ${datadir}/dbus-1/services \ + ${datadir}/glib-2.0/schemas \ + ${datadir}/antler \ + ${datadir}/vala/vapi \ + ${libdir}/gtk-3.0/modules/libcaribou-gtk-module.so \ + ${libdir}/gnome-settings-daemon-3.0/gtk-modules \ + ${PYTHON_CARIBOU} \ +" + +FILES_${PN}-staticdev += "${libdir}/gtk-3.0/modules/libcaribou-gtk-module.a" + +inherit gettext python3native pkgconfig autotools gobject-introspection + +export GI_TYPELIB_PATH = "${STAGING_LIBDIR_NATIVE}/girepository-1.0" + +EXTRA_OECONF = "--disable-glibtest --enable-gtk2-module=no" + diff --git a/meta-citadel/recipes-desktop/clutter-gtk/clutter-gtk_1.8.4.bb b/meta-citadel/recipes-desktop/clutter-gtk/clutter-gtk_1.8.4.bb new file mode 100644 index 0000000..6ddd083 --- /dev/null +++ b/meta-citadel/recipes-desktop/clutter-gtk/clutter-gtk_1.8.4.bb @@ -0,0 +1,16 @@ +SUMMARY = "Library for embedding a Clutter canvas (stage) in GTK+" +HOMEPAGE = "https://wiki.gnome.org/Projects/Clutter" + +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" + +SRC_URI = "https://download.gnome.org/sources/clutter-gtk/1.8/clutter-gtk-${PV}.tar.xz" +SRC_URI[md5sum] = "b363ac9878e2337be887b8ee9e1da00e" +SRC_URI[sha256sum] = "521493ec038973c77edcb8bc5eac23eed41645117894aaee7300b2487cb42b06" + +DEPENDS = "gtk+3 clutter-1.0" + +inherit gettext pkgconfig autotools gobject-introspection + +EXTRA_OECONF = "" + diff --git a/meta-citadel/recipes-desktop/colord-gtk/colord-gtk_0.1.26.bb b/meta-citadel/recipes-desktop/colord-gtk/colord-gtk_0.1.26.bb new file mode 100644 index 0000000..380f30d --- /dev/null +++ b/meta-citadel/recipes-desktop/colord-gtk/colord-gtk_0.1.26.bb @@ -0,0 +1,16 @@ +SUMMARY = "GTK support library for colord" +HOMEPAGE = "https://www.freedesktop.org/software/colord/" + +LICENSE = "LGPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=e6a600fd5e1d9cbde2d983680233ad02" + +SRC_URI = "https://www.freedesktop.org/software/colord/releases/colord-gtk-${PV}.tar.xz" +SRC_URI[md5sum] = "bb9d6f3c037152ad791003375aa6c16c" +SRC_URI[sha256sum] = "28d00b7f157ea3e2ea5315387b2660fde82faba16674861c50465e55d61a3e45" + +DEPENDS = "lcms glib-2.0 intltool-native gtk+3 glib-2.0-native colord" + +inherit pkgconfig gettext autotools + +EXTRA_OECONF = "--enable-introspection=no --disable-gtk-doc" + diff --git a/meta-citadel/recipes-desktop/colord/colord/0001-remove-gobject-introspection.patch b/meta-citadel/recipes-desktop/colord/colord/0001-remove-gobject-introspection.patch new file mode 100644 index 0000000..d0062aa --- /dev/null +++ b/meta-citadel/recipes-desktop/colord/colord/0001-remove-gobject-introspection.patch @@ -0,0 +1,128 @@ +From b7a5716585989191c1c6856852fe162aa6cb0adc Mon Sep 17 00:00:00 2001 +From: brl +Date: Mon, 18 Dec 2017 15:04:09 -0500 +Subject: [PATCH] remove gobject introspection + +--- + lib/colord/meson.build | 59 ------------------------------------------------ + lib/colorhug/meson.build | 34 ---------------------------- + 2 files changed, 93 deletions(-) + +diff --git a/lib/colord/meson.build b/lib/colord/meson.build +index 580a2fa..af75d23 100644 +--- a/lib/colord/meson.build ++++ b/lib/colord/meson.build +@@ -146,65 +146,6 @@ pkgg.generate( + description : 'colord is a system daemon for managing color devices', + ) + +-libcolord_girtarget = gnome.generate_gir(colord, +- sources : [ +- 'cd-client.c', +- 'cd-client.h', +- 'cd-client-sync.c', +- 'cd-client-sync.h', +- 'cd-color.c', +- 'cd-color.h', +- 'cd-edid.c', +- 'cd-edid.h', +- 'cd-device.c', +- 'cd-device.h', +- 'cd-device-sync.c', +- 'cd-device-sync.h', +- 'cd-enum.c', +- 'cd-enum.h', +- 'cd-icc.c', +- 'cd-icc.h', +- 'cd-it8.c', +- 'cd-it8.h', +- 'cd-math.c', +- 'cd-math.h', +- 'cd-profile.c', +- 'cd-profile.h', +- 'cd-profile-sync.c', +- 'cd-profile-sync.h', +- 'cd-sensor.c', +- 'cd-sensor.h', +- 'cd-sensor-sync.c', +- 'cd-sensor-sync.h', +- 'cd-spectrum.c', +- 'cd-spectrum.h', +- ], +- nsversion : '1.0', +- namespace : 'Colord', +- symbol_prefix : 'cd', +- identifier_prefix : 'Cd', +- export_packages : 'colord', +- extra_args : [ +- '--c-include=colord.h', +- ], +- c_args : [ +- cargs, +- ], +- link_with : colordprivate, +- dependencies : [ +- gio, +- glib, +- lcms, +- ], +- includes : [ +- 'Gio-2.0', +- 'GObject-2.0', +- ], +- install : true +-) +-libcolord_gir = libcolord_girtarget[0] +-libcolord_typelib = libcolord_girtarget[1] +- + if get_option('enable-vala') + gnome.generate_vapi('colord', + sources: libcolord_girtarget[0], +diff --git a/lib/colorhug/meson.build b/lib/colorhug/meson.build +index 1ee1ce8..9c69201 100644 +--- a/lib/colorhug/meson.build ++++ b/lib/colorhug/meson.build +@@ -73,40 +73,6 @@ pkgg.generate( + description : 'ColorHug is a simple display hardware colorimeter', + ) + +-libcolorhug_gir = gnome.generate_gir(colorhug, +- sources : [ +- 'ch-common.c', +- 'ch-common.h', +- 'ch-device.c', +- 'ch-device.h', +- 'ch-device-queue.c', +- 'ch-device-queue.h', +- 'ch-hash.c', +- 'ch-hash.h', +- ], +- nsversion : '1.0', +- namespace : 'Colorhug', +- symbol_prefix : 'ch', +- identifier_prefix : 'Ch', +- export_packages : 'colorhug', +- c_args : [ +- cargs, +- ], +- link_with : colorhug, +- dependencies : [ +- gio, +- glib, +- lcms, +- ], +- includes : [ +- 'Gio-2.0', +- 'GObject-2.0', +- 'GUsb-1.0', +- libcolord_gir, +- ], +- install : true +-) +- + if get_option('enable-tests') + testdatadir = join_paths(meson.source_root(), 'data', 'tests') + e = executable( +-- +2.14.3 + diff --git a/meta-citadel/recipes-desktop/colord/colord_1.4.1.bb b/meta-citadel/recipes-desktop/colord/colord_1.4.1.bb new file mode 100644 index 0000000..c023a73 --- /dev/null +++ b/meta-citadel/recipes-desktop/colord/colord_1.4.1.bb @@ -0,0 +1,63 @@ +SUMMARY = "System service to manage, install and generate color profiles to color manage input and output devices" +HOMEPAGE ="https://www.freedesktop.org/software/colord/" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SRC_URI = "https://www.freedesktop.org/software/colord/releases/colord-${PV}.tar.xz \ + file://0001-remove-gobject-introspection.patch \ + " +SRC_URI[md5sum] = "f457be5b7c44827e6c747ec80a6dc69a" +SRC_URI[sha256sum] = "2b068fc8298265a7a3b68e7516c7a263394cff57579af0d1c0fb6b7429230555" + +DEPENDS = "glib-2.0-native lcms libgusb libgudev polkit" +EXTRA_OEMESON = "-Denable-argyllcms-sensor=false -Denable-man=false -Denable-docs=false -Dwith-daemon-user=colord -Denable-bash-completion=false -Denable-systemd=true -Denable-tests=false -Denable-print-profiles=false --buildtype=release" + +PACKAGES += "${PN}-plugins" + +FILES_${PN} += "\ + ${datadir}/glib-2.0/schemas \ + ${datadir}/polkit-1 \ + ${datadir}/dbus-1 \ + ${datadir}/color/icc/colord \ + ${libdir}/tmpfiles.d \ + ${systemd_user_unitdir}/colord-session.service \ +" +SYSTEMD_SERVICE_${PN} = "colord.service" + +FILES_${PN}-plugins = "\ + ${libdir}/colord-plugins \ + ${libdir}/colord-sensors \ +" + +# This probably belongs in meson.bbclass +# +# 1) write out a wrapper script that can execute target binaries +# +# 2) add exe_wrapper line to the end of [binaries] section in the +# meson.cross file that meson.bbclass generated +# +setup_wrapper() { + if [ ! -e ${B}/wrapper ]; then + cat > ${B}/wrapper << EOF +#!/bin/sh +${STAGING_LIBDIR}/ld-linux-x86-64.so.2 --library-path ${STAGING_LIBDIR} \$@ +EOF + chmod +x ${B}/wrapper + fi + + if ! grep -q "^exe_wrapper" ${WORKDIR}/meson.cross; then + cat ${WORKDIR}/meson.cross | sed "/pkgconfig/ a\ +exe_wrapper = '${B}/wrapper'" > ${WORKDIR}/meson.cross.tmp + mv ${WORKDIR}/meson.cross.tmp ${WORKDIR}/meson.cross + fi +} + +do_configure_prepend() { + setup_wrapper +} + +USERADD_PACKAGES = "${PN}" +USERADD_PARAM_${PN} = "--system --home /var/lib/colord --no-create-home --shell /bin/false --user-group colord" +inherit meson systemd useradd + diff --git a/meta-citadel/recipes-desktop/dconf/dconf_0.26.1.bb b/meta-citadel/recipes-desktop/dconf/dconf_0.26.1.bb new file mode 100644 index 0000000..d2800a8 --- /dev/null +++ b/meta-citadel/recipes-desktop/dconf/dconf_0.26.1.bb @@ -0,0 +1,24 @@ +SUMMARY = "Low level configuration database backend for GSettings" +HOMEPAGE = "https://wiki.gnome.org/Projects/dconf" + +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" + +SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/dconf/0.26/dconf-${PV}.tar.xz" +SRC_URI[md5sum] = "a3cb67032e060450fa01c1a0f874bb60" +SRC_URI[sha256sum] = "d583b1f7fc93b879e2956acc6a26ea05a445a0002158aeef80c8e378e1414535" + +DEPENDS = "glib-2.0 xmlto-native glib-2.0-native" + +FILES_${PN} += "\ + ${libdir}/gio/modules/libdconfsettings.so \ + ${datadir}/bash-completion/completions/dconf \ + ${datadir}/vala/vapi \ + ${datadir}/dbus-1/services \ +" + +inherit pkgconfig gettext autotools + +EXTRA_OECONF = "--enable-man=no" + +BBCLASSEXTEND= "native" diff --git a/meta-citadel/recipes-desktop/gdm/files/gdm.conf b/meta-citadel/recipes-desktop/gdm/files/gdm.conf new file mode 100644 index 0000000..711b2dd --- /dev/null +++ b/meta-citadel/recipes-desktop/gdm/files/gdm.conf @@ -0,0 +1,19 @@ +# GDM configuration storage + +[daemon] +# Uncoment the line below to force the login screen to use Xorg +#WaylandEnable=false +AutomaticLoginEnable=true +AutomaticLogin=citadel + +[security] + + +[xdmcp] + +[chooser] + +[debug] +# Uncomment the line below to turn on debugging +#Enable=true + diff --git a/meta-citadel/recipes-desktop/gdm/gdm.inc b/meta-citadel/recipes-desktop/gdm/gdm.inc new file mode 100644 index 0000000..7491005 --- /dev/null +++ b/meta-citadel/recipes-desktop/gdm/gdm.inc @@ -0,0 +1,36 @@ +SUMMARY = "GNOME display manager" +HOMEPAGE = "https://wiki.gnome.org/Projects/GDM" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +inherit gnomebase useradd gettext pkgconfig autotools gobject-introspection systemd + +SRC_URI += "file://gdm.conf" + +DEPENDS = "libxcb libxinerama libxau libxdmcp intltool-native glib-2.0 accountsservice libpam libcheck libcanberra gtk+3 libx11 libxi systemd libxext glib-2.0-native dconf-native plymouth" + +FILES_${PN} += "\ + ${libdir}/systemd/system/gdm.service \ + ${libdir}/security/pam_gdm.so \ + ${datadir}/gnome-session/sessions \ + ${datadir}/dconf/profile \ + /run/gdm/greeter \ +" + +do_install_append() { + install -d ${D}${sysconfdir}/default/volatiles + echo "d gdm gdm 755 ${localstatedir}/run/gdm/greeter none" > ${D}${sysconfdir}/default/volatiles/99_gdm + rm -rf ${D}/run/gdm + rm ${D}${sysconfdir}/gdm/custom.conf + install -m 644 ${WORKDIR}/gdm.conf ${D}${sysconfdir}/gdm/custom.conf +} + + +SYSTEMD_SERVICE_${PN} = "gdm.service" + +USERADD_PACKAGES = "${PN}" +USERADD_PARAM_${PN} = "--system --home /var/lib/gdm -u 21 -s /bin/false --user-group gdm" + +EXTRA_OECONF = "--enable-introspection --enable-systemd-journal --enable-wayland-support --with-xdmcp=no --disable-static --with-default-pam-config=openembedded --with-plymouth=yes" + diff --git a/meta-citadel/recipes-desktop/gdm/gdm_3.26.2.bb b/meta-citadel/recipes-desktop/gdm/gdm_3.26.2.bb new file mode 100644 index 0000000..973c011 --- /dev/null +++ b/meta-citadel/recipes-desktop/gdm/gdm_3.26.2.bb @@ -0,0 +1,3 @@ +require gdm.inc +SRC_URI[archive.md5sum] = "ac91dfc1bf727a48dd1f3b587e0d15ab" +SRC_URI[archive.sha256sum] = "4b400367477303177d32c00582656ea735f91e2f7e259e5cc6db6d0afaf8dbc3" diff --git a/meta-citadel/recipes-desktop/gdm/gdm_3.27.3.bb b/meta-citadel/recipes-desktop/gdm/gdm_3.27.3.bb new file mode 100644 index 0000000..0de177f --- /dev/null +++ b/meta-citadel/recipes-desktop/gdm/gdm_3.27.3.bb @@ -0,0 +1,3 @@ +require gdm.inc +SRC_URI[archive.md5sum] = "f05b16eec5beb587afb15a2b6135151b" +SRC_URI[archive.sha256sum] = "1b750664636089da7940a55c73c09aa5ad5d716194b3eeff49d5f41bc9efdae2" diff --git a/meta-citadel/recipes-desktop/geoclue/geoclue_2.4.7.bb b/meta-citadel/recipes-desktop/geoclue/geoclue_2.4.7.bb new file mode 100644 index 0000000..39350c1 --- /dev/null +++ b/meta-citadel/recipes-desktop/geoclue/geoclue_2.4.7.bb @@ -0,0 +1,18 @@ +SUMMARY = "Provides D-Bus service makes location information available to location-aware applications" +HOMEPAGE = "https://www.freedesktop.org/wiki/Software/GeoClue/" + +LICENSE = "LGPLv2.1 & GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=8114b83a0435d8136b47bd70111ce5cd \ + file://COPYING.LIB;md5=4b54a1fd55a448865a0b32d41598759d" + +SRC_URI = "https://www.freedesktop.org/software/geoclue/releases/2.4/geoclue-${PV}.tar.xz" +SRC_URI[md5sum] = "e50086e742740413669ab72d8572db05" +SRC_URI[sha256sum] = "d17b96bb5799a84723385ea5704235565e9c3dedd2b7afac475a06e550ae0ea6" + +DEPENDS = "json-glib glib-2.0 libnotify intltool-native libsoup-2.4" +FILES_${PN} += "/usr/lib/systemd /usr/share/dbus-1" + +inherit gettext pkgconfig autotools gobject-introspection + +EXTRA_OECONF = "--disable-gtk-doc --disable-3g-source --disable-modem-gps-source --disable-cdma-source --disable-nmea-source" + diff --git a/meta-citadel/recipes-desktop/geocode-glib/geocode-glib_3.25.4.1.bb b/meta-citadel/recipes-desktop/geocode-glib/geocode-glib_3.25.4.1.bb new file mode 100644 index 0000000..8a627fa --- /dev/null +++ b/meta-citadel/recipes-desktop/geocode-glib/geocode-glib_3.25.4.1.bb @@ -0,0 +1,16 @@ +SUMMARY = "Convenience library for geocoding (finding longitude and latitude from a street address)" +HOMEPAGE = "https://developer.gnome.org/geocode-glib/stable/" + +LICENSE = "LGPLv2" +LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605" + +SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/geocode-glib/3.25/geocode-glib-${PV}.tar.xz" +SRC_URI[md5sum] = "7315e7ff162dfd01165ba8a284e3eda6" +SRC_URI[sha256sum] = "f10169262c313dfaa21acf00687c01e0aaf52983524648e8b9e8e42c052dd778" + +FILES_${PN} += "${datadir}/icons/gnome" + +DEPENDS = "json-glib libsoup-2.4 glib-2.0 glib-2.0-native" +EXTRA_OEMESON = "-Denable-installed-tests=false -Denable-introspection=false -Denable-gtk-doc=false --buildtype=release" + +inherit meson diff --git a/meta-citadel/recipes-desktop/gjs/gjs.inc b/meta-citadel/recipes-desktop/gjs/gjs.inc new file mode 100644 index 0000000..3e4c2f3 --- /dev/null +++ b/meta-citadel/recipes-desktop/gjs/gjs.inc @@ -0,0 +1,12 @@ +SUMMARY = "GNOME javascript bindings based on the Spidermonkey javascript engine" +HOMEPAGE = "https://wiki.gnome.org/Projects/Gjs" + +LICENSE = "MIT & LGPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=e7436dd55d7c05a5fa18f8cab10b3a6b \ + file://COPYING.LGPL;md5=3bf50002aefd002f49e7bb854063f7e7" + +inherit gnomebase gettext gobject-introspection + +DEPENDS = "glib-2.0 gobject-introspection cairo gtk+3 mozjs52 glib-2.0-native" +EXTRA_OECONF = "--without-dbus-tests" + diff --git a/meta-citadel/recipes-desktop/gjs/gjs_1.50.2.bb b/meta-citadel/recipes-desktop/gjs/gjs_1.50.2.bb new file mode 100644 index 0000000..44adc56 --- /dev/null +++ b/meta-citadel/recipes-desktop/gjs/gjs_1.50.2.bb @@ -0,0 +1,3 @@ +require gjs.inc +SRC_URI[archive.md5sum] = "d08c1dc0388a0a6bb0975d400928589e" +SRC_URI[archive.sha256sum] = "2fad902cf7a7806454121c03918755c646fcfd6b08b52d488987db4e2d691ff3" diff --git a/meta-citadel/recipes-desktop/gjs/gjs_1.51.3.bb b/meta-citadel/recipes-desktop/gjs/gjs_1.51.3.bb new file mode 100644 index 0000000..2078a71 --- /dev/null +++ b/meta-citadel/recipes-desktop/gjs/gjs_1.51.3.bb @@ -0,0 +1,3 @@ +require gjs.inc +SRC_URI[archive.md5sum] = "bdac030c93760105f119c543b4512341" +SRC_URI[archive.sha256sum] = "3a0c0eae273cebcb88876c8a2f0c30835ed58b71859ab2aa4640f8fe1d894ef8" diff --git a/meta-citadel/recipes-desktop/gnome-autoar/gnome-autoar_0.2.2.bb b/meta-citadel/recipes-desktop/gnome-autoar/gnome-autoar_0.2.2.bb new file mode 100644 index 0000000..1a7bb28 --- /dev/null +++ b/meta-citadel/recipes-desktop/gnome-autoar/gnome-autoar_0.2.2.bb @@ -0,0 +1,15 @@ +SUMMARY = "Provides functions, widgets, and gschemas for GNOME applications which want to use archives to transfer directories over the internet" +HOMEPAGE = "https://wiki.gnome.org/TingweiLan/GSoC2013Final" + +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +SRC_URI[archive.md5sum] = "90b4980c96614bcc376af44717deef99" +SRC_URI[archive.sha256sum] = "e1fe2c06eed30305c38bf0939c72b0e51b4716658e2663a0cf4a4bf57874ca62" + +DEPENDS = "glib-2.0 gtk+3 glib-2.0-native gnome-common autoconf-archive libarchive" + +inherit gnomebase gobject-introspection vala + +EXTRA_OECONF = "" + diff --git a/meta-citadel/recipes-desktop/gnome-backgrounds/gnome-backgrounds_3.26.2.bb b/meta-citadel/recipes-desktop/gnome-backgrounds/gnome-backgrounds_3.26.2.bb new file mode 100644 index 0000000..c73e576 --- /dev/null +++ b/meta-citadel/recipes-desktop/gnome-backgrounds/gnome-backgrounds_3.26.2.bb @@ -0,0 +1,17 @@ +SUMMARY = "Default GNOME desktop background images" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e" + +SRC_URI[archive.md5sum] = "479f8ff4460b2bb0fc17a193e5818a7f" +SRC_URI[archive.sha256sum] = "3a8ba8d3463d70bce2377b168218e32367c0020f2d0caf611e7e39066081f94f" + +FILES_${PN} += "\ + ${datadir}/backgrounds/gnome \ + ${datadir}/gnome-background-properties \ +" + +inherit gnomebase gettext + +EXTRA_OECONF = "" + diff --git a/meta-citadel/recipes-desktop/gnome-bluetooth/gnome-bluetooth_3.26.1.bb b/meta-citadel/recipes-desktop/gnome-bluetooth/gnome-bluetooth_3.26.1.bb new file mode 100644 index 0000000..3c2aca9 --- /dev/null +++ b/meta-citadel/recipes-desktop/gnome-bluetooth/gnome-bluetooth_3.26.1.bb @@ -0,0 +1,39 @@ +SUMMARY = "Bluetooth integration with GNOME desktop" +HOMEPAGE = "https://wiki.gnome.org/Projects/GnomeBluetooth" +LICENSE = "GPLv2 & LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \ + file://COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343" + +SRC_URI = "https://download.gnome.org/sources/gnome-bluetooth/3.26/gnome-bluetooth-${PV}.tar.xz" +SRC_URI[md5sum] = "200dff56da5a9ae2649aee38c0d7aac7" +SRC_URI[sha256sum] = "1d2c7b94fc76a833dad0d4d91344e9a5a7b4aad740c5a90944bd25c5be7e784f" + +DEPENDS = "glib-2.0 glib-2.0-native gtk+3 libcanberra libnotify libxml2-native gobject-introspection" + +FILES_${PN} += "${datadir}/icons" + +GIR_SCANNER_NATIVE = "${STAGING_BINDIR_NATIVE}/g-ir-scanner" +GIR_SCRIPT_PATH = "${B}/g-ir-scanner-script" + +# https://github.com/ninja-build/ninja/issues/1002 +write_gir_script () { + cat > ${GIR_SCRIPT_PATH} << EOF +#!/bin/sh +export PKG_CONFIG=pkg-config +export PKG_CONFIG_PATH=\"${PKG_CONFIG_PATH}\" +export XDG_DATA_DIRS=\"${STAGING_DATADIR}\" +export CC="x86_64-oe-linux-gcc --sysroot=${STAGING_DIR_HOST}" +export LD="x86_64-oe-linux-gcc --sysroot=${STAGING_DIR_HOST}" +${STAGING_BINDIR}/g-ir-scanner-wrapper \$@ +EOF + chmod +x ${GIR_SCRIPT_PATH} +} + +do_configure_append () { + write_gir_script + sed --in-place=.old "s;COMMAND = ${GIR_SCANNER_NATIVE};COMMAND = ${GIR_SCRIPT_PATH};" ${B}/build.ninja +} + +EXTRA_OEMESON = "--buildtype=release -Denable-introspection=true" + +inherit meson gobject-introspection diff --git a/meta-citadel/recipes-desktop/gnome-control-center/gnome-control-center.inc b/meta-citadel/recipes-desktop/gnome-control-center/gnome-control-center.inc new file mode 100644 index 0000000..961e55b --- /dev/null +++ b/meta-citadel/recipes-desktop/gnome-control-center/gnome-control-center.inc @@ -0,0 +1,25 @@ +SUMMARY = "GNOME desktop configuration UI" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e" + +inherit gettext gnome + +SRC_URI += "\ + file://0001-Remove-grilo-miner-from-background-panel.patch \ + file://0002-remove-unwanted-panels.patch \ + file://0003-disable-running-tests.patch \ + file://0004-remove-unwanted-panel-dependencies.patch \ + file://0005-fix-gdesktop-prefix.patch \ + " + +DEPENDS = "pulseaudio colord-gtk networkmanager ibus colord gnome-desktop gnome-settings-daemon polkit libcanberra gdk-pixbuf fontconfig gtk+3 glib-2.0 intltool-native upower libpwquality cairo libxml2 libgudev libsoup-2.4 libxi libwacom libx11 libgtop gnome-common-native autoconf-archive-native wayland accountsservice modemmanager nm-applet gnome-bluetooth clutter-1.0 clutter-gtk gsettings-desktop-schemas glib-2.0-native libxml2-native" + +FILES_${PN} += "\ + ${datadir}/bash-completion \ + ${datadir}/gettext \ + ${datadir}/dbus-1 \ + ${datadir}/gnome-shell/search-providers \ +" + +EXTRA_OECONF = "--disable-documentation --without-cheese" + diff --git a/meta-citadel/recipes-desktop/gnome-control-center/gnome-control-center/0001-Remove-grilo-miner-from-background-panel.patch b/meta-citadel/recipes-desktop/gnome-control-center/gnome-control-center/0001-Remove-grilo-miner-from-background-panel.patch new file mode 100644 index 0000000..5980b6a --- /dev/null +++ b/meta-citadel/recipes-desktop/gnome-control-center/gnome-control-center/0001-Remove-grilo-miner-from-background-panel.patch @@ -0,0 +1,136 @@ +From 618a2b52c41161d63f7ab4b5f72de7012fdc2f58 Mon Sep 17 00:00:00 2001 +From: brl +Date: Tue, 19 Dec 2017 14:04:28 -0500 +Subject: [PATCH 1/5] Remove grilo miner from background panel + +--- + panels/background/Makefile.am | 2 -- + panels/background/bg-pictures-source.c | 20 ++++++++++++++------ + 2 files changed, 14 insertions(+), 8 deletions(-) + +diff --git a/panels/background/Makefile.am b/panels/background/Makefile.am +index ccb8017..c49837f 100644 +--- a/panels/background/Makefile.am ++++ b/panels/background/Makefile.am +@@ -27,8 +27,6 @@ libbackground_chooser_la_SOURCES = \ + $(BUILT_SOURCES) \ + cc-background-chooser-dialog.c \ + cc-background-chooser-dialog.h \ +- cc-background-grilo-miner.c \ +- cc-background-grilo-miner.h \ + cc-background-item.c \ + cc-background-item.h \ + cc-background-xml.c \ +diff --git a/panels/background/bg-pictures-source.c b/panels/background/bg-pictures-source.c +index a3b35f3..9e5d23d 100644 +--- a/panels/background/bg-pictures-source.c ++++ b/panels/background/bg-pictures-source.c +@@ -29,7 +29,7 @@ + #include + #include + #include +-#include ++// #include + #include + #include + +@@ -46,7 +46,7 @@ struct _BgPicturesSourcePrivate + { + GCancellable *cancellable; + +- CcBackgroundGriloMiner *grl_miner; ++// CcBackgroundGriloMiner *grl_miner; + + GnomeDesktopThumbnailFactory *thumb_factory; + +@@ -86,7 +86,7 @@ bg_pictures_source_dispose (GObject *object) + g_clear_object (&priv->cancellable); + } + +- g_clear_object (&priv->grl_miner); ++// g_clear_object (&priv->grl_miner); + g_clear_object (&priv->thumb_factory); + + G_OBJECT_CLASS (bg_pictures_source_parent_class)->dispose (object); +@@ -479,7 +479,7 @@ add_single_file (BgPicturesSource *bg_source, + gboolean needs_download; + gboolean retval = FALSE; + GFile *pictures_dir, *cache_dir; +- GrlMedia *media; ++// GrlMedia *media; + + /* find png and jpeg files */ + if (!content_type) +@@ -538,14 +538,15 @@ add_single_file (BgPicturesSource *bg_source, + + read_file: + +- media = g_object_get_data (G_OBJECT (file), "grl-media"); +- if (media == NULL) ++// media = g_object_get_data (G_OBJECT (file), "grl-media"); ++// if (media == NULL) + { + g_object_set_data_full (G_OBJECT (file), "item", g_object_ref (item), g_object_unref); + g_file_read_async (file, G_PRIORITY_DEFAULT, + bg_source->priv->cancellable, + picture_opened_for_read, bg_source); + } ++#if 0 + else + { + GFile *native_file; +@@ -587,6 +588,7 @@ add_single_file (BgPicturesSource *bg_source, + g_free (native_dir); + g_free (native_path); + } ++#endif + + retval = TRUE; + +@@ -621,6 +623,7 @@ add_single_file_from_info (BgPicturesSource *bg_source, + return add_single_file (bg_source, file, content_type, mtime, ret_row_ref); + } + ++#if 0 + static gboolean + add_single_file_from_media (BgPicturesSource *bg_source, + GFile *file, +@@ -645,6 +648,7 @@ add_single_file_from_media (BgPicturesSource *bg_source, + + return add_single_file (bg_source, file, content_type, (guint64) mtime_unix, NULL); + } ++#endif + + gboolean + bg_pictures_source_add (BgPicturesSource *bg_source, +@@ -988,6 +992,7 @@ monitor_path (BgPicturesSource *self, + return monitor; + } + ++#if 0 + static void + media_found_cb (BgPicturesSource *self, GrlMedia *media) + { +@@ -999,6 +1004,7 @@ media_found_cb (BgPicturesSource *self, GrlMedia *media) + g_object_set_data_full (G_OBJECT (file), "grl-media", g_object_ref (media), g_object_unref); + add_single_file_from_media (self, file, media); + } ++#endif + + static void + bg_pictures_source_init (BgPicturesSource *self) +@@ -1026,9 +1032,11 @@ bg_pictures_source_init (BgPicturesSource *self) + priv->cache_dir_monitor = monitor_path (self, cache_path); + g_free (cache_path); + ++#if 0 + priv->grl_miner = cc_background_grilo_miner_new (); + g_signal_connect_swapped (priv->grl_miner, "media-found", G_CALLBACK (media_found_cb), self); + cc_background_grilo_miner_start (priv->grl_miner); ++#endif + + priv->thumb_factory = + gnome_desktop_thumbnail_factory_new (GNOME_DESKTOP_THUMBNAIL_SIZE_LARGE); +-- +2.14.3 + diff --git a/meta-citadel/recipes-desktop/gnome-control-center/gnome-control-center/0002-remove-unwanted-panels.patch b/meta-citadel/recipes-desktop/gnome-control-center/gnome-control-center/0002-remove-unwanted-panels.patch new file mode 100644 index 0000000..cab93a7 --- /dev/null +++ b/meta-citadel/recipes-desktop/gnome-control-center/gnome-control-center/0002-remove-unwanted-panels.patch @@ -0,0 +1,84 @@ +From 685f0fc6ae8fe70d1d3b6f12cc2aea8614632215 Mon Sep 17 00:00:00 2001 +From: brl +Date: Tue, 19 Dec 2017 14:06:06 -0500 +Subject: [PATCH 2/5] remove unwanted panels + +--- + panels/Makefile.am | 5 +---- + shell/Makefile.am | 5 +---- + shell/cc-panel-loader.c | 6 +++--- + 3 files changed, 5 insertions(+), 11 deletions(-) + +diff --git a/panels/Makefile.am b/panels/Makefile.am +index 507cd2f..1d36f3d 100644 +--- a/panels/Makefile.am ++++ b/panels/Makefile.am +@@ -6,18 +6,15 @@ SUBDIRS= \ + display \ + mouse \ + notifications \ +- online-accounts \ + region \ + info \ + sound \ + keyboard \ + universal-access \ +- user-accounts \ + datetime \ + search \ + privacy \ +- sharing \ +- printers ++ sharing + + if BUILD_WACOM + SUBDIRS += wacom +diff --git a/shell/Makefile.am b/shell/Makefile.am +index 8099330..de3e53d 100644 +--- a/shell/Makefile.am ++++ b/shell/Makefile.am +@@ -87,16 +87,13 @@ gnome_control_center_LDADD = \ + $(top_builddir)/panels/keyboard/libkeyboard.la \ + $(top_builddir)/panels/mouse/libmouse-properties.la \ + $(top_builddir)/panels/notifications/libnotifications.la \ +- $(top_builddir)/panels/online-accounts/libonline-accounts.la \ + $(top_builddir)/panels/power/libpower.la \ + $(top_builddir)/panels/privacy/libprivacy.la \ + $(top_builddir)/panels/region/libregion.la \ + $(top_builddir)/panels/search/libsearch.la \ + $(top_builddir)/panels/sharing/libsharing.la \ + $(top_builddir)/panels/sound/libsound.la \ +- $(top_builddir)/panels/universal-access/libuniversal-access.la \ +- $(top_builddir)/panels/user-accounts/libuser-accounts.la \ +- $(top_builddir)/panels/printers/libprinters.la ++ $(top_builddir)/panels/universal-access/libuniversal-access.la + + if BUILD_WACOM + gnome_control_center_LDADD += $(top_builddir)/panels/wacom/libwacom-properties.la +diff --git a/shell/cc-panel-loader.c b/shell/cc-panel-loader.c +index 8be3bb9..b244593 100644 +--- a/shell/cc-panel-loader.c ++++ b/shell/cc-panel-loader.c +@@ -93,16 +93,16 @@ static struct { + PANEL_TYPE("wifi", cc_wifi_panel_get_type ), + #endif + PANEL_TYPE("notifications", cc_notifications_panel_get_type), +- PANEL_TYPE("online-accounts", cc_goa_panel_get_type ), ++// PANEL_TYPE("online-accounts", cc_goa_panel_get_type ), + PANEL_TYPE("power", cc_power_panel_get_type ), +- PANEL_TYPE("printers", cc_printers_panel_get_type ), ++// PANEL_TYPE("printers", cc_printers_panel_get_type ), + PANEL_TYPE("privacy", cc_privacy_panel_get_type ), + PANEL_TYPE("region", cc_region_panel_get_type ), + PANEL_TYPE("search", cc_search_panel_get_type ), + PANEL_TYPE("sharing", cc_sharing_panel_get_type ), + PANEL_TYPE("sound", cc_sound_panel_get_type ), + PANEL_TYPE("universal-access", cc_ua_panel_get_type ), +- PANEL_TYPE("user-accounts", cc_user_panel_get_type ), ++// PANEL_TYPE("user-accounts", cc_user_panel_get_type ), + #ifdef BUILD_WACOM + PANEL_TYPE("wacom", cc_wacom_panel_get_type ), + #endif +-- +2.14.3 + diff --git a/meta-citadel/recipes-desktop/gnome-control-center/gnome-control-center/0003-disable-running-tests.patch b/meta-citadel/recipes-desktop/gnome-control-center/gnome-control-center/0003-disable-running-tests.patch new file mode 100644 index 0000000..18ba84d --- /dev/null +++ b/meta-citadel/recipes-desktop/gnome-control-center/gnome-control-center/0003-disable-running-tests.patch @@ -0,0 +1,31 @@ +From 39d14e08905e1ee6aed5f9659c13e9c9bb02a1dd Mon Sep 17 00:00:00 2001 +From: brl +Date: Tue, 19 Dec 2017 14:11:16 -0500 +Subject: [PATCH 3/5] disable running tests + +--- + shell/Makefile.am | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/shell/Makefile.am b/shell/Makefile.am +index de3e53d..54fbdf8 100644 +--- a/shell/Makefile.am ++++ b/shell/Makefile.am +@@ -163,10 +163,10 @@ EXTRA_DIST = \ + CLEANFILES = $(BUILT_SOURCES) $(completion_DATA) $(servicefile_DATA) + DISTCLEANFILES = gnome-control-center.desktop gnome-control-center.desktop.in + +-TEST_PROGS += test-hostname +-noinst_PROGRAMS += test-hostname +-test_hostname_SOURCES = hostname-helper.c hostname-helper.h test-hostname.c +-test_hostname_LDADD = $(PANEL_LIBS) $(INFO_PANEL_LIBS) ++#TEST_PROGS += test-hostname ++#noinst_PROGRAMS += test-hostname ++#test_hostname_SOURCES = hostname-helper.c hostname-helper.h test-hostname.c ++#test_hostname_LDADD = $(PANEL_LIBS) $(INFO_PANEL_LIBS) + + EXTRA_DIST += hostnames-test.txt ssids-test.txt + +-- +2.14.3 + diff --git a/meta-citadel/recipes-desktop/gnome-control-center/gnome-control-center/0004-remove-unwanted-panel-dependencies.patch b/meta-citadel/recipes-desktop/gnome-control-center/gnome-control-center/0004-remove-unwanted-panel-dependencies.patch new file mode 100644 index 0000000..3462170 --- /dev/null +++ b/meta-citadel/recipes-desktop/gnome-control-center/gnome-control-center/0004-remove-unwanted-panel-dependencies.patch @@ -0,0 +1,138 @@ +From 3f4c934ca6c1bdfc2c49158da254771cd78586cd Mon Sep 17 00:00:00 2001 +From: brl +Date: Tue, 19 Dec 2017 14:14:37 -0500 +Subject: [PATCH 4/5] remove unwanted panel dependencies + +--- + configure.ac | 80 ++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 37 insertions(+), 43 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 42ddc62..8f53b86 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -121,9 +121,7 @@ PKG_CHECK_MODULES(LIBLANGUAGE, $COMMON_MODULES gnome-desktop-3.0 fontconfig) + PKG_CHECK_MODULES(LIBSHORTCUTS, $COMMON_MODULES x11) + PKG_CHECK_MODULES(SHELL, $COMMON_MODULES x11 polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION) + PKG_CHECK_MODULES(BACKGROUND_PANEL, $COMMON_MODULES cairo-gobject libxml-2.0 gnome-desktop-3.0 +- gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION +- goa-1.0 >= $GOA_REQUIRED_VERSION +- grilo-0.3 >= $GRILO_REQUIRED_VERSION) ++ gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION) + PKG_CHECK_MODULES(DATETIME_PANEL, $COMMON_MODULES + gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION + polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION +@@ -141,15 +139,11 @@ PKG_CHECK_MODULES(MOUSE_PANEL, $COMMON_MODULES xi >= 1.2 + PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES gmodule-2.0 + polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION) + PKG_CHECK_MODULES(NOTIFICATIONS_PANEL, $COMMON_MODULES) +-PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION) + PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES + colord >= $COLORD_REQUIRED_VERSION + colord-gtk >= $COLORD_GTK_REQUIRED_VERSION + libsoup-2.4 + gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION) +-PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES +- polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION +- smbclient) + PKG_CHECK_MODULES(PRIVACY_PANEL, $COMMON_MODULES) + PKG_CHECK_MODULES(REGION_PANEL, $COMMON_MODULES + polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION +@@ -269,36 +263,36 @@ fi + # Check for CUPS 1.4 or newer + AC_PROG_SED + +-AC_PATH_PROG(CUPS_CONFIG, cups-config) ++#AC_PATH_PROG(CUPS_CONFIG, cups-config) + +-if test x$CUPS_CONFIG = x; then +- AC_MSG_ERROR([cups-config not found]) +-fi ++#if test x$CUPS_CONFIG = x; then ++# AC_MSG_ERROR([cups-config not found]) ++#fi + +-CUPS_API_VERSION=`$CUPS_CONFIG --api-version` +-CUPS_API_MAJOR=`echo $ECHO_N $CUPS_API_VERSION | cut -d . -f 1` +-CUPS_API_MINOR=`echo $ECHO_N $CUPS_API_VERSION | cut -d . -f 2` ++#CUPS_API_VERSION=`$CUPS_CONFIG --api-version` ++#CUPS_API_MAJOR=`echo $ECHO_N $CUPS_API_VERSION | cut -d . -f 1` ++#CUPS_API_MINOR=`echo $ECHO_N $CUPS_API_VERSION | cut -d . -f 2` + +-AC_CHECK_HEADERS([cups/cups.h cups/http.h cups/ipp.h cups/ppd.h],, +- AC_MSG_ERROR([CUPS headers not found])) ++#AC_CHECK_HEADERS([cups/cups.h cups/http.h cups/ipp.h cups/ppd.h],, ++# AC_MSG_ERROR([CUPS headers not found])) + +-if ! test $CUPS_API_MAJOR -gt 1 -o \ +- $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 4 ; then +- AC_MSG_ERROR([CUPS 1.4 or newer not found]) +-fi ++#if ! test $CUPS_API_MAJOR -gt 1 -o \ ++# $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 4 ; then ++# AC_MSG_ERROR([CUPS 1.4 or newer not found]) ++#fi + + # https://bugzilla.gnome.org/show_bug.cgi?id=696766 +-CUPS_CPPFLAGS="" +-if test $CUPS_API_MAJOR -gt 1 -o \ +- $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 6 ; then +- CUPS_CPPFLAGS=-D_PPD_DEPRECATED="" +-fi +- +-CUPS_CFLAGS=`$CUPS_CONFIG --cflags | $SED -e 's/-O\w*//g' -e 's/-m\w*//g'` +-CUPS_LIBS=`$CUPS_CONFIG --libs` +-AC_SUBST(CUPS_CPPFLAGS) +-AC_SUBST(CUPS_CFLAGS) +-AC_SUBST(CUPS_LIBS) ++#CUPS_CPPFLAGS="" ++#if test $CUPS_API_MAJOR -gt 1 -o \ ++# $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 6 ; then ++# CUPS_CPPFLAGS=-D_PPD_DEPRECATED="" ++#fi ++ ++#CUPS_CFLAGS=`$CUPS_CONFIG --cflags | $SED -e 's/-O\w*//g' -e 's/-m\w*//g'` ++#CUPS_LIBS=`$CUPS_CONFIG --libs` ++#AC_SUBST(CUPS_CPPFLAGS) ++#AC_SUBST(CUPS_CFLAGS) ++#AC_SUBST(CUPS_LIBS) + + # Optional dependency for the user accounts panel + AC_ARG_WITH([cheese], +@@ -336,21 +330,21 @@ fi + AM_CONDITIONAL(BUILD_WACOM, [test x${have_wacom} = xyes]) + + # Kerberos kerberos support +-AC_PATH_PROG(KRB5_CONFIG, krb5-config, no) +-if test "$KRB5_CONFIG" = "no"; then +- AC_MSG_ERROR([krb5-config executable not found in your path - should be installed with the kerberos libraries]) +-fi ++#AC_PATH_PROG(KRB5_CONFIG, krb5-config, no) ++#if test "$KRB5_CONFIG" = "no"; then ++# AC_MSG_ERROR([krb5-config executable not found in your path - should be installed with the kerberos libraries]) ++#fi + +-AC_MSG_CHECKING(for krb5 libraries and flags) +-KRB5_CFLAGS="`$KRB5_CONFIG --cflags`" +-KRB5_LIBS="`$KRB5_CONFIG --libs`" +-AC_MSG_RESULT($KRB5_CFLAGS $KRB5_LIBS) ++#AC_MSG_CHECKING(for krb5 libraries and flags) ++#KRB5_CFLAGS="`$KRB5_CONFIG --cflags`" ++#KRB5_LIBS="`$KRB5_CONFIG --libs`" ++#AC_MSG_RESULT($KRB5_CFLAGS $KRB5_LIBS) + +-AC_SUBST(KRB5_CFLAGS) +-AC_SUBST(KRB5_LIBS) ++#AC_SUBST(KRB5_CFLAGS) ++#AC_SUBST(KRB5_LIBS) + +-USER_ACCOUNTS_PANEL_CFLAGS="$USER_ACCOUNTS_PANEL_CFLAGS $KRB5_CFLAGS" +-USER_ACCOUNTS_PANEL_LIBS="$USER_ACCOUNTS_PANEL_LIBS $KRB5_LIBS" ++#USER_ACCOUNTS_PANEL_CFLAGS="$USER_ACCOUNTS_PANEL_CFLAGS $KRB5_CFLAGS" ++#USER_ACCOUNTS_PANEL_LIBS="$USER_ACCOUNTS_PANEL_LIBS $KRB5_LIBS" + + dnl Check for info panel + AC_ARG_WITH([gnome-session-libexecdir], +-- +2.14.3 + diff --git a/meta-citadel/recipes-desktop/gnome-control-center/gnome-control-center/0005-fix-gdesktop-prefix.patch b/meta-citadel/recipes-desktop/gnome-control-center/gnome-control-center/0005-fix-gdesktop-prefix.patch new file mode 100644 index 0000000..c15ce86 --- /dev/null +++ b/meta-citadel/recipes-desktop/gnome-control-center/gnome-control-center/0005-fix-gdesktop-prefix.patch @@ -0,0 +1,25 @@ +From 78929b37ba1ee7408170299c9580840c9ca23663 Mon Sep 17 00:00:00 2001 +From: brl +Date: Tue, 19 Dec 2017 14:15:45 -0500 +Subject: [PATCH 5/5] fix gdesktop prefix + +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 8f53b86..3f654fc 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -169,7 +169,7 @@ PKG_CHECK_MODULES(REMOTE_LOGIN_HELPER, glib-2.0 >= $GLIB_REQUIRED_VERSION gio-2. + PKG_CHECK_MODULES(GVC, gobject-2.0 libpulse libpulse-mainloop-glib) + AM_CONDITIONAL(HAVE_INTROSPECTION, false) + +-GDESKTOP_PREFIX=`$PKG_CONFIG --variable prefix gsettings-desktop-schemas` ++GDESKTOP_PREFIX=${PKG_CONFIG_SYSROOT_DIR}`$PKG_CONFIG --variable prefix gsettings-desktop-schemas` + AC_SUBST(GDESKTOP_PREFIX) + + PKG_CHECK_MODULES(DEVICES, $COMMON_MODULES) +-- +2.14.3 + diff --git a/meta-citadel/recipes-desktop/gnome-control-center/gnome-control-center_3.26.1.bb b/meta-citadel/recipes-desktop/gnome-control-center/gnome-control-center_3.26.1.bb new file mode 100644 index 0000000..a5b32e9 --- /dev/null +++ b/meta-citadel/recipes-desktop/gnome-control-center/gnome-control-center_3.26.1.bb @@ -0,0 +1,3 @@ +require gnome-control-center.inc +SRC_URI[archive.md5sum] = "61a55cddc794f4020f93df1290792f0e" +SRC_URI[archive.sha256sum] = "5e5dbb0cd6b882d02662a94c15613f29be3b9152aa38847b17f8d5bea2cfc290" diff --git a/meta-citadel/recipes-desktop/gnome-control-center/gnome-control-center_3.26.2.bb b/meta-citadel/recipes-desktop/gnome-control-center/gnome-control-center_3.26.2.bb new file mode 100644 index 0000000..df30e91 --- /dev/null +++ b/meta-citadel/recipes-desktop/gnome-control-center/gnome-control-center_3.26.2.bb @@ -0,0 +1,3 @@ +require gnome-control-center.inc +SRC_URI[archive.md5sum] = "4f19c72a6cfe1956cc2172caae5494c1" +SRC_URI[archive.sha256sum] = "07aed27d6317f2cad137daa6d94a37ad02c32b958dcd30c8f07d0319abfb04c5" diff --git a/meta-citadel/recipes-desktop/gnome-desktop/gnome-desktop.inc b/meta-citadel/recipes-desktop/gnome-desktop/gnome-desktop.inc new file mode 100644 index 0000000..d0ed0c0 --- /dev/null +++ b/meta-citadel/recipes-desktop/gnome-desktop/gnome-desktop.inc @@ -0,0 +1,20 @@ +SUMMARY = "GNOME library which provides API shared by several components and applications" +SECTION = "x11/gnome" +LICENSE = "GPLv2 & LGPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2" + +inherit gnome pkgconfig upstream-version-is-even gobject-introspection + +DEPENDS += "intltool-native gsettings-desktop-schemas gconf virtual/libx11 gtk+3 glib-2.0 startup-notification xkeyboard-config iso-codes udev libseccomp gnome-common-native autoconf-archive-native" + +inherit gtk-doc + +ACLOCALDIR = "${STAGING_DATADIR_NATIVE}/aclocal" + +EXTRA_OECONF = "--disable-desktop-docs --with-gnome-distributor=Subgraph --enable-introspection=yes" + +PACKAGES =+ "libgnome-desktop" +FILES_libgnome-desktop = "${libdir}/lib*${SOLIBS} ${datadir}/libgnome-desktop*/pnp.ids ${datadir}/gnome/*xml" + +RRECOMMENDS_libgnome-desktop += "gsettings-desktop-schemas" diff --git a/meta-citadel/recipes-desktop/gnome-desktop/gnome-desktop/0001-configure.ac-Remove-gnome-common-macro-calls.patch b/meta-citadel/recipes-desktop/gnome-desktop/gnome-desktop/0001-configure.ac-Remove-gnome-common-macro-calls.patch new file mode 100644 index 0000000..e95393c --- /dev/null +++ b/meta-citadel/recipes-desktop/gnome-desktop/gnome-desktop/0001-configure.ac-Remove-gnome-common-macro-calls.patch @@ -0,0 +1,33 @@ +From 834bc861921fe0361f2d6a5b5716fc97a9519478 Mon Sep 17 00:00:00 2001 +From: Jussi Kukkonen +Date: Thu, 6 Jul 2017 13:13:45 +0300 +Subject: [PATCH] configure.ac: Remove gnome-common macro calls + +gnome-common is deprecated and these aren't doing much for us. + +Upstreamable fix would probably involve using autoconf-archive: +Trying to avoid that dependency for now. + +Upstream-Status: Inappropriate +Signed-off-by: Jussi Kukkonen +--- + configure.ac | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 7adcf0e..bb7659d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -71,9 +71,6 @@ AC_SUBST(GNOME_DATE) + AC_SUBST(GNOME_DATE_COMMENT_START) + AC_SUBST(GNOME_DATE_COMMENT_END) + +-GNOME_COMPILE_WARNINGS([maximum]) +-GNOME_MAINTAINER_MODE_DEFINES +- + AC_ARG_ENABLE(deprecation_flags, + [AC_HELP_STRING([--enable-deprecation-flags], + [use *_DISABLE_DEPRECATED flags @<:@default=no@:>@])],, +-- +2.1.4 + diff --git a/meta-citadel/recipes-desktop/gnome-desktop/gnome-desktop/gnome-desktop-thumbnail-don-t-convert-time_t-to-long.patch b/meta-citadel/recipes-desktop/gnome-desktop/gnome-desktop/gnome-desktop-thumbnail-don-t-convert-time_t-to-long.patch new file mode 100644 index 0000000..c1a7d4f --- /dev/null +++ b/meta-citadel/recipes-desktop/gnome-desktop/gnome-desktop/gnome-desktop-thumbnail-don-t-convert-time_t-to-long.patch @@ -0,0 +1,73 @@ +From 9048939b76b3bd10783adb79ed0aaf6cd13895cc Mon Sep 17 00:00:00 2001 +From: Christopher Larson +Date: Tue, 13 Dec 2016 20:39:51 -0700 +Subject: [PATCH 1/2] gnome-desktop-thumbnail: don't convert time_t to long + +Explicitly use strftime+strptime rather than snprintf+atol. This fixes the +build for X32, where long's size doesn't match that of time_t. + +Upstream-Status: Pending +Signed-off-by: Christopher Larson + +--- + libgnome-desktop/gnome-desktop-thumbnail.c | 16 ++++++++++++++-- + 1 file changed, 14 insertions(+), 2 deletions(-) + +diff --git a/libgnome-desktop/gnome-desktop-thumbnail.c b/libgnome-desktop/gnome-desktop-thumbnail.c +index e56c3d7..5d96bf3 100644 +--- a/libgnome-desktop/gnome-desktop-thumbnail.c ++++ b/libgnome-desktop/gnome-desktop-thumbnail.c +@@ -120,6 +120,8 @@ + * Since: 2.2 + */ + ++#define _XOPEN_SOURCE ++ + #include + + #include +@@ -1105,6 +1107,7 @@ save_thumbnail (GdkPixbuf *pixbuf, + char *tmp_path = NULL; + int tmp_fd; + char mtime_str[21]; ++ struct tm *tmp_mtime = NULL; + gboolean ret = FALSE; + GError *error = NULL; + const char *width, *height; +@@ -1124,7 +1127,11 @@ save_thumbnail (GdkPixbuf *pixbuf, + goto out; + close (tmp_fd); + +- g_snprintf (mtime_str, 21, "%" G_GINT64_FORMAT, (gint64) mtime); ++ tmp_mtime = localtime (&mtime); ++ if (!tmp_mtime) ++ goto out; ++ strftime (mtime_str, 21, "%s", tmp_mtime); ++ free (tmp_mtime); + width = gdk_pixbuf_get_option (pixbuf, "tEXt::Thumb::Image::Width"); + height = gdk_pixbuf_get_option (pixbuf, "tEXt::Thumb::Image::Height"); + +@@ -1319,6 +1326,7 @@ gnome_desktop_thumbnail_is_valid (GdkPixbuf *pixbuf, + { + const char *thumb_uri, *thumb_mtime_str; + time_t thumb_mtime; ++ struct tm tmp_mtime; + + thumb_uri = gdk_pixbuf_get_option (pixbuf, "tEXt::Thumb::URI"); + if (g_strcmp0 (uri, thumb_uri) != 0) +@@ -1327,7 +1335,11 @@ gnome_desktop_thumbnail_is_valid (GdkPixbuf *pixbuf, + thumb_mtime_str = gdk_pixbuf_get_option (pixbuf, "tEXt::Thumb::MTime"); + if (!thumb_mtime_str) + return FALSE; +- thumb_mtime = atol (thumb_mtime_str); ++ if (!strptime (thumb_mtime_str, "%s", &tmp_mtime)) ++ return FALSE; ++ thumb_mtime = mktime (&tmp_mtime); ++ if (!thumb_mtime) ++ return FALSE; + if (mtime != thumb_mtime) + return FALSE; + +-- +2.14.1 + diff --git a/meta-citadel/recipes-desktop/gnome-desktop/gnome-desktop_3.26.2.bb b/meta-citadel/recipes-desktop/gnome-desktop/gnome-desktop_3.26.2.bb new file mode 100644 index 0000000..5dcd9e5 --- /dev/null +++ b/meta-citadel/recipes-desktop/gnome-desktop/gnome-desktop_3.26.2.bb @@ -0,0 +1,4 @@ +require gnome-desktop.inc +SRC_URI[archive.md5sum] = "6cee2ecd677d87eaa0eb5ebfa7b45fb3" +SRC_URI[archive.sha256sum] = "f7561a7a313fc474b2c390cd9696df1f5c1e1556080e43f4afe042b1060e5f2a" + diff --git a/meta-citadel/recipes-desktop/gnome-desktop/gnome-desktop_3.27.2.bb b/meta-citadel/recipes-desktop/gnome-desktop/gnome-desktop_3.27.2.bb new file mode 100644 index 0000000..be287c0 --- /dev/null +++ b/meta-citadel/recipes-desktop/gnome-desktop/gnome-desktop_3.27.2.bb @@ -0,0 +1,4 @@ +require gnome-desktop.inc +SRC_URI[archive.md5sum] = "12d49a3f4f281078eeb1a9f07804ff35" +SRC_URI[archive.sha256sum] = "0b9c5c238a011fac746df2db8a9f081d4509d0e8c5c55c044ad0f674dab83aaf" + diff --git a/meta-citadel/recipes-desktop/gnome-keyring/gnome-keyring.inc b/meta-citadel/recipes-desktop/gnome-keyring/gnome-keyring.inc new file mode 100644 index 0000000..6ad54ea --- /dev/null +++ b/meta-citadel/recipes-desktop/gnome-keyring/gnome-keyring.inc @@ -0,0 +1,20 @@ +SUMMARY = "GNOME management of secrets, passwords, keys, and certificates" +HOMEPAGE = "https://wiki.gnome.org/Projects/GnomeKeyring" + +LICENSE = "GPLv2 & LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c" + +DEPENDS = "gcr intltool-native glib-2.0-native libpam" +RDEPENDS_${PN} = "gcr libpam" +FILES_${PN} += "\ + ${libdir}/pkcs11 \ + ${libdir}/security \ + ${datadir}/p11-kit \ + ${datadir}/dbus-1 \ +" + +inherit gettext gnome + +EXTRA_OECONF = "--disable-doc" + diff --git a/meta-citadel/recipes-desktop/gnome-keyring/gnome-keyring_3.20.1.bb b/meta-citadel/recipes-desktop/gnome-keyring/gnome-keyring_3.20.1.bb new file mode 100644 index 0000000..b7e0912 --- /dev/null +++ b/meta-citadel/recipes-desktop/gnome-keyring/gnome-keyring_3.20.1.bb @@ -0,0 +1,3 @@ +require gnome-keyring.inc +SRC_URI[archive.md5sum] = "9b4b2c59dc1db3a1309cbe1fa1f2c2e7" +SRC_URI[archive.sha256sum] = "97964e723f454be509c956ed5e38b5c2fd7363f43bd3f153b94a4a63eb888c8c" diff --git a/meta-citadel/recipes-desktop/gnome-keyring/gnome-keyring_3.27.2.bb b/meta-citadel/recipes-desktop/gnome-keyring/gnome-keyring_3.27.2.bb new file mode 100644 index 0000000..f680540 --- /dev/null +++ b/meta-citadel/recipes-desktop/gnome-keyring/gnome-keyring_3.27.2.bb @@ -0,0 +1,3 @@ +require gnome-keyring.inc +SRC_URI[archive.md5sum] = "698cd578ab2f0d3bcafdd201bad701ef" +SRC_URI[archive.sha256sum] = "78434975c917f2a413e5ee50624e0ff3f45bc84b8520ef5d5f35d719fd3e9289" diff --git a/meta-citadel/recipes-desktop/gnome-session/gnome-session.inc b/meta-citadel/recipes-desktop/gnome-session/gnome-session.inc new file mode 100644 index 0000000..e482ca8 --- /dev/null +++ b/meta-citadel/recipes-desktop/gnome-session/gnome-session.inc @@ -0,0 +1,19 @@ +SUMMARY = "GNOME session management" +HOMEPAGE = "https://wiki.gnome.org/Projects/SessionManagement" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +def gnome_verdir(v): + return oe.utils.trim_version(v, 2) + +GNOMEBN ?= "${BPN}" +SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.xz;name=archive" + +DEPENDS = "glib-2.0-native intltool-native xmlto-native glib-2.0 gnome-desktop json-glib" +RDEPENDS_${PN} = "gnome-settings-daemon" +FILES_${PN} += "\ + ${datadir}/xsessions \ + ${datadir}/glib-2.0/schemas \ + ${datadir}/GConf \ + ${datadir}/wayland-sessions \ +" diff --git a/meta-citadel/recipes-desktop/gnome-session/gnome-session_3.26.1.bb b/meta-citadel/recipes-desktop/gnome-session/gnome-session_3.26.1.bb new file mode 100644 index 0000000..f04fdbe --- /dev/null +++ b/meta-citadel/recipes-desktop/gnome-session/gnome-session_3.26.1.bb @@ -0,0 +1,9 @@ +require gnome-session.inc +SRC_URI[archive.md5sum] = "4c108adbf6ebe25486d41a9bc8cc340c" +SRC_URI[archive.sha256sum] = "d9414b368db982d3837ca106e64019f18e6cdd5b13965bea6c7d02ddf5103708" + +DEPENDS += "gnome-common-native" + +EXTRA_OECONF = "--enable-man=no" +inherit pkgconfig gettext autotools + diff --git a/meta-citadel/recipes-desktop/gnome-session/gnome-session_3.27.3.bb b/meta-citadel/recipes-desktop/gnome-session/gnome-session_3.27.3.bb new file mode 100644 index 0000000..fb43abf --- /dev/null +++ b/meta-citadel/recipes-desktop/gnome-session/gnome-session_3.27.3.bb @@ -0,0 +1,7 @@ +require gnome-session.inc +SRC_URI[md5sum] = "3f52d4c1d8a64666b126b8fb0a443b28" +SRC_URI[sha256sum] = "09d3495f88750a6bbd64166397c41ac609d2e8e5afec20caec897d526e7438a1" + +EXTRA_OEMESON = "-Denable-docbook=false -Denable-man=false" +inherit meson + diff --git a/meta-citadel/recipes-desktop/gnome-settings-daemon/gnome-settings-daemon.inc b/meta-citadel/recipes-desktop/gnome-settings-daemon/gnome-settings-daemon.inc new file mode 100644 index 0000000..46afbe3 --- /dev/null +++ b/meta-citadel/recipes-desktop/gnome-settings-daemon/gnome-settings-daemon.inc @@ -0,0 +1,18 @@ +SUMMARY = "A set of daemons that manage and provide various parameters to applications" +HOMEPAGE = "https://wiki.gnome.org/Initiatives/Wayland/gnome-settings-daemon" +LICENSE = "GPLv2 & LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ + file://COPYING.LIB;md5=fbc093901857fcd118f065f900982c24" + +DEPENDS = "pango gnome-desktop kbproto libnotify fontconfig libgudev libxext wayland glib-2.0 libxi libx11 libwacom libxtst gsettings-desktop-schemas nss intltool-native gtk+3 polkit upower lcms glib-2.0-native wayland colord geoclue libcanberra geocode-glib libgweather pulseaudio networkmanager" + +FILES_${PN} += "\ + ${libdir}/gnome-settings-daemon-3.0 \ +" + +FILES_${PN}-staticdev += "${libdir}/gnome-settings-daemon-3.0/libgsd.a" + +inherit gettext gnome + +EXTRA_OECONF = "--disable-cups" + diff --git a/meta-citadel/recipes-desktop/gnome-settings-daemon/gnome-settings-daemon_3.26.1.bb b/meta-citadel/recipes-desktop/gnome-settings-daemon/gnome-settings-daemon_3.26.1.bb new file mode 100644 index 0000000..d3be3de --- /dev/null +++ b/meta-citadel/recipes-desktop/gnome-settings-daemon/gnome-settings-daemon_3.26.1.bb @@ -0,0 +1,3 @@ +require gnome-settings-daemon.inc +SRC_URI[archive.md5sum] = "c214fe5e6166481cfabf8450756c51fe" +SRC_URI[archive.sha256sum] = "711ac9bad06f6a4225f5eb2f4796474662f81f7077e16a4b7ee7ab974b65d893" diff --git a/meta-citadel/recipes-desktop/gnome-settings-daemon/gnome-settings-daemon_3.26.2.bb b/meta-citadel/recipes-desktop/gnome-settings-daemon/gnome-settings-daemon_3.26.2.bb new file mode 100644 index 0000000..eae403e --- /dev/null +++ b/meta-citadel/recipes-desktop/gnome-settings-daemon/gnome-settings-daemon_3.26.2.bb @@ -0,0 +1,3 @@ +require gnome-settings-daemon.inc +SRC_URI[md5sum] = "77f335b7330573595e6349095c8d3630" +SRC_URI[sha256sum] = "5a3d156b35e03fa3c28fddd0321f6726082a711973dee2af686370faae2e75e4" diff --git a/meta-citadel/recipes-desktop/gnome-shell/gnome-shell.inc b/meta-citadel/recipes-desktop/gnome-shell/gnome-shell.inc new file mode 100644 index 0000000..278d375 --- /dev/null +++ b/meta-citadel/recipes-desktop/gnome-shell/gnome-shell.inc @@ -0,0 +1,55 @@ +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +def gnome_verdir(v): + return oe.utils.trim_version(v, 2) + +GNOMEBN ?= "${BPN}" +SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.xz;name=archive" + +SRC_URI += "file://0001-do-no-build-calendar-server.patch \ + file://0001-do-not-use-python-path-from-build-environment.patch \ +" + +DEPENDS = "glib-2.0-native systemd libcanberra gtk+3 glib-2.0 libxml2 libcroco mutter libsoup-2.4 gsettings-desktop-schemas gcr atk polkit startup-notification libx11 gnome-bluetooth libsecret networkmanager gjs mozjs52 nm-applet pulseaudio libxml2-native paxctl-native" + +RDEPENDS_${PN} = "xserver-xorg-xwayland cantarell-fonts gnome-theme-adwaita gnome-theme-adwaita-dark gnome-backgrounds gnome-control-center gnome-session adwaita-icon-theme dconf" + +FILES_${PN} += "\ + ${datadir}/dbus-1 \ + ${datadir}/glib-2.0/schemas \ + ${datadir}/GConf/gsettings \ + ${datadir}/xdg-desktop-portal \ + ${datadir}/gnome-control-center/keybindings \ +" + +MUTTER_DIR = "/usr/lib/mutter" +GIR_SCANNER_NATIVE = "${STAGING_BINDIR_NATIVE}/g-ir-scanner" +GIR_SCRIPT_PATH = "${B}/g-ir-scanner-script" + +# https://github.com/ninja-build/ninja/issues/1002 +write_gir_script () { + cat > ${GIR_SCRIPT_PATH} << EOF +#!/bin/sh +export PKG_CONFIG=pkg-config +export PKG_CONFIG_PATH=\"${PKG_CONFIG_PATH}\" +export XDG_DATA_DIRS=\"${STAGING_DATADIR}\" +export CC="x86_64-oe-linux-gcc --sysroot=${STAGING_DIR_HOST}" +export LD="x86_64-oe-linux-gcc --sysroot=${STAGING_DIR_HOST}" +${STAGING_BINDIR}/g-ir-scanner-wrapper \$@ +EOF + chmod +x ${GIR_SCRIPT_PATH} +} + +do_configure_append () { + write_gir_script + sed --in-place=.old1 "s;=${MUTTER_DIR};=${PKG_CONFIG_SYSROOT_DIR}${MUTTER_DIR};" ${B}/build.ninja + sed --in-place=.old2 "s;COMMAND = ${GIR_SCANNER_NATIVE};COMMAND = ${GIR_SCRIPT_PATH};" ${B}/build.ninja +} + +do_install_append() { + paxctl -cm ${D}${bindir}/gnome-shell +} + +EXTRA_OEMESON = "--buildtype=release -Denable-browser-plugin=false -Denable-man=false -Denable-systemd=yes -Denable-networkmanager=yes" +inherit meson gobject-introspection diff --git a/meta-citadel/recipes-desktop/gnome-shell/gnome-shell/0001-do-no-build-calendar-server.patch b/meta-citadel/recipes-desktop/gnome-shell/gnome-shell/0001-do-no-build-calendar-server.patch new file mode 100644 index 0000000..6d5d811 --- /dev/null +++ b/meta-citadel/recipes-desktop/gnome-shell/gnome-shell/0001-do-no-build-calendar-server.patch @@ -0,0 +1,41 @@ +From ab1b210071c9d43b1d743624407e2d47e2fa4b66 Mon Sep 17 00:00:00 2001 +From: brl +Date: Tue, 19 Dec 2017 14:49:57 -0500 +Subject: [PATCH] do no build calendar server + +--- + meson.build | 4 ++-- + src/meson.build | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/meson.build b/meson.build +index 48771eb..4d0d90b 100644 +--- a/meson.build ++++ b/meson.build +@@ -69,8 +69,8 @@ endif + atk_bridge_dep = dependency('atk-bridge-2.0') + canberra_dep = dependency('libcanberra') + canberra_gtk_dep = dependency('libcanberra-gtk3') +-ecal_dep = dependency('libecal-1.2', version: ecal_req) +-eds_dep = dependency('libedataserver-1.2', version: eds_req) ++#ecal_dep = dependency('libecal-1.2', version: ecal_req) ++#eds_dep = dependency('libedataserver-1.2', version: eds_req) + gcr_dep = dependency('gcr-base-3', version: gcr_req) + gdk_x11_dep = dependency('gdk-x11-3.0') + gdk_pixbuf_dep = dependency('gdk-pixbuf-2.0') +diff --git a/src/meson.build b/src/meson.build +index 3e55573..9b55a62 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -1,7 +1,7 @@ + service_data = configuration_data() + service_data.set('libexecdir', libexecdir) + +-subdir('calendar-server') ++#subdir('calendar-server') + subdir('hotplug-sniffer') + subdir('st') + subdir('tray') +-- +2.14.3 + diff --git a/meta-citadel/recipes-desktop/gnome-shell/gnome-shell/0001-do-not-use-python-path-from-build-environment.patch b/meta-citadel/recipes-desktop/gnome-shell/gnome-shell/0001-do-not-use-python-path-from-build-environment.patch new file mode 100644 index 0000000..1151d7d --- /dev/null +++ b/meta-citadel/recipes-desktop/gnome-shell/gnome-shell/0001-do-not-use-python-path-from-build-environment.patch @@ -0,0 +1,33 @@ +From f7582d395c8d4fcd4232df0cae524eb8e5d4cf61 Mon Sep 17 00:00:00 2001 +From: brl +Date: Sun, 24 Dec 2017 17:44:02 -0500 +Subject: [PATCH] do not use python path from build environment + +--- + src/gnome-shell-extension-tool.in | 2 +- + src/gnome-shell-perf-tool.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/gnome-shell-extension-tool.in b/src/gnome-shell-extension-tool.in +index f6c3762..07ac37d 100755 +--- a/src/gnome-shell-extension-tool.in ++++ b/src/gnome-shell-extension-tool.in +@@ -1,4 +1,4 @@ +-#!@PYTHON@ ++#!/usr/bin/env python3 + # -*- mode: Python; indent-tabs-mode: nil; -*- + + import os +diff --git a/src/gnome-shell-perf-tool.in b/src/gnome-shell-perf-tool.in +index b2a4521..88a10f6 100755 +--- a/src/gnome-shell-perf-tool.in ++++ b/src/gnome-shell-perf-tool.in +@@ -1,4 +1,4 @@ +-#!@PYTHON@ ++#!/usr/bin/env python3 + # -*- mode: Python; indent-tabs-mode: nil; -*- + + import datetime +-- +2.14.3 + diff --git a/meta-citadel/recipes-desktop/gnome-shell/gnome-shell_3.26.1.bb b/meta-citadel/recipes-desktop/gnome-shell/gnome-shell_3.26.1.bb new file mode 100644 index 0000000..5f5119e --- /dev/null +++ b/meta-citadel/recipes-desktop/gnome-shell/gnome-shell_3.26.1.bb @@ -0,0 +1,3 @@ +require gnome-shell.inc +SRC_URI[archive.md5sum] = "eee354999984c143a3eb60da8cf27ddf" +SRC_URI[archive.sha256sum] = "38d98da06eb0118a0226623494b11765b3981414e804e270dc0cf03e37c708b9" diff --git a/meta-citadel/recipes-desktop/gnome-shell/gnome-shell_3.27.1.bb b/meta-citadel/recipes-desktop/gnome-shell/gnome-shell_3.27.1.bb new file mode 100644 index 0000000..65a9dac --- /dev/null +++ b/meta-citadel/recipes-desktop/gnome-shell/gnome-shell_3.27.1.bb @@ -0,0 +1,3 @@ +require gnome-shell.inc +SRC_URI[archive.md5sum] = "d8b8521bad4f93f377c89240ceee3f33" +SRC_URI[archive.sha256sum] = "1972d39d1bb1ab708da3534911ac1f89acf45801b7c2cdc9ff9515f4eae17cc6" diff --git a/meta-citadel/recipes-desktop/gnome-terminal/gnome-terminal.inc b/meta-citadel/recipes-desktop/gnome-terminal/gnome-terminal.inc new file mode 100644 index 0000000..12b07fb --- /dev/null +++ b/meta-citadel/recipes-desktop/gnome-terminal/gnome-terminal.inc @@ -0,0 +1,27 @@ +SUMMARY = "GNOME terminal emulator" +HOMEPAGE = "https://wiki.gnome.org/Apps/Terminal" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949" + +DEPENDS = "intltool-native dconf gconf glib-2.0 util-linux gsettings-desktop-schemas glib-2.0-native vte libpcre gtk+3 vala-native libxml2-native desktop-file-utils-native yelp-tools-native paxctl-native" + +do_install_append() { + paxctl -cm ${D}${libexecdir}/gnome-terminal-server +} + +FILES_${PN} += "\ + ${libdir}/systemd/user \ + ${datadir}/help/sv/gnome-terminal \ + ${datadir}/dbus-1/services \ + ${datadir}/glib-2.0/schemas \ + ${datadir}/metainfo \ +" + +FILES_${PN}-doc += "\ + ${datadir}/help \ +" + +inherit gettext gnome + +EXTRA_OECONF = "--disable-search-provider --without-nautilus-extension --disable-gterminal" + diff --git a/meta-citadel/recipes-desktop/gnome-terminal/gnome-terminal_3.26.2.bb b/meta-citadel/recipes-desktop/gnome-terminal/gnome-terminal_3.26.2.bb new file mode 100644 index 0000000..4fe74e3 --- /dev/null +++ b/meta-citadel/recipes-desktop/gnome-terminal/gnome-terminal_3.26.2.bb @@ -0,0 +1,3 @@ +require gnome-terminal.inc +SRC_URI[archive.md5sum] = "879ac789833483a9d85342bc7502164a" +SRC_URI[archive.sha256sum] = "3a9ba414a814569476515275ad303d8056f296b2669234447712559aa97005b0" diff --git a/meta-citadel/recipes-desktop/gnome-terminal/gnome-terminal_3.27.3.bb b/meta-citadel/recipes-desktop/gnome-terminal/gnome-terminal_3.27.3.bb new file mode 100644 index 0000000..3aa234e --- /dev/null +++ b/meta-citadel/recipes-desktop/gnome-terminal/gnome-terminal_3.27.3.bb @@ -0,0 +1,4 @@ +require gnome-terminal.inc +SRC_URI[archive.md5sum] = "fcf3ea825bf8fc8f5d4db67e47c77ffe" +SRC_URI[archive.sha256sum] = "f24c7e061248989e5b0f0406a93a506059d52c23ed8e54eb6a33cd5a3da5214e" + diff --git a/meta-citadel/recipes-desktop/gnome-tweak-tool/gnome-tweak-tool_3.27.3.bb b/meta-citadel/recipes-desktop/gnome-tweak-tool/gnome-tweak-tool_3.27.3.bb new file mode 100644 index 0000000..d9fb357 --- /dev/null +++ b/meta-citadel/recipes-desktop/gnome-tweak-tool/gnome-tweak-tool_3.27.3.bb @@ -0,0 +1,20 @@ +SUMMARY = "Customize advanced GNOME desktop configuration options" +HOMEPAGE = "https://wiki.gnome.org/action/show/Apps/Tweaks" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://LICENSES/GPL-3.0;md5=9eef91148a9b14ec7f9df333daebc746" + +SRC_URI = "https://download.gnome.org/sources/gnome-tweak-tool/3.27/gnome-tweak-tool-${PV}.tar.xz" +SRC_URI[md5sum] = "4fb5b7649a663d077acf8282cb2163da" +SRC_URI[sha256sum] = "43b77c256bf97e20d2c1c813736a2d9bc684d2c60c126f758e18566caa0f14fd" + +DEPENDS = "glib-2.0 glib-2.0-native" + +RDEPENDS_${PN} = "python3 python3-pygobject" + +FILES_${PN} += "\ + ${libdir}/python3.5/site-packages/gtweak \ + ${datadir}/icons/hicolor \ + ${datadir}/metainfo \ +" +inherit meson + diff --git a/meta-citadel/recipes-desktop/grilo/grilo_0.3.4.bb b/meta-citadel/recipes-desktop/grilo/grilo_0.3.4.bb new file mode 100644 index 0000000..c07315d --- /dev/null +++ b/meta-citadel/recipes-desktop/grilo/grilo_0.3.4.bb @@ -0,0 +1,14 @@ +SUMMARY = "Framework for discovery and browsing of network accessible media" +HOMEPAGE = "https://wiki.gnome.org/Projects/Grilo" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" + +SRC_URI[archive.md5sum] = "a15a92a903aeb7579e1b0f6e8b4b0fb1" +SRC_URI[archive.sha256sum] = "7c6964053b42574c2f14715d2392a02ea5cbace955eb73e067c77aa3e43b066e" + +DEPENDS = "glib-2.0 gtk+3 libsoup-2.4 intltool-native libxml2 gnome-common-native" + +inherit gettext gobject-introspection gnome + +EXTRA_OECONF = "--disable-grl-net --disable-grl-pls --disable-test-ui --disable-vala" + diff --git a/meta-citadel/recipes-desktop/gsettings-desktop-schema/gsettings-desktop-schemas.inc b/meta-citadel/recipes-desktop/gsettings-desktop-schema/gsettings-desktop-schemas.inc new file mode 100644 index 0000000..b5ed8d7 --- /dev/null +++ b/meta-citadel/recipes-desktop/gsettings-desktop-schema/gsettings-desktop-schemas.inc @@ -0,0 +1,9 @@ +SUMMARY = "GNOME desktop-wide GSettings schemas" +HOMEPAGE = "http://live.gnome.org/gsettings-desktop-schemas" +BUGTRACKER = "https://bugzilla.gnome.org/" + +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" +DEPENDS = "glib-2.0 intltool-native" + +inherit gnomebase gsettings gettext gobject-introspection upstream-version-is-even diff --git a/meta-citadel/recipes-desktop/gsettings-desktop-schema/gsettings-desktop-schemas_3.24.1.bb b/meta-citadel/recipes-desktop/gsettings-desktop-schema/gsettings-desktop-schemas_3.24.1.bb new file mode 100644 index 0000000..769cb65 --- /dev/null +++ b/meta-citadel/recipes-desktop/gsettings-desktop-schema/gsettings-desktop-schemas_3.24.1.bb @@ -0,0 +1,3 @@ +require gsettings-desktop-schemas.inc +SRC_URI[archive.md5sum] = "796b6ac1eff450261edd521b72e7fe6d" +SRC_URI[archive.sha256sum] = "76a3fa309f9de6074d66848987214f0b128124ba7184c958c15ac78a8ac7eea7" diff --git a/meta-citadel/recipes-desktop/gsettings-desktop-schema/gsettings-desktop-schemas_3.27.1.bb b/meta-citadel/recipes-desktop/gsettings-desktop-schema/gsettings-desktop-schemas_3.27.1.bb new file mode 100644 index 0000000..a63ae5f --- /dev/null +++ b/meta-citadel/recipes-desktop/gsettings-desktop-schema/gsettings-desktop-schemas_3.27.1.bb @@ -0,0 +1,3 @@ +require gsettings-desktop-schemas.inc +SRC_URI[archive.md5sum] = "8c91d5a3f90a8bf6a8448f13dbfd18cc" +SRC_URI[archive.sha256sum] = "2ffb131cbec43eb5a15dae25259050adbf0fc4278119cea0091a96d87cf392e8" diff --git a/meta-citadel/recipes-desktop/gtk+/gtk+3_3.22.26.bb b/meta-citadel/recipes-desktop/gtk+/gtk+3_3.22.26.bb new file mode 100644 index 0000000..dd303db --- /dev/null +++ b/meta-citadel/recipes-desktop/gtk+/gtk+3_3.22.26.bb @@ -0,0 +1,3 @@ +require gtk.inc +SRC_URI[md5sum] = "eeeb8038fe0d386c7516fa46cd4fff6b" +SRC_URI[sha256sum] = "61eef0d320e541976e2dfe445729f12b5ade53050ee9de6184235cb60cd4b967" diff --git a/meta-citadel/recipes-desktop/gtk+/gtk.inc b/meta-citadel/recipes-desktop/gtk+/gtk.inc new file mode 100644 index 0000000..4d11c98 --- /dev/null +++ b/meta-citadel/recipes-desktop/gtk+/gtk.inc @@ -0,0 +1,17 @@ +FILESEXTRAPATHS_prepend := "${COREBASE}/meta/recipes-gnome/gtk+/gtk+3:" +require ${COREBASE}/meta/recipes-gnome/gtk+/gtk+3.inc + +MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" + +SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar.xz \ + file://0001-Hardcoded-libtool.patch \ + file://0002-Do-not-try-to-initialize-GL-without-libGL.patch \ + file://0003-Add-disable-opengl-configure-option.patch \ + file://0004-configure.ac-Fix-wayland-protocols-path.patch \ + " +S = "${WORKDIR}/gtk+-${PV}" + +LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ + file://gtk/gtk.h;endline=25;md5=1d8dc0fccdbfa26287a271dce88af737 \ + file://gdk/gdk.h;endline=25;md5=c920ce39dc88c6f06d3e7c50e08086f2 \ + file://tests/testgtk.c;endline=25;md5=cb732daee1d82af7a2bf953cf3cf26f1" diff --git a/meta-citadel/recipes-desktop/ibus/ibus_1.5.17.bb b/meta-citadel/recipes-desktop/ibus/ibus_1.5.17.bb new file mode 100644 index 0000000..4fe1466 --- /dev/null +++ b/meta-citadel/recipes-desktop/ibus/ibus_1.5.17.bb @@ -0,0 +1,28 @@ +SUMMARY = "Intelligent input bus for Linux/Unix" +HOMEPAGE = "https://github.com/ibus/ibus/wiki" + +LICENSE = "Unicode & LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING.unicode;md5=53c2b911a997d7831df75e1c37f3c4b4 \ + file://COPYING;md5=fbc093901857fcd118f065f900982c24" + +SRC_URI = "https://github.com/ibus/ibus/releases/download/${PV}/ibus-${PV}.tar.gz" +SRC_URI[md5sum] = "8bb26453d0d1fa58e56c22668aaa8786" +SRC_URI[sha256sum] = "0347a8055977ca458e8add750af5f9b76e1a524844cc3b0e2fad70ce153dd219" + +S = "${WORKDIR}/${BPN}-${PV}" + +FILES_${PN} += "\ + ${datadir}/icons/hicolor \ + ${datadir}/GConf/gsettings \ + ${datadir}/dbus-1/services \ + ${datadir}/bash-completion/completions \ + ${datadir}/glib-2.0/schemas \ + ${libdir}/gtk-3.0/3.0.0/immodules/im-ibus.so \ +" + +DEPENDS = "libx11 wayland intltool-native libnotify iso-codes dbus dconf libxkbcommon glib-2.0 gtk+3 gobject-introspection gconf glib-2.0-native" + +inherit gettext pythonnative pkgconfig gconf autotools gobject-introspection + +EXTRA_OECONF = "--disable-gtk2 --disable-tests --enable-wayland --disable-emoji-dict --disable-python-library" + diff --git a/meta-citadel/recipes-desktop/lcms/lcms_2.9.bb b/meta-citadel/recipes-desktop/lcms/lcms_2.9.bb new file mode 100644 index 0000000..433e4e6 --- /dev/null +++ b/meta-citadel/recipes-desktop/lcms/lcms_2.9.bb @@ -0,0 +1,15 @@ +SUMMARY = "Little cms is a small-footprint, speed optimized color management engine" +SECTION = "libs" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=6c786c3b7a4afbd3c990f1b81261d516" +SRC_URI = "${SOURCEFORGE_MIRROR}/lcms/lcms2-${PV}.tar.gz" +SRC_URI[md5sum] = "8de1b7724f578d2995c8fdfa35c3ad0e" +SRC_URI[sha256sum] = "48c6fdf98396fa245ed86e622028caf49b96fa22f3e5734f853f806fbc8e7d20" + +DEPENDS = "tiff" + +BBCLASSEXTEND = "native" + +S = "${WORKDIR}/lcms2-${PV}" + +inherit autotools diff --git a/meta-citadel/recipes-desktop/libcanberra/libcanberra_0.30.bb b/meta-citadel/recipes-desktop/libcanberra/libcanberra_0.30.bb new file mode 100644 index 0000000..4a10cd5 --- /dev/null +++ b/meta-citadel/recipes-desktop/libcanberra/libcanberra_0.30.bb @@ -0,0 +1,30 @@ +SUMMARY = "An implementation of XDG Sound Theme and Name specification for generating sound events on free desktops" +HOMEPAGE = "http://0pointer.de/lennart/projects/libcanberra" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1" + +SRC_URI = "http://0pointer.de/lennart/projects/libcanberra/libcanberra-${PV}.tar.xz" +SRC_URI[md5sum] = "34cb7e4430afaf6f447c4ebdb9b42072" +SRC_URI[sha256sum] = "c2b671e67e0c288a69fc33dc1b6f1b534d07882c2aceed37004bf48c601afa72" + +DEPENDS = "libtool glib-2.0 alsa-lib libvorbis systemd gtk+3" + +FILES_${PN} += "\ + ${libdir}/${PN}-${PV} \ + ${datadir}/gnome \ + ${datadir}/gdm \ + ${libdir}/gtk-3.0 \ +" +FILES_${PN}-dev += "\ + ${libdir}/gnome-settings-daemon-3.0 \ + ${libdir}/gtk-3.0/modules/libcanberra-gtk-module.so \ +" + +do_install_append () { + rm -rf ${D}/${datadir}/vala +} + +inherit pkgconfig autotools + +EXTRA_OECONF = "--disable-oss --disable-pulse --disable-gstreamer --disable-tdb --disable-lynx --disable-gtk-doc --disable-udev" + diff --git a/meta-citadel/recipes-desktop/libgee/libgee_0.20.0.bb b/meta-citadel/recipes-desktop/libgee/libgee_0.20.0.bb new file mode 100644 index 0000000..922ce92 --- /dev/null +++ b/meta-citadel/recipes-desktop/libgee/libgee_0.20.0.bb @@ -0,0 +1,17 @@ +SUMMARY = "A collection library providing GObject based interfaces and classes for commonly used data structures" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" + +SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/libgee/0.20/libgee-${PV}.tar.xz" +SRC_URI[md5sum] = "66a4bfb6d7b03248acb99d140aac127d" +SRC_URI[sha256sum] = "21308ba3ed77646dda2e724c0e8d5a2f8d101fb05e078975a532d7887223c2bb" + +DEPENDS = "glib-2.0" + +PACKAGES += "${PN}-vala" +FILES_${PN}-vala = "${datadir}/vala/vapi" + +inherit pkgconfig autotools + +EXTRA_OECONF = "" + diff --git a/meta-citadel/recipes-desktop/libgtop/libgtop_2.38.0.bb b/meta-citadel/recipes-desktop/libgtop/libgtop_2.38.0.bb new file mode 100644 index 0000000..23be795 --- /dev/null +++ b/meta-citadel/recipes-desktop/libgtop/libgtop_2.38.0.bb @@ -0,0 +1,15 @@ +SUMMARY = "Library for accessing information about running processes" +HOMEPAGE = "https://developer.gnome.org/libgtop/stable/" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" + +SRC_URI = "https://download.gnome.org/sources/libgtop/2.38/libgtop-${PV}.tar.xz" +SRC_URI[md5sum] = "bb0ce7de6b28694b40405eedac8a31b5" +SRC_URI[sha256sum] = "4f6c0e62bb438abfd16b4559cd2eca0251de19e291c888cdc4dc88e5ffebb612" + +DEPENDS = "libx11 glib-2.0 libxau" + +inherit perlnative gettext pkgconfig autotools + +EXTRA_OECONF = "--with-examples=no" + diff --git a/meta-citadel/recipes-desktop/libgusb/libgusb_0.2.11.bb b/meta-citadel/recipes-desktop/libgusb/libgusb_0.2.11.bb new file mode 100644 index 0000000..c81a8f3 --- /dev/null +++ b/meta-citadel/recipes-desktop/libgusb/libgusb_0.2.11.bb @@ -0,0 +1,14 @@ +SUMMARY = "GObject wrapper for libusb1" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" + +SRC_URI = "https://people.freedesktop.org/~hughsient/releases/libgusb-${PV}.tar.xz" +SRC_URI[md5sum] = "fa2b41b828c749f9190edf888948a77b" +SRC_URI[sha256sum] = "9cb143493fab1dc3d0d0fdba2114b1d8ec8c5b6fad05bfd0f7700e4e4ff8f7de" + +DEPENDS = "glib-2.0 libusb1" + +inherit pkgconfig autotools gobject-introspection + +EXTRA_OECONF = "--disable-static --disable-gtk-doc" +BBCLASSEXTEND="native" diff --git a/meta-citadel/recipes-desktop/libgweather/libgweather_3.26.0.bb b/meta-citadel/recipes-desktop/libgweather/libgweather_3.26.0.bb new file mode 100644 index 0000000..e6300e6 --- /dev/null +++ b/meta-citadel/recipes-desktop/libgweather/libgweather_3.26.0.bb @@ -0,0 +1,17 @@ +SUMMARY = "Location and timezone database and weather lookup library" +HOMEPAGE = "https://wiki.gnome.org/Projects/LibGWeather" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SRC_URI = "https://download.gnome.org/sources/libgweather/3.26/libgweather-${PV}.tar.xz" +SRC_URI[md5sum] = "798098eddb2cd4a7f582a3f9aeb1b08d" +SRC_URI[sha256sum] = "5b84badc0b3ecffff5db1bb9a7cc4dd4e400a8eb3f1282348f8ee6ba33626b6e" + +DEPENDS = "gtk+3 libxml2 libsoup-2.4 glib-2.0 intltool-native geocode-glib glib-2.0-native" + +FILES_${PN} += "${datadir}/glib-2.0/schemas" + +inherit pythonnative pkgconfig gettext autotools gobject-introspection + +EXTRA_OECONF = "--enable-introspection=yes --enable-vala=no --enable-glade-catalog=no --disable-glibtest" + diff --git a/meta-citadel/recipes-desktop/libpwquality/libpwquality_1.4.0.bb b/meta-citadel/recipes-desktop/libpwquality/libpwquality_1.4.0.bb new file mode 100644 index 0000000..56491a5 --- /dev/null +++ b/meta-citadel/recipes-desktop/libpwquality/libpwquality_1.4.0.bb @@ -0,0 +1,17 @@ +SUMMARY = "Library for password quality checking and generating random passwords" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=6bd2f1386df813a459a0c34fde676fc2" + +SRC_URI = "https://github.com/libpwquality/libpwquality/releases/download/libpwquality-${PV}/libpwquality-${PV}.tar.bz2" +SRC_URI[md5sum] = "b8defcc7280a90e9400d6689c93a279c" +SRC_URI[sha256sum] = "1de6ff046cf2172d265a2cb6f8da439d894f3e4e8157b056c515515232fade6b" + +DEPENDS = "cracklib libpam" + +FILES_${PN} += "/usr/lib/security" +FILES_${PN}-staticdev += "${libdir}/security/pam_pwquality.a" + +inherit gettext autotools + +EXTRA_OECONF = "--disable-python-bindings" + diff --git a/meta-citadel/recipes-desktop/libwacom/libwacom_0.26.bb b/meta-citadel/recipes-desktop/libwacom/libwacom_0.26.bb new file mode 100644 index 0000000..9529eba --- /dev/null +++ b/meta-citadel/recipes-desktop/libwacom/libwacom_0.26.bb @@ -0,0 +1,15 @@ +SUMMARY = "Library to identify and configure Wacom tablets" +HOMEPAGE = "http://linuxwacom.sourceforge.net/wiki/index.php/Libwacom" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=40a21fffb367c82f39fd91a3b137c36e" + +SRC_URI = "https://downloads.sourceforge.net/linuxwacom/libwacom-${PV}.tar.bz2" +SRC_URI[md5sum] = "00d7f50bc7feda6a01f2b2546f787bc9" +SRC_URI[sha256sum] = "c3e4109c8aa675ca42cafbf39992dcd1fd6582314441c42ba32b49f5b79cfb76" + +DEPENDS = "libgudev libxml2 glib-2.0" + +inherit pkgconfig autotools + +EXTRA_OECONF = "" + diff --git a/meta-citadel/recipes-desktop/libxklavier/libxklavier_5.4.bb b/meta-citadel/recipes-desktop/libxklavier/libxklavier_5.4.bb new file mode 100644 index 0000000..be43073 --- /dev/null +++ b/meta-citadel/recipes-desktop/libxklavier/libxklavier_5.4.bb @@ -0,0 +1,15 @@ +SUMMARY = "Library providing high-level API for X Keyboard Extension" +HOMEPAGE = "https://www.freedesktop.org/wiki/Software/LibXklavier" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=6e29c688d912da12b66b73e32b03d812" + +SRC_URI = "https://people.freedesktop.org/~svu/libxklavier-${PV}.tar.bz2" +SRC_URI[md5sum] = "13af74dcb6011ecedf1e3ed122bd31fa" +SRC_URI[sha256sum] = "17a34194df5cbcd3b7bfd0f561d95d1f723aa1c87fca56bc2c209514460a9320" + +DEPENDS = "glib-2.0 libx11 libxml2 libxi iso-codes glib-2.0-native" + +inherit gettext pkgconfig autotools + +EXTRA_OECONF = "" + diff --git a/meta-citadel/recipes-desktop/mozjs/mozjs/0001-compare-the-first-character-of-string-to-be-null-or-.patch b/meta-citadel/recipes-desktop/mozjs/mozjs/0001-compare-the-first-character-of-string-to-be-null-or-.patch new file mode 100644 index 0000000..40d646c --- /dev/null +++ b/meta-citadel/recipes-desktop/mozjs/mozjs/0001-compare-the-first-character-of-string-to-be-null-or-.patch @@ -0,0 +1,32 @@ +From f36c9476d2816e0d3e61c9e13c22ed73883cb54a Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 24 Apr 2017 12:13:43 -0700 +Subject: [PATCH] compare the first character of string to be null or not + +Fixes + +error: ISO C++ forbids comparison between pointer and integer [-fpermissive] +| if (value[0] == '\0') +| ^~~~ + +Signed-off-by: Khem Raj +--- + js/src/shell/jsoptparse.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/js/src/shell/jsoptparse.cpp b/js/src/shell/jsoptparse.cpp +index b49d0a5..612aa00 100644 +--- a/js/src/shell/jsoptparse.cpp ++++ b/js/src/shell/jsoptparse.cpp +@@ -243,7 +243,7 @@ OptionParser::extractValue(size_t argc, char **argv, size_t *i, char **value) + char *eq = strchr(argv[*i], '='); + if (eq) { + *value = eq + 1; +- if (value[0] == '\0') ++ if (value[0][0] == '\0') + return error("A value is required for option %.*s", eq - argv[*i], argv[*i]); + return Okay; + } +-- +2.12.2 + diff --git a/meta-citadel/recipes-desktop/mozjs/mozjs/0001-js.pc.in-do-not-include-RequiredDefines.h-for-depend.patch b/meta-citadel/recipes-desktop/mozjs/mozjs/0001-js.pc.in-do-not-include-RequiredDefines.h-for-depend.patch new file mode 100644 index 0000000..bc141d9 --- /dev/null +++ b/meta-citadel/recipes-desktop/mozjs/mozjs/0001-js.pc.in-do-not-include-RequiredDefines.h-for-depend.patch @@ -0,0 +1,35 @@ +From 0a61b0b98c152f10404ccbdeeac583a486638a7a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Thu, 6 Jun 2013 18:36:01 +0200 +Subject: [PATCH] js.pc.in: do not include RequiredDefines.h for depending + packages +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +in our cross environment the would fail with: + +| cc1: fatal error: /usr/include/js-17.0/js/RequiredDefines.h: No such file or directory + +and currently it only defines __STDC_LIMIT_MACROS + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Andreas Müller +--- + js.pc.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/js.pc.in b/js.pc.in +index 13d761d..a95a7bd 100644 +--- a/js.pc.in ++++ b/js.pc.in +@@ -8,4 +8,4 @@ Description: The Mozilla library for JavaScript + Version: @MOZILLA_VERSION@ + Requires.private: @NSPR_PKGCONF_CHECK@ + Libs: -L${libdir} -l@LIBRARY_NAME@ +-Cflags: -include ${includedir}/@MODULE@/js/RequiredDefines.h -I${includedir}/@MODULE@ ++Cflags: -I${includedir}/@MODULE@ +-- +1.7.6.5 + diff --git a/meta-citadel/recipes-desktop/mozjs/mozjs/0001-mozjs17.0.0-fix-the-compile-bug-of-powerpc.patch b/meta-citadel/recipes-desktop/mozjs/mozjs/0001-mozjs17.0.0-fix-the-compile-bug-of-powerpc.patch new file mode 100644 index 0000000..de72d4f --- /dev/null +++ b/meta-citadel/recipes-desktop/mozjs/mozjs/0001-mozjs17.0.0-fix-the-compile-bug-of-powerpc.patch @@ -0,0 +1,36 @@ +From da3929a96d9c74e11bf37d128890e18fcb745365 Mon Sep 17 00:00:00 2001 +From: Lei Maohui +Date: Mon, 26 Jan 2015 08:53:19 +0900 +Subject: [PATCH] mozjs17.0.0: fix the compile bug of powerpc + +To fix the bug as following + +error: cannot convert '__va_list_tag**' to '__va_list_tag (*)[1]' for +argument '5' to 'JSBool TryArgumentFormatter(JSContext*, const char**, +JSBool, jsval**, __va_list_tag (*)[1])' + +Signed-off-by: Lei Maohui +--- + jscpucfg.h | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/jscpucfg.h b/jscpucfg.h +index dfb1c14..8683491 100644 +--- a/jscpucfg.h ++++ b/jscpucfg.h +@@ -47,6 +47,12 @@ + #elif defined(JS_HAVE_ENDIAN_H) + # include + ++#if defined(_POWER) || defined(__powerpc__) || \ ++ defined(__ppc__) ++# define HAVE_VA_LIST_AS_ARRAY 1 ++# endif ++ ++ + # if defined(__BYTE_ORDER) + # if __BYTE_ORDER == __LITTLE_ENDIAN + # define IS_LITTLE_ENDIAN 1 +-- +1.8.4.2 + diff --git a/meta-citadel/recipes-desktop/mozjs/mozjs/0001-regenerate-configure.patch b/meta-citadel/recipes-desktop/mozjs/mozjs/0001-regenerate-configure.patch new file mode 100644 index 0000000..fa413ea --- /dev/null +++ b/meta-citadel/recipes-desktop/mozjs/mozjs/0001-regenerate-configure.patch @@ -0,0 +1,3238 @@ +From 6440b4901c6f4bcc69686ff10806e311cc5a927b Mon Sep 17 00:00:00 2001 +From: Koen Kooi +Date: Tue, 3 Mar 2015 19:12:17 +0800 +Subject: [PATCH] regenerate configure with autoconf-2.13 + +Signed-off-by: Koen Kooi +Upstream-status: Inappropriate [generated file] + +--- + js/src/configure | 838 ++++++++++++++++++++++++++----------------------------- + 1 file changed, 389 insertions(+), 449 deletions(-) + +diff --git a/js/src/configure b/js/src/configure +index cb6b41b..b05298f 100755 +--- a/js/src/configure ++++ b/js/src/configure +@@ -5757,6 +5757,10 @@ arm*) + CPU_ARCH=arm + ;; + ++aarch64*) ++ CPU_ARCH=aarch64 ++ ;; ++ + mips|mipsel) + CPU_ARCH="mips" + ;; +@@ -5893,14 +5897,14 @@ no) + _SAVE_CFLAGS="$CFLAGS" + CFLAGS="$arch_flag" + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:5908: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + MOZ_THUMB2=1 + else +@@ -5972,16 +5976,16 @@ if test -n "$all_flags"; then + _SAVE_CFLAGS="$CFLAGS" + CFLAGS="$all_flags" + echo $ac_n "checking whether the chosen combination of compiler flags ($all_flags) works""... $ac_c" 1>&6 +-echo "configure:5976: checking whether the chosen combination of compiler flags ($all_flags) works" >&5 ++echo "configure:5980: checking whether the chosen combination of compiler flags ($all_flags) works" >&5 + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:5989: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + echo "$ac_t""yes" 1>&6 + else +@@ -6004,18 +6008,18 @@ fi + + if test "$CPU_ARCH" = "arm"; then + echo $ac_n "checking for ARM SIMD support in compiler""... $ac_c" 1>&6 +-echo "configure:6008: checking for ARM SIMD support in compiler" >&5 ++echo "configure:6012: checking for ARM SIMD support in compiler" >&5 + # We try to link so that this also fails when + # building with LTO. + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:6023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + result="yes" + else +@@ -6038,18 +6042,18 @@ EOF + fi + + echo $ac_n "checking for ARM NEON support in compiler""... $ac_c" 1>&6 +-echo "configure:6042: checking for ARM NEON support in compiler" >&5 ++echo "configure:6046: checking for ARM NEON support in compiler" >&5 + # We try to link so that this also fails when + # building with LTO. + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:6057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + result="yes" + else +@@ -6094,7 +6098,7 @@ configure_static_assert_macros=' + ' + + echo $ac_n "checking that static assertion macros used in autoconf tests work""... $ac_c" 1>&6 +-echo "configure:6098: checking that static assertion macros used in autoconf tests work" >&5 ++echo "configure:6102: checking that static assertion macros used in autoconf tests work" >&5 + if eval "test \"`echo '$''{'ac_cv_static_assertion_macros_work'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -6108,14 +6112,14 @@ cross_compiling=$ac_cv_prog_cc_cross + + ac_cv_static_assertion_macros_work="yes" + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:6123: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + : + else + echo "configure: failed program was:" >&5 +@@ -6125,14 +6129,14 @@ else + fi + rm -f conftest* + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:6140: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_static_assertion_macros_work="no" + else +@@ -6148,14 +6152,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes + cross_compiling=$ac_cv_prog_cxx_cross + + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:6163: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + : + else + echo "configure: failed program was:" >&5 +@@ -6165,14 +6169,14 @@ else + fi + rm -f conftest* + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:6180: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_static_assertion_macros_work="no" + else +@@ -6317,7 +6321,7 @@ if test "$GNU_CC"; then + _WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} -Wall -Wpointer-arith -Wdeclaration-after-statement" + + echo $ac_n "checking whether the C compiler supports -Werror=return-type""... $ac_c" 1>&6 +-echo "configure:6321: checking whether the C compiler supports -Werror=return-type" >&5 ++echo "configure:6325: checking whether the C compiler supports -Werror=return-type" >&5 + if eval "test \"`echo '$''{'ac_c_has_werror_return_type'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -6333,14 +6337,14 @@ cross_compiling=$ac_cv_prog_cc_cross + _SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -Werror -Werror=return-type" + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:6348: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_c_has_werror_return_type="yes" + else +@@ -6368,7 +6372,7 @@ echo "$ac_t""$ac_c_has_werror_return_type" 1>&6 + + + echo $ac_n "checking whether the C compiler supports -Wtype-limits""... $ac_c" 1>&6 +-echo "configure:6372: checking whether the C compiler supports -Wtype-limits" >&5 ++echo "configure:6376: checking whether the C compiler supports -Wtype-limits" >&5 + if eval "test \"`echo '$''{'ac_c_has_wtype_limits'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -6384,14 +6388,14 @@ cross_compiling=$ac_cv_prog_cc_cross + _SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -Werror -Wtype-limits" + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:6399: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_c_has_wtype_limits="yes" + else +@@ -6419,7 +6423,7 @@ echo "$ac_t""$ac_c_has_wtype_limits" 1>&6 + + + echo $ac_n "checking whether the C compiler supports -Wempty-body""... $ac_c" 1>&6 +-echo "configure:6423: checking whether the C compiler supports -Wempty-body" >&5 ++echo "configure:6427: checking whether the C compiler supports -Wempty-body" >&5 + if eval "test \"`echo '$''{'ac_c_has_wempty_body'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -6435,14 +6439,14 @@ cross_compiling=$ac_cv_prog_cc_cross + _SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -Werror -Wempty-body" + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:6450: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_c_has_wempty_body="yes" + else +@@ -6476,7 +6480,7 @@ echo "$ac_t""$ac_c_has_wempty_body" 1>&6 + _WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} -Wno-unused" + + echo $ac_n "checking whether the C compiler supports -Wno-overlength-strings""... $ac_c" 1>&6 +-echo "configure:6480: checking whether the C compiler supports -Wno-overlength-strings" >&5 ++echo "configure:6484: checking whether the C compiler supports -Wno-overlength-strings" >&5 + if eval "test \"`echo '$''{'ac_c_has_wno_overlength_strings'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -6492,14 +6496,14 @@ cross_compiling=$ac_cv_prog_cc_cross + _SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -Werror -Woverlength-strings" + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:6507: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_c_has_wno_overlength_strings="yes" + else +@@ -6580,7 +6584,7 @@ if test "$GNU_CXX"; then + _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} -Wall -Wpointer-arith -Woverloaded-virtual" + + echo $ac_n "checking whether the C++ compiler supports -Werror=return-type""... $ac_c" 1>&6 +-echo "configure:6584: checking whether the C++ compiler supports -Werror=return-type" >&5 ++echo "configure:6588: checking whether the C++ compiler supports -Werror=return-type" >&5 + if eval "test \"`echo '$''{'ac_cxx_has_werror_return_type'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -6596,14 +6600,14 @@ cross_compiling=$ac_cv_prog_cxx_cross + _SAVE_CXXFLAGS="$CXXFLAGS" + CXXFLAGS="$CXXFLAGS -Werror -Werror=return-type" + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:6611: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cxx_has_werror_return_type="yes" + else +@@ -6631,7 +6635,7 @@ echo "$ac_t""$ac_cxx_has_werror_return_type" 1>&6 + + + echo $ac_n "checking whether the C++ compiler supports -Wtype-limits""... $ac_c" 1>&6 +-echo "configure:6635: checking whether the C++ compiler supports -Wtype-limits" >&5 ++echo "configure:6639: checking whether the C++ compiler supports -Wtype-limits" >&5 + if eval "test \"`echo '$''{'ac_cxx_has_wtype_limits'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -6647,14 +6651,14 @@ cross_compiling=$ac_cv_prog_cxx_cross + _SAVE_CXXFLAGS="$CXXFLAGS" + CXXFLAGS="$CXXFLAGS -Werror -Wtype-limits" + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:6662: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cxx_has_wtype_limits="yes" + else +@@ -6682,7 +6686,7 @@ echo "$ac_t""$ac_cxx_has_wtype_limits" 1>&6 + + + echo $ac_n "checking whether the C++ compiler supports -Wempty-body""... $ac_c" 1>&6 +-echo "configure:6686: checking whether the C++ compiler supports -Wempty-body" >&5 ++echo "configure:6690: checking whether the C++ compiler supports -Wempty-body" >&5 + if eval "test \"`echo '$''{'ac_cxx_has_wempty_body'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -6698,14 +6702,14 @@ cross_compiling=$ac_cv_prog_cxx_cross + _SAVE_CXXFLAGS="$CXXFLAGS" + CXXFLAGS="$CXXFLAGS -Werror -Wempty-body" + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:6713: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cxx_has_wempty_body="yes" + else +@@ -6741,7 +6745,7 @@ echo "$ac_t""$ac_cxx_has_wempty_body" 1>&6 + _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} -Wno-ctor-dtor-privacy" + + echo $ac_n "checking whether the C++ compiler supports -Wno-overlength-strings""... $ac_c" 1>&6 +-echo "configure:6745: checking whether the C++ compiler supports -Wno-overlength-strings" >&5 ++echo "configure:6749: checking whether the C++ compiler supports -Wno-overlength-strings" >&5 + if eval "test \"`echo '$''{'ac_cxx_has_wno_overlength_strings'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -6757,14 +6761,14 @@ cross_compiling=$ac_cv_prog_cxx_cross + _SAVE_CXXFLAGS="$CXXFLAGS" + CXXFLAGS="$CXXFLAGS -Werror -Woverlength-strings" + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:6772: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cxx_has_wno_overlength_strings="yes" + else +@@ -6792,7 +6796,7 @@ echo "$ac_t""$ac_cxx_has_wno_overlength_strings" 1>&6 + + + echo $ac_n "checking whether the C++ compiler supports -Wno-invalid-offsetof""... $ac_c" 1>&6 +-echo "configure:6796: checking whether the C++ compiler supports -Wno-invalid-offsetof" >&5 ++echo "configure:6800: checking whether the C++ compiler supports -Wno-invalid-offsetof" >&5 + if eval "test \"`echo '$''{'ac_cxx_has_wno_invalid_offsetof'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -6808,14 +6812,14 @@ cross_compiling=$ac_cv_prog_cxx_cross + _SAVE_CXXFLAGS="$CXXFLAGS" + CXXFLAGS="$CXXFLAGS -Werror -Winvalid-offsetof" + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:6823: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cxx_has_wno_invalid_offsetof="yes" + else +@@ -6843,7 +6847,7 @@ echo "$ac_t""$ac_cxx_has_wno_invalid_offsetof" 1>&6 + + + echo $ac_n "checking whether the C++ compiler supports -Wno-variadic-macros""... $ac_c" 1>&6 +-echo "configure:6847: checking whether the C++ compiler supports -Wno-variadic-macros" >&5 ++echo "configure:6851: checking whether the C++ compiler supports -Wno-variadic-macros" >&5 + if eval "test \"`echo '$''{'ac_cxx_has_wno_variadic_macros'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -6859,14 +6863,14 @@ cross_compiling=$ac_cv_prog_cxx_cross + _SAVE_CXXFLAGS="$CXXFLAGS" + CXXFLAGS="$CXXFLAGS -Werror -Wvariadic-macros" + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:6874: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cxx_has_wno_variadic_macros="yes" + else +@@ -6918,7 +6922,7 @@ echo "$ac_t""$ac_cxx_has_wno_variadic_macros" 1>&6 + _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} -Wno-c++0x-extensions" + + echo $ac_n "checking whether the C++ compiler supports -Wno-extended-offsetof""... $ac_c" 1>&6 +-echo "configure:6922: checking whether the C++ compiler supports -Wno-extended-offsetof" >&5 ++echo "configure:6926: checking whether the C++ compiler supports -Wno-extended-offsetof" >&5 + if eval "test \"`echo '$''{'ac_cxx_has_wno_extended_offsetof'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -6934,14 +6938,14 @@ cross_compiling=$ac_cv_prog_cxx_cross + _SAVE_CXXFLAGS="$CXXFLAGS" + CXXFLAGS="$CXXFLAGS -Werror -Wextended-offsetof" + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:6949: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cxx_has_wno_extended_offsetof="yes" + else +@@ -6979,7 +6983,7 @@ MKSHLIB_UNFORCE_ALL= + if test "$COMPILE_ENVIRONMENT"; then + if test "$GNU_CC"; then + echo $ac_n "checking whether ld has archive extraction flags""... $ac_c" 1>&6 +-echo "configure:6983: checking whether ld has archive extraction flags" >&5 ++echo "configure:6987: checking whether ld has archive extraction flags" >&5 + if eval "test \"`echo '$''{'ac_cv_mkshlib_force_and_unforce'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -6996,14 +7000,14 @@ LOOP_INPUT + LDFLAGS=$force + LIBS=$unforce + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:7011: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_mkshlib_force_and_unforce=$line; break + else +@@ -7038,16 +7042,16 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a + cross_compiling=$ac_cv_prog_cc_cross + + echo $ac_n "checking for 64-bit OS""... $ac_c" 1>&6 +-echo "configure:7042: checking for 64-bit OS" >&5 ++echo "configure:7046: checking for 64-bit OS" >&5 + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7055: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + result="yes" + else +@@ -7170,7 +7174,7 @@ case "$host" in + esac + + echo $ac_n "checking for Python version >= $PYTHON_VERSION but not 3.x""... $ac_c" 1>&6 +-echo "configure:7174: checking for Python version >= $PYTHON_VERSION but not 3.x" >&5 ++echo "configure:7178: checking for Python version >= $PYTHON_VERSION but not 3.x" >&5 + + $PYTHON -c "import sys; sys.exit(sys.version[:3] < sys.argv[1] or sys.version[:2] != '2.')" $PYTHON_VERSION + _python_res=$? +@@ -7181,7 +7185,7 @@ fi + echo "$ac_t""yes" 1>&6 + + echo $ac_n "checking for custom implementation""... $ac_c" 1>&6 +-echo "configure:7185: checking for custom implementation" >&5 ++echo "configure:7189: checking for custom implementation" >&5 + if test "$MOZ_CUSTOM_STDINT_H"; then + cat >> confdefs.pytmp <&6 +-echo "configure:7302: checking for $ac_hdr" >&5 ++echo "configure:7306: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < +@@ -7311,7 +7315,7 @@ int main() { + + ; return 0; } + EOF +-if { (eval echo configure:7315: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7319: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" + else +@@ -7394,17 +7398,17 @@ EOF + # builds. + _SAVE_LDFLAGS=$LDFLAGS + echo $ac_n "checking for -framework ExceptionHandling""... $ac_c" 1>&6 +-echo "configure:7398: checking for -framework ExceptionHandling" >&5 ++echo "configure:7402: checking for -framework ExceptionHandling" >&5 + LDFLAGS="$LDFLAGS -framework ExceptionHandling" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:7412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_have_framework_exceptionhandling="yes" + else +@@ -7426,18 +7430,18 @@ rm -f conftest* + echo "Skipping -dead_strip because DTrace is enabled. See bug 403132." + else + echo $ac_n "checking for -dead_strip option to ld""... $ac_c" 1>&6 +-echo "configure:7430: checking for -dead_strip option to ld" >&5 ++echo "configure:7434: checking for -dead_strip option to ld" >&5 + _SAVE_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS -Wl,-dead_strip" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:7445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + _HAVE_DEAD_STRIP=1 + else +@@ -7783,12 +7787,12 @@ EOF + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:7787: checking for $ac_hdr" >&5 ++echo "configure:7791: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < +@@ -7796,7 +7800,7 @@ int main() { + + ; return 0; } + EOF +-if { (eval echo configure:7800: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7804: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" + else +@@ -7989,19 +7993,19 @@ EOF + _DEFINES_CXXFLAGS="$_DEFINES_CXXFLAGS -Uunix -U__unix -U__unix__" + + echo $ac_n "checking for __declspec(dllexport)""... $ac_c" 1>&6 +-echo "configure:7993: checking for __declspec(dllexport)" >&5 ++echo "configure:7997: checking for __declspec(dllexport)" >&5 + if eval "test \"`echo '$''{'ac_os2_declspec'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:8009: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_os2_declspec="yes" + else +@@ -8054,14 +8058,14 @@ EOF + _SAVE_LDFLAGS=$LDFLAGS + LDFLAGS="-M /usr/lib/ld/map.noexstk $LDFLAGS" + cat > conftest.$ac_ext < + int main() { + printf("Hello World\n"); + ; return 0; } + EOF +-if { (eval echo configure:8065: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8069: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + : + else + echo "configure: failed program was:" >&5 +@@ -8089,7 +8093,7 @@ rm -f conftest* + CC_VERSION=`$CC -V 2>&1 | grep '^cc:' 2>/dev/null | $AWK -F\: '{ print $2 }'` + CXX_VERSION=`$CXX -V 2>&1 | grep '^CC:' 2>/dev/null | $AWK -F\: '{ print $2 }'` + echo $ac_n "checking for Sun C++ compiler version >= 5.9""... $ac_c" 1>&6 +-echo "configure:8093: checking for Sun C++ compiler version >= 5.9" >&5 ++echo "configure:8097: checking for Sun C++ compiler version >= 5.9" >&5 + + ac_ext=C + # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +@@ -8099,7 +8103,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes + cross_compiling=$ac_cv_prog_cxx_cross + + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:8116: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + _BAD_COMPILER= + else +@@ -8125,7 +8129,7 @@ rm -f conftest* + _res="yes" + fi + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:8142: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + _ABOVE_SS12U1= + else +@@ -8535,7 +8539,7 @@ fi + + if test "$GNU_CC" -a "$GCC_USE_GNU_LD" -a -z "$MOZ_DISABLE_ICF"; then + echo $ac_n "checking whether the linker supports Identical Code Folding""... $ac_c" 1>&6 +-echo "configure:8539: checking whether the linker supports Identical Code Folding" >&5 ++echo "configure:8543: checking whether the linker supports Identical Code Folding" >&5 + if eval "test \"`echo '$''{'LD_SUPPORTS_ICF'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -8544,7 +8548,7 @@ else + 'int main() {return foo() - bar();}' > conftest.${ac_ext} + # If the linker supports ICF, foo and bar symbols will have + # the same address +- if { ac_try='${CC-cc} -o conftest${ac_exeext} $LDFLAGS -Wl,--icf=safe -ffunction-sections conftest.${ac_ext} $LIBS 1>&2'; { (eval echo configure:8548: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && ++ if { ac_try='${CC-cc} -o conftest${ac_exeext} $LDFLAGS -Wl,--icf=safe -ffunction-sections conftest.${ac_ext} $LIBS 1>&2'; { (eval echo configure:8552: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && + test -s conftest${ac_exeext} && + objdump -t conftest${ac_exeext} | awk '{a[$6] = $1} END {if (a["foo"] && (a["foo"] != a["bar"])) { exit 1 }}'; then + LD_SUPPORTS_ICF=yes +@@ -8559,14 +8563,14 @@ echo "$ac_t""$LD_SUPPORTS_ICF" 1>&6 + _SAVE_LDFLAGS="$LDFLAGS -Wl,--icf=safe" + LDFLAGS="$LDFLAGS -Wl,--icf=safe -Wl,--print-icf-sections" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8574: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + LD_PRINT_ICF_SECTIONS=-Wl,--print-icf-sections + else +@@ -8584,15 +8588,15 @@ fi + + if test "$GNU_CC" -a "$GCC_USE_GNU_LD" -a -n "$MOZ_DEBUG_FLAGS"; then + echo $ac_n "checking whether removing dead symbols breaks debugging""... $ac_c" 1>&6 +-echo "configure:8588: checking whether removing dead symbols breaks debugging" >&5 ++echo "configure:8592: checking whether removing dead symbols breaks debugging" >&5 + if eval "test \"`echo '$''{'GC_SECTIONS_BREAKS_DEBUG_RANGES'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + echo 'int foo() {return 42;}' \ + 'int bar() {return 1;}' \ + 'int main() {return foo();}' > conftest.${ac_ext} +- if { ac_try='${CC-cc} -o conftest.${ac_objext} $CFLAGS $MOZ_DEBUG_FLAGS -c conftest.${ac_ext} 1>&2'; { (eval echo configure:8595: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && +- { ac_try='${CC-cc} -o conftest${ac_exeext} $LDFLAGS $MOZ_DEBUG_FLAGS -Wl,--gc-sections conftest.${ac_objext} $LIBS 1>&2'; { (eval echo configure:8596: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && ++ if { ac_try='${CC-cc} -o conftest.${ac_objext} $CFLAGS $MOZ_DEBUG_FLAGS -c conftest.${ac_ext} 1>&2'; { (eval echo configure:8599: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && ++ { ac_try='${CC-cc} -o conftest${ac_exeext} $LDFLAGS $MOZ_DEBUG_FLAGS -Wl,--gc-sections conftest.${ac_objext} $LIBS 1>&2'; { (eval echo configure:8600: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && + test -s conftest${ac_exeext} -a -s conftest.${ac_objext}; then + if test "`$PYTHON "$_topsrcdir"/build/autoconf/check_debug_ranges.py conftest.${ac_objext} conftest.${ac_ext}`" = \ + "`$PYTHON "$_topsrcdir"/build/autoconf/check_debug_ranges.py conftest${ac_exeext} conftest.${ac_ext}`"; then +@@ -8615,12 +8619,12 @@ fi + + if test -z "$SKIP_COMPILER_CHECKS"; then + echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 +-echo "configure:8619: checking for ANSI C header files" >&5 ++echo "configure:8623: checking for ANSI C header files" >&5 + if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #include +@@ -8628,7 +8632,7 @@ else + #include + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:8632: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8636: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -8645,7 +8649,7 @@ rm -f conftest* + if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. + cat > conftest.$ac_ext < + EOF +@@ -8663,7 +8667,7 @@ fi + if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + cat > conftest.$ac_ext < + EOF +@@ -8684,7 +8688,7 @@ if test "$cross_compiling" = yes; then + : + else + cat > conftest.$ac_ext < + #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +@@ -8695,7 +8699,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); + exit (0); } + + EOF +-if { (eval echo configure:8699: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:8703: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + : + else +@@ -8722,12 +8726,12 @@ EOF + fi + + echo $ac_n "checking for working const""... $ac_c" 1>&6 +-echo "configure:8726: checking for working const" >&5 ++echo "configure:8730: checking for working const" >&5 + if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:8784: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_c_const=yes + else +@@ -8800,12 +8804,12 @@ EOF + fi + + echo $ac_n "checking for mode_t""... $ac_c" 1>&6 +-echo "configure:8804: checking for mode_t" >&5 ++echo "configure:8808: checking for mode_t" >&5 + if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #if STDC_HEADERS +@@ -8836,12 +8840,12 @@ EOF + fi + + echo $ac_n "checking for off_t""... $ac_c" 1>&6 +-echo "configure:8840: checking for off_t" >&5 ++echo "configure:8844: checking for off_t" >&5 + if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #if STDC_HEADERS +@@ -8872,12 +8876,12 @@ EOF + fi + + echo $ac_n "checking for pid_t""... $ac_c" 1>&6 +-echo "configure:8876: checking for pid_t" >&5 ++echo "configure:8880: checking for pid_t" >&5 + if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #if STDC_HEADERS +@@ -8908,12 +8912,12 @@ EOF + fi + + echo $ac_n "checking for size_t""... $ac_c" 1>&6 +-echo "configure:8912: checking for size_t" >&5 ++echo "configure:8916: checking for size_t" >&5 + if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #if STDC_HEADERS +@@ -8951,12 +8955,12 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes + cross_compiling=$ac_cv_prog_cxx_cross + + echo $ac_n "checking for __stdcall""... $ac_c" 1>&6 +-echo "configure:8955: checking for __stdcall" >&5 ++echo "configure:8959: checking for __stdcall" >&5 + if eval "test \"`echo '$''{'ac_cv___stdcall'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < struct foo; + template <> struct foo {}; +@@ -8965,7 +8969,7 @@ int main() { + + ; return 0; } + EOF +-if { (eval echo configure:8969: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:8973: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv___stdcall=true + else +@@ -8997,12 +9001,12 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a + cross_compiling=$ac_cv_prog_cc_cross + + echo $ac_n "checking for ssize_t""... $ac_c" 1>&6 +-echo "configure:9001: checking for ssize_t" >&5 ++echo "configure:9005: checking for ssize_t" >&5 + if eval "test \"`echo '$''{'ac_cv_type_ssize_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #include +@@ -9010,7 +9014,7 @@ int main() { + ssize_t foo = 0; + ; return 0; } + EOF +-if { (eval echo configure:9014: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:9018: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_type_ssize_t=true + else +@@ -9035,12 +9039,12 @@ else + echo "$ac_t""no" 1>&6 + fi + echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6 +-echo "configure:9039: checking for st_blksize in struct stat" >&5 ++echo "configure:9043: checking for st_blksize in struct stat" >&5 + if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #include +@@ -9048,7 +9052,7 @@ int main() { + struct stat s; s.st_blksize; + ; return 0; } + EOF +-if { (eval echo configure:9052: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:9056: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_struct_st_blksize=yes + else +@@ -9072,12 +9076,12 @@ EOF + fi + + echo $ac_n "checking for siginfo_t""... $ac_c" 1>&6 +-echo "configure:9076: checking for siginfo_t" >&5 ++echo "configure:9080: checking for siginfo_t" >&5 + if eval "test \"`echo '$''{'ac_cv_siginfo_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < +@@ -9085,7 +9089,7 @@ int main() { + siginfo_t* info; + ; return 0; } + EOF +-if { (eval echo configure:9089: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:9093: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_siginfo_t=true + else +@@ -9111,72 +9115,8 @@ else + fi + + +-echo $ac_n "checking for the size of void*""... $ac_c" 1>&6 +-echo "configure:9116: checking for the size of void*" >&5 +-if eval "test \"`echo '$''{'moz_cv_size_of_JS_BYTES_PER_WORD'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- +- moz_cv_size_of_JS_BYTES_PER_WORD= +- for size in 4 8; do +- cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +- rm -rf conftest* +- moz_cv_size_of_JS_BYTES_PER_WORD=$size; break +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +-fi +-rm -f conftest* +- done +- if test ! "$moz_cv_size_of_JS_BYTES_PER_WORD"; then +- { echo "configure: error: No size found for void*" 1>&2; exit 1; } +- fi +- +-fi +- +-echo "$ac_t""$moz_cv_size_of_JS_BYTES_PER_WORD" 1>&6 +-cat >> confdefs.pytmp <> confdefs.h <> confdefs.pytmp <<\EOF +- (''' JS_BITS_PER_WORD_LOG2 ''', r''' 5 ''') +-EOF +-cat >> confdefs.h <<\EOF +-#define JS_BITS_PER_WORD_LOG2 5 +-EOF +- +-elif test "$moz_cv_size_of_JS_BYTES_PER_WORD" -eq "8"; then +- cat >> confdefs.pytmp <<\EOF +- (''' JS_BITS_PER_WORD_LOG2 ''', r''' 6 ''') +-EOF +-cat >> confdefs.h <<\EOF +-#define JS_BITS_PER_WORD_LOG2 6 +-EOF +- +-else +- { echo "configure: error: Unexpected JS_BYTES_PER_WORD" 1>&2; exit 1; } +-fi +- +- + echo $ac_n "checking for the alignment of void*""... $ac_c" 1>&6 +-echo "configure:9180: checking for the alignment of void*" >&5 ++echo "configure:9120: checking for the alignment of void*" >&5 + if eval "test \"`echo '$''{'moz_cv_align_of_JS_ALIGN_OF_POINTER'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -9184,7 +9124,7 @@ else + moz_cv_align_of_JS_ALIGN_OF_POINTER= + for align in 2 4 8 16; do + cat > conftest.$ac_ext < +@@ -9197,7 +9137,7 @@ int main() { + + ; return 0; } + EOF +-if { (eval echo configure:9201: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:9141: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + moz_cv_align_of_JS_ALIGN_OF_POINTER=$align; break + else +@@ -9223,7 +9163,7 @@ EOF + + + echo $ac_n "checking for the size of double""... $ac_c" 1>&6 +-echo "configure:9227: checking for the size of double" >&5 ++echo "configure:9167: checking for the size of double" >&5 + if eval "test \"`echo '$''{'moz_cv_size_of_JS_BYTES_PER_DOUBLE'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -9231,7 +9171,7 @@ else + moz_cv_size_of_JS_BYTES_PER_DOUBLE= + for size in 6 8 10 12 14; do + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:9185: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + moz_cv_size_of_JS_BYTES_PER_DOUBLE=$size; break + else +@@ -9270,12 +9210,12 @@ EOF + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:9274: checking for $ac_hdr" >&5 ++echo "configure:9214: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < +@@ -9283,7 +9223,7 @@ int main() { + + ; return 0; } + EOF +-if { (eval echo configure:9287: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:9227: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" + else +@@ -9326,12 +9266,12 @@ fi + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:9330: checking for $ac_hdr" >&5 ++echo "configure:9270: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #include <$ac_hdr> +@@ -9339,7 +9279,7 @@ int main() { + + ; return 0; } + EOF +-if { (eval echo configure:9343: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:9283: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" + else +@@ -9382,12 +9322,12 @@ fi + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:9386: checking for $ac_hdr" >&5 ++echo "configure:9326: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < +@@ -9395,7 +9335,7 @@ int main() { + + ; return 0; } + EOF +-if { (eval echo configure:9399: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:9339: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" + else +@@ -9435,12 +9375,12 @@ EOF + fi + + echo $ac_n "checking for uint""... $ac_c" 1>&6 +-echo "configure:9439: checking for uint" >&5 ++echo "configure:9379: checking for uint" >&5 + if eval "test \"`echo '$''{'ac_cv_uint'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #include +@@ -9448,7 +9388,7 @@ int main() { + uint foo = 0; + ; return 0; } + EOF +-if { (eval echo configure:9452: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:9392: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_uint=true + else +@@ -9473,12 +9413,12 @@ else + echo "$ac_t""no" 1>&6 + fi + echo $ac_n "checking for uint_t""... $ac_c" 1>&6 +-echo "configure:9477: checking for uint_t" >&5 ++echo "configure:9417: checking for uint_t" >&5 + if eval "test \"`echo '$''{'ac_cv_uint_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #include +@@ -9486,7 +9426,7 @@ int main() { + uint_t foo = 0; + ; return 0; } + EOF +-if { (eval echo configure:9490: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:9430: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_uint_t=true + else +@@ -9520,12 +9460,12 @@ cross_compiling=$ac_cv_prog_cxx_cross + + + echo $ac_n "checking for uname.domainname""... $ac_c" 1>&6 +-echo "configure:9524: checking for uname.domainname" >&5 ++echo "configure:9464: checking for uname.domainname" >&5 + if eval "test \"`echo '$''{'ac_cv_have_uname_domainname_field'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + int main() { +@@ -9533,7 +9473,7 @@ int main() { + (void)uname(res); if (res != 0) { domain = res->domainname; } + ; return 0; } + EOF +-if { (eval echo configure:9537: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:9477: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_have_uname_domainname_field=true + else +@@ -9560,12 +9500,12 @@ else + fi + + echo $ac_n "checking for uname.__domainname""... $ac_c" 1>&6 +-echo "configure:9564: checking for uname.__domainname" >&5 ++echo "configure:9504: checking for uname.__domainname" >&5 + if eval "test \"`echo '$''{'ac_cv_have_uname_us_domainname_field'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + int main() { +@@ -9573,7 +9513,7 @@ int main() { + (void)uname(res); if (res != 0) { domain = res->__domainname; } + ; return 0; } + EOF +-if { (eval echo configure:9577: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:9517: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_have_uname_us_domainname_field=true + else +@@ -9609,7 +9549,7 @@ cross_compiling=$ac_cv_prog_cc_cross + + if test "$GNU_CC"; then + echo $ac_n "checking for visibility(hidden) attribute""... $ac_c" 1>&6 +-echo "configure:9613: checking for visibility(hidden) attribute" >&5 ++echo "configure:9553: checking for visibility(hidden) attribute" >&5 + if eval "test \"`echo '$''{'ac_cv_visibility_hidden'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -9637,7 +9577,7 @@ EOF + + + echo $ac_n "checking for visibility(default) attribute""... $ac_c" 1>&6 +-echo "configure:9641: checking for visibility(default) attribute" >&5 ++echo "configure:9581: checking for visibility(default) attribute" >&5 + if eval "test \"`echo '$''{'ac_cv_visibility_default'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -9665,7 +9605,7 @@ EOF + + + echo $ac_n "checking for visibility pragma support""... $ac_c" 1>&6 +-echo "configure:9669: checking for visibility pragma support" >&5 ++echo "configure:9609: checking for visibility pragma support" >&5 + if eval "test \"`echo '$''{'ac_cv_visibility_pragma'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -9690,7 +9630,7 @@ fi + echo "$ac_t""$ac_cv_visibility_pragma" 1>&6 + if test "$ac_cv_visibility_pragma" = "yes"; then + echo $ac_n "checking For gcc visibility bug with class-level attributes (GCC bug 26905)""... $ac_c" 1>&6 +-echo "configure:9694: checking For gcc visibility bug with class-level attributes (GCC bug 26905)" >&5 ++echo "configure:9634: checking For gcc visibility bug with class-level attributes (GCC bug 26905)" >&5 + if eval "test \"`echo '$''{'ac_cv_have_visibility_class_bug'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -9718,7 +9658,7 @@ fi + echo "$ac_t""$ac_cv_have_visibility_class_bug" 1>&6 + + echo $ac_n "checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)""... $ac_c" 1>&6 +-echo "configure:9722: checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)" >&5 ++echo "configure:9662: checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)" >&5 + if eval "test \"`echo '$''{'ac_cv_have_visibility_builtin_bug'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -9770,7 +9710,7 @@ fi # Sun Studio on Solaris + if test "$GNU_CC"; then + + echo $ac_n "checking for gcc PR49911""... $ac_c" 1>&6 +-echo "configure:9774: checking for gcc PR49911" >&5 ++echo "configure:9714: checking for gcc PR49911" >&5 + ac_have_gcc_pr49911="no" + + ac_ext=C +@@ -9787,7 +9727,7 @@ if test "$cross_compiling" = yes; then + true + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:9772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + true + else +@@ -9865,12 +9805,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 +-echo "configure:9869: checking for $ac_hdr that defines DIR" >&5 ++echo "configure:9809: checking for $ac_hdr that defines DIR" >&5 + if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #include <$ac_hdr> +@@ -9878,7 +9818,7 @@ int main() { + DIR *dirp = 0; + ; return 0; } + EOF +-if { (eval echo configure:9882: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:9822: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + eval "ac_cv_header_dirent_$ac_safe=yes" + else +@@ -9906,7 +9846,7 @@ done + # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. + if test $ac_header_dirent = dirent.h; then + echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 +-echo "configure:9910: checking for opendir in -ldir" >&5 ++echo "configure:9850: checking for opendir in -ldir" >&5 + ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -9914,7 +9854,7 @@ else + ac_save_LIBS="$LIBS" + LIBS="-ldir $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -9947,7 +9887,7 @@ fi + + else + echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 +-echo "configure:9951: checking for opendir in -lx" >&5 ++echo "configure:9891: checking for opendir in -lx" >&5 + ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -9955,7 +9895,7 @@ else + ac_save_LIBS="$LIBS" + LIBS="-lx $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -10000,12 +9940,12 @@ esac + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:10004: checking for $ac_hdr" >&5 ++echo "configure:9944: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < +@@ -10013,7 +9953,7 @@ int main() { + + ; return 0; } + EOF +-if { (eval echo configure:10017: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:9957: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" + else +@@ -10048,12 +9988,12 @@ EOF + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:10052: checking for $ac_hdr" >&5 ++echo "configure:9992: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < +@@ -10061,7 +10001,7 @@ int main() { + + ; return 0; } + EOF +-if { (eval echo configure:10065: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10005: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" + else +@@ -10095,12 +10035,12 @@ EOF + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:10099: checking for $ac_hdr" >&5 ++echo "configure:10039: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < +@@ -10108,7 +10048,7 @@ int main() { + + ; return 0; } + EOF +-if { (eval echo configure:10112: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10052: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" + else +@@ -10141,12 +10081,12 @@ EOF + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:10145: checking for $ac_hdr" >&5 ++echo "configure:10085: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < +@@ -10154,7 +10094,7 @@ int main() { + + ; return 0; } + EOF +-if { (eval echo configure:10158: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10098: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" + else +@@ -10188,12 +10128,12 @@ EOF + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:10192: checking for $ac_hdr" >&5 ++echo "configure:10132: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < +@@ -10201,7 +10141,7 @@ int main() { + + ; return 0; } + EOF +-if { (eval echo configure:10205: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10145: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" + else +@@ -10241,12 +10181,12 @@ cross_compiling=$ac_cv_prog_cxx_cross + NEW_H=new.h + ac_safe=`echo "new" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for new""... $ac_c" 1>&6 +-echo "configure:10245: checking for new" >&5 ++echo "configure:10185: checking for new" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < +@@ -10254,7 +10194,7 @@ int main() { + + ; return 0; } + EOF +-if { (eval echo configure:10258: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10198: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" + else +@@ -10298,12 +10238,12 @@ fi + if test "x$enable_dtrace" = "xyes"; then + ac_safe=`echo "sys/sdt.h" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for sys/sdt.h""... $ac_c" 1>&6 +-echo "configure:10302: checking for sys/sdt.h" >&5 ++echo "configure:10242: checking for sys/sdt.h" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < +@@ -10311,7 +10251,7 @@ int main() { + + ; return 0; } + EOF +-if { (eval echo configure:10315: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10255: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" + else +@@ -10353,12 +10293,12 @@ case $target in + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:10357: checking for $ac_hdr" >&5 ++echo "configure:10297: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < +@@ -10366,7 +10306,7 @@ int main() { + + ; return 0; } + EOF +-if { (eval echo configure:10370: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10310: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" + else +@@ -10418,12 +10358,12 @@ CFLAGS="$CFLAGS $LINUX_HEADERS_INCLUDES" + + ac_safe=`echo "linux/perf_event.h" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for linux/perf_event.h""... $ac_c" 1>&6 +-echo "configure:10422: checking for linux/perf_event.h" >&5 ++echo "configure:10362: checking for linux/perf_event.h" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < +@@ -10431,7 +10371,7 @@ int main() { + + ; return 0; } + EOF +-if { (eval echo configure:10435: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10375: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" + else +@@ -10446,19 +10386,19 @@ fi + if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + echo $ac_n "checking for perf_event_open system call""... $ac_c" 1>&6 +-echo "configure:10450: checking for perf_event_open system call" >&5 ++echo "configure:10390: checking for perf_event_open system call" >&5 + if eval "test \"`echo '$''{'ac_cv_perf_event_open'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + int main() { + return sizeof(__NR_perf_event_open); + ; return 0; } + EOF +-if { (eval echo configure:10462: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10402: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_perf_event_open=yes + else +@@ -10494,7 +10434,7 @@ case $target in + ;; + *) + echo $ac_n "checking for gethostbyname_r in -lc_r""... $ac_c" 1>&6 +-echo "configure:10498: checking for gethostbyname_r in -lc_r" >&5 ++echo "configure:10438: checking for gethostbyname_r in -lc_r" >&5 + ac_lib_var=`echo c_r'_'gethostbyname_r | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -10502,7 +10442,7 @@ else + ac_save_LIBS="$LIBS" + LIBS="-lc_r $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -10554,14 +10494,14 @@ case $target in + *) + + echo $ac_n "checking for library containing dlopen""... $ac_c" 1>&6 +-echo "configure:10558: checking for library containing dlopen" >&5 ++echo "configure:10498: checking for library containing dlopen" >&5 + if eval "test \"`echo '$''{'ac_cv_search_dlopen'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_func_search_save_LIBS="$LIBS" + ac_cv_search_dlopen="no" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10516: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_search_dlopen="none required" + else +@@ -10583,7 +10523,7 @@ rm -f conftest* + test "$ac_cv_search_dlopen" = "no" && for i in dl; do + LIBS="-l$i $ac_func_search_save_LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10538: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_search_dlopen="-l$i" + break +@@ -10612,12 +10552,12 @@ if test "$ac_cv_search_dlopen" != "no"; then + test "$ac_cv_search_dlopen" = "none required" || LIBS="$ac_cv_search_dlopen $LIBS" + ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6 +-echo "configure:10616: checking for dlfcn.h" >&5 ++echo "configure:10556: checking for dlfcn.h" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < +@@ -10625,7 +10565,7 @@ int main() { + + ; return 0; } + EOF +-if { (eval echo configure:10629: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10569: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" + else +@@ -10662,12 +10602,12 @@ CFLAGS="$CFLAGS -D_GNU_SOURCE" + for ac_func in dladdr + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:10666: checking for $ac_func" >&5 ++echo "configure:10606: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10634: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" + else +@@ -10724,7 +10664,7 @@ if test ! "$GNU_CXX"; then + case $target in + *-aix*) + echo $ac_n "checking for demangle in -lC_r""... $ac_c" 1>&6 +-echo "configure:10728: checking for demangle in -lC_r" >&5 ++echo "configure:10668: checking for demangle in -lC_r" >&5 + ac_lib_var=`echo C_r'_'demangle | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -10732,7 +10672,7 @@ else + ac_save_LIBS="$LIBS" + LIBS="-lC_r $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -10776,7 +10716,7 @@ fi + ;; + *) + echo $ac_n "checking for demangle in -lC""... $ac_c" 1>&6 +-echo "configure:10780: checking for demangle in -lC" >&5 ++echo "configure:10720: checking for demangle in -lC" >&5 + ac_lib_var=`echo C'_'demangle | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -10784,7 +10724,7 @@ else + ac_save_LIBS="$LIBS" + LIBS="-lC $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10739: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -10834,7 +10774,7 @@ case $target in + ;; + *) + echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 +-echo "configure:10838: checking for socket in -lsocket" >&5 ++echo "configure:10778: checking for socket in -lsocket" >&5 + ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -10842,7 +10782,7 @@ else + ac_save_LIBS="$LIBS" + LIBS="-lsocket $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10797: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -10892,7 +10832,7 @@ darwin*) + *) + + echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6 +-echo "configure:10896: checking for pthread_create in -lpthreads" >&5 ++echo "configure:10836: checking for pthread_create in -lpthreads" >&5 + echo " + #include + #include +@@ -10915,7 +10855,7 @@ echo " + echo "$ac_t""no" 1>&6 + + echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 +-echo "configure:10919: checking for pthread_create in -lpthread" >&5 ++echo "configure:10859: checking for pthread_create in -lpthread" >&5 + echo " + #include + #include +@@ -10938,7 +10878,7 @@ echo " + echo "$ac_t""no" 1>&6 + + echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 +-echo "configure:10942: checking for pthread_create in -lc_r" >&5 ++echo "configure:10882: checking for pthread_create in -lc_r" >&5 + echo " + #include + #include +@@ -10961,7 +10901,7 @@ echo " + echo "$ac_t""no" 1>&6 + + echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6 +-echo "configure:10965: checking for pthread_create in -lc" >&5 ++echo "configure:10905: checking for pthread_create in -lc" >&5 + echo " + #include + #include +@@ -11020,7 +10960,7 @@ then + rm -f conftest* + ac_cv_have_dash_pthread=no + echo $ac_n "checking whether ${CC-cc} accepts -pthread""... $ac_c" 1>&6 +-echo "configure:11024: checking whether ${CC-cc} accepts -pthread" >&5 ++echo "configure:10964: checking whether ${CC-cc} accepts -pthread" >&5 + echo 'int main() { return 0; }' | cat > conftest.c + ${CC-cc} -pthread -o conftest conftest.c > conftest.out 2>&1 + if test $? -eq 0; then +@@ -11043,7 +10983,7 @@ echo "configure:11024: checking whether ${CC-cc} accepts -pthread" >&5 + ac_cv_have_dash_pthreads=no + if test "$ac_cv_have_dash_pthread" = "no"; then + echo $ac_n "checking whether ${CC-cc} accepts -pthreads""... $ac_c" 1>&6 +-echo "configure:11047: checking whether ${CC-cc} accepts -pthreads" >&5 ++echo "configure:10987: checking whether ${CC-cc} accepts -pthreads" >&5 + echo 'int main() { return 0; }' | cat > conftest.c + ${CC-cc} -pthreads -o conftest conftest.c > conftest.out 2>&1 + if test $? -eq 0; then +@@ -11148,13 +11088,13 @@ fi + + if test $ac_cv_prog_gcc = yes; then + echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 +-echo "configure:11152: checking whether ${CC-cc} needs -traditional" >&5 ++echo "configure:11092: checking whether ${CC-cc} needs -traditional" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_pattern="Autoconf.*'x'" + cat > conftest.$ac_ext < + Autoconf TIOCGETP +@@ -11172,7 +11112,7 @@ rm -f conftest* + + if test $ac_cv_prog_gcc_traditional = no; then + cat > conftest.$ac_ext < + Autoconf TCGETA +@@ -11194,7 +11134,7 @@ echo "$ac_t""$ac_cv_prog_gcc_traditional" 1>&6 + fi + + echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 +-echo "configure:11198: checking for 8-bit clean memcmp" >&5 ++echo "configure:11138: checking for 8-bit clean memcmp" >&5 + if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -11202,7 +11142,7 @@ else + ac_cv_func_memcmp_clean=no + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:11156: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + ac_cv_func_memcmp_clean=yes + else +@@ -11234,12 +11174,12 @@ for ac_func in fchmod flockfile getc_unlocked _getc_nolock getpagesize \ + stat64 statvfs statvfs64 strerror strtok_r truncate64 + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:11238: checking for $ac_func" >&5 ++echo "configure:11178: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:11206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" + else +@@ -11291,14 +11231,14 @@ done + + + cat > conftest.$ac_ext < + int main() { + SYSTEMTIME st;FILETIME ft;SystemTimeToFileTime(&st,&ft); + ; return 0; } + EOF +-if { (eval echo configure:11302: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:11242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_have_systemtimetofiletime="yes" + else +@@ -11318,14 +11258,14 @@ EOF + + fi + cat > conftest.$ac_ext < + int main() { + FILETIME ft;GetSystemTimeAsFileTime(&ft); + ; return 0; } + EOF +-if { (eval echo configure:11329: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:11269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_have_getsystemtimeasfiletime="yes" + else +@@ -11355,19 +11295,19 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes + cross_compiling=$ac_cv_prog_cxx_cross + + echo $ac_n "checking for wcrtomb""... $ac_c" 1>&6 +-echo "configure:11359: checking for wcrtomb" >&5 ++echo "configure:11299: checking for wcrtomb" >&5 + if eval "test \"`echo '$''{'ac_cv_have_wcrtomb'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + int main() { + mbstate_t ps={0};wcrtomb(0,'f',&ps); + ; return 0; } + EOF +-if { (eval echo configure:11371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:11311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_have_wcrtomb="yes" + else +@@ -11390,19 +11330,19 @@ EOF + + fi + echo $ac_n "checking for mbrtowc""... $ac_c" 1>&6 +-echo "configure:11394: checking for mbrtowc" >&5 ++echo "configure:11334: checking for mbrtowc" >&5 + if eval "test \"`echo '$''{'ac_cv_have_mbrtowc'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + int main() { + mbstate_t ps={0};mbrtowc(0,0,0,&ps); + ; return 0; } + EOF +-if { (eval echo configure:11406: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:11346: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_have_mbrtowc="yes" + else +@@ -11434,12 +11374,12 @@ cross_compiling=$ac_cv_prog_cc_cross + fi + + echo $ac_n "checking for res_ninit()""... $ac_c" 1>&6 +-echo "configure:11438: checking for res_ninit()" >&5 ++echo "configure:11378: checking for res_ninit()" >&5 + if eval "test \"`echo '$''{'ac_cv_func_res_ninit'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:11395: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_func_res_ninit=yes + else +@@ -11484,12 +11424,12 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes + cross_compiling=$ac_cv_prog_cxx_cross + + echo $ac_n "checking for gnu_get_libc_version()""... $ac_c" 1>&6 +-echo "configure:11488: checking for gnu_get_libc_version()" >&5 ++echo "configure:11428: checking for gnu_get_libc_version()" >&5 + if eval "test \"`echo '$''{'ac_cv_func_gnu_get_libc_version'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:11444: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_func_gnu_get_libc_version=yes + else +@@ -11534,7 +11474,7 @@ cross_compiling=$ac_cv_prog_cc_cross + + + echo $ac_n "checking for an implementation of va_copy()""... $ac_c" 1>&6 +-echo "configure:11538: checking for an implementation of va_copy()" >&5 ++echo "configure:11478: checking for an implementation of va_copy()" >&5 + if eval "test \"`echo '$''{'ac_cv_va_copy'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -11544,7 +11484,7 @@ else + + else + cat > conftest.$ac_ext < +@@ -11558,7 +11498,7 @@ else + } + int main() { f (0, 42); return 0; } + EOF +-if { (eval echo configure:11562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:11502: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + ac_cv_va_copy=yes + else +@@ -11575,7 +11515,7 @@ fi + + echo "$ac_t""$ac_cv_va_copy" 1>&6 + echo $ac_n "checking for an implementation of __va_copy()""... $ac_c" 1>&6 +-echo "configure:11579: checking for an implementation of __va_copy()" >&5 ++echo "configure:11519: checking for an implementation of __va_copy()" >&5 + if eval "test \"`echo '$''{'ac_cv___va_copy'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -11585,7 +11525,7 @@ else + + else + cat > conftest.$ac_ext < +@@ -11599,7 +11539,7 @@ else + } + int main() { f (0, 42); return 0; } + EOF +-if { (eval echo configure:11603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:11543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + ac_cv___va_copy=yes + else +@@ -11616,7 +11556,7 @@ fi + + echo "$ac_t""$ac_cv___va_copy" 1>&6 + echo $ac_n "checking whether va_lists can be copied by value""... $ac_c" 1>&6 +-echo "configure:11620: checking whether va_lists can be copied by value" >&5 ++echo "configure:11560: checking whether va_lists can be copied by value" >&5 + if eval "test \"`echo '$''{'ac_cv_va_val_copy'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -11626,7 +11566,7 @@ else + + else + cat > conftest.$ac_ext < +@@ -11640,7 +11580,7 @@ else + } + int main() { f (0, 42); return 0; } + EOF +-if { (eval echo configure:11644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:11584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + ac_cv_va_val_copy=yes + else +@@ -11710,12 +11650,12 @@ ARM_ABI_PREFIX= + if test "$GNU_CC"; then + if test "$CPU_ARCH" = "arm" ; then + echo $ac_n "checking for ARM EABI""... $ac_c" 1>&6 +-echo "configure:11714: checking for ARM EABI" >&5 ++echo "configure:11654: checking for ARM EABI" >&5 + if eval "test \"`echo '$''{'ac_cv_gcc_arm_eabi'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11672: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_gcc_arm_eabi="yes" + else +@@ -11753,12 +11693,12 @@ echo "$ac_t""$ac_cv_gcc_arm_eabi" 1>&6 + fi + + echo $ac_n "checking for modern C++ template specialization syntax support""... $ac_c" 1>&6 +-echo "configure:11757: checking for modern C++ template specialization syntax support" >&5 ++echo "configure:11697: checking for modern C++ template specialization syntax support" >&5 + if eval "test \"`echo '$''{'ac_cv_cpp_modern_specialize_template_syntax'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < struct X { int a; }; + class Y {}; +@@ -11768,7 +11708,7 @@ X int_x; + X y_x; + ; return 0; } + EOF +-if { (eval echo configure:11772: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11712: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cpp_modern_specialize_template_syntax=yes + else +@@ -11786,12 +11726,12 @@ if test "$ac_cv_cpp_modern_specialize_template_syntax" = no ; then + fi + + echo $ac_n "checking whether partial template specialization works""... $ac_c" 1>&6 +-echo "configure:11790: checking whether partial template specialization works" >&5 ++echo "configure:11730: checking whether partial template specialization works" >&5 + if eval "test \"`echo '$''{'ac_cv_cpp_partial_specialization'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < class Foo {}; + template class Foo {}; +@@ -11799,7 +11739,7 @@ int main() { + return 0; + ; return 0; } + EOF +-if { (eval echo configure:11803: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11743: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cpp_partial_specialization=yes + else +@@ -11823,12 +11763,12 @@ EOF + fi + + echo $ac_n "checking whether the C++ \"using\" keyword resolves ambiguity""... $ac_c" 1>&6 +-echo "configure:11827: checking whether the C++ \"using\" keyword resolves ambiguity" >&5 ++echo "configure:11767: checking whether the C++ \"using\" keyword resolves ambiguity" >&5 + if eval "test \"`echo '$''{'ac_cv_cpp_ambiguity_resolving_using'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11788: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cpp_ambiguity_resolving_using=yes + else +@@ -11868,7 +11808,7 @@ EOF + fi + + echo $ac_n "checking for C++ dynamic_cast to void*""... $ac_c" 1>&6 +-echo "configure:11872: checking for C++ dynamic_cast to void*" >&5 ++echo "configure:11812: checking for C++ dynamic_cast to void*" >&5 + if eval "test \"`echo '$''{'ac_cv_cpp_dynamic_cast_void_ptr'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -11876,7 +11816,7 @@ else + ac_cv_cpp_dynamic_cast_void_ptr=no + else + cat > conftest.$ac_ext <(suby)))); + } + EOF +-if { (eval echo configure:11896: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:11836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + ac_cv_cpp_dynamic_cast_void_ptr=yes + else +@@ -11919,19 +11859,19 @@ fi + + + echo $ac_n "checking whether C++ requires implementation of unused virtual methods""... $ac_c" 1>&6 +-echo "configure:11923: checking whether C++ requires implementation of unused virtual methods" >&5 ++echo "configure:11863: checking whether C++ requires implementation of unused virtual methods" >&5 + if eval "test \"`echo '$''{'ac_cv_cpp_unused_required'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:11875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_cpp_unused_required=no + else +@@ -11957,12 +11897,12 @@ fi + + + echo $ac_n "checking for trouble comparing to zero near std::operator!=()""... $ac_c" 1>&6 +-echo "configure:11961: checking for trouble comparing to zero near std::operator!=()" >&5 ++echo "configure:11901: checking for trouble comparing to zero near std::operator!=()" >&5 + if eval "test \"`echo '$''{'ac_cv_trouble_comparing_to_zero'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + template class Foo {}; +@@ -11973,7 +11913,7 @@ int main() { + Foo f; return (0 != f); + ; return 0; } + EOF +-if { (eval echo configure:11977: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11917: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_trouble_comparing_to_zero=no + else +@@ -12003,19 +11943,19 @@ fi + _SAVE_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS $DSO_PIC_CFLAGS $DSO_LDOPTS $MOZ_OPTIMIZE_LDFLAGS" + echo $ac_n "checking for __thread keyword for TLS variables""... $ac_c" 1>&6 +-echo "configure:12007: checking for __thread keyword for TLS variables" >&5 ++echo "configure:11947: checking for __thread keyword for TLS variables" >&5 + if eval "test \"`echo '$''{'ac_cv_thread_keyword'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:11959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_thread_keyword=yes + else +@@ -12055,12 +11995,12 @@ fi + MALLOC_H= + ac_safe=`echo "malloc.h" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for malloc.h""... $ac_c" 1>&6 +-echo "configure:12059: checking for malloc.h" >&5 ++echo "configure:11999: checking for malloc.h" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < +@@ -12068,7 +12008,7 @@ int main() { + + ; return 0; } + EOF +-if { (eval echo configure:12072: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:12012: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" + else +@@ -12091,12 +12031,12 @@ fi + if test "$MALLOC_H" = ""; then + ac_safe=`echo "malloc/malloc.h" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for malloc/malloc.h""... $ac_c" 1>&6 +-echo "configure:12095: checking for malloc/malloc.h" >&5 ++echo "configure:12035: checking for malloc/malloc.h" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < +@@ -12104,7 +12044,7 @@ int main() { + + ; return 0; } + EOF +-if { (eval echo configure:12108: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:12048: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" + else +@@ -12127,12 +12067,12 @@ fi + if test "$MALLOC_H" = ""; then + ac_safe=`echo "sys/malloc.h" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for sys/malloc.h""... $ac_c" 1>&6 +-echo "configure:12131: checking for sys/malloc.h" >&5 ++echo "configure:12071: checking for sys/malloc.h" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < +@@ -12140,7 +12080,7 @@ int main() { + + ; return 0; } + EOF +-if { (eval echo configure:12144: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:12084: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" + else +@@ -12176,12 +12116,12 @@ MOZ_ALLOCATING_FUNCS="strndup posix_memalign memalign valloc" + for ac_func in strndup posix_memalign memalign valloc + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:12180: checking for $ac_func" >&5 ++echo "configure:12120: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:12151: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" + else +@@ -12237,19 +12177,19 @@ done + + + echo $ac_n "checking for __attribute__((always_inline))""... $ac_c" 1>&6 +-echo "configure:12241: checking for __attribute__((always_inline))" >&5 ++echo "configure:12181: checking for __attribute__((always_inline))" >&5 + if eval "test \"`echo '$''{'ac_cv_attribute_always_inline'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:12193: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_attribute_always_inline=yes + else +@@ -12264,19 +12204,19 @@ fi + echo "$ac_t""$ac_cv_attribute_always_inline" 1>&6 + + echo $ac_n "checking for __attribute__((malloc))""... $ac_c" 1>&6 +-echo "configure:12268: checking for __attribute__((malloc))" >&5 ++echo "configure:12208: checking for __attribute__((malloc))" >&5 + if eval "test \"`echo '$''{'ac_cv_attribute_malloc'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:12220: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_attribute_malloc=yes + else +@@ -12291,19 +12231,19 @@ fi + echo "$ac_t""$ac_cv_attribute_malloc" 1>&6 + + echo $ac_n "checking for __attribute__((warn_unused_result))""... $ac_c" 1>&6 +-echo "configure:12295: checking for __attribute__((warn_unused_result))" >&5 ++echo "configure:12235: checking for __attribute__((warn_unused_result))" >&5 + if eval "test \"`echo '$''{'ac_cv_attribute_warn_unused'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:12247: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_attribute_warn_unused=yes + else +@@ -12327,19 +12267,19 @@ cross_compiling=$ac_cv_prog_cc_cross + + + echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 +-echo "configure:12331: checking for LC_MESSAGES" >&5 ++echo "configure:12271: checking for LC_MESSAGES" >&5 + if eval "test \"`echo '$''{'ac_cv_i18n_lc_messages'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + int main() { + int category = LC_MESSAGES; + ; return 0; } + EOF +-if { (eval echo configure:12343: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:12283: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_i18n_lc_messages=yes + else +@@ -12365,12 +12305,12 @@ fi + for ac_func in localeconv + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:12369: checking for $ac_func" >&5 ++echo "configure:12309: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:12337: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" + else +@@ -12580,7 +12520,7 @@ fi + # Extract the first word of "nspr-config", so it can be a program name with args. + set dummy nspr-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:12584: checking for $ac_word" >&5 ++echo "configure:12524: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_NSPR_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -12615,7 +12555,7 @@ fi + + min_nspr_version=$NSPR_MINVER + echo $ac_n "checking for NSPR - version >= $min_nspr_version""... $ac_c" 1>&6 +-echo "configure:12619: checking for NSPR - version >= $min_nspr_version" >&5 ++echo "configure:12559: checking for NSPR - version >= $min_nspr_version" >&5 + + no_nspr="" + if test "$NSPR_CONFIG" != "no"; then +@@ -12678,7 +12618,7 @@ if test -n "$MOZ_NATIVE_NSPR"; then + _SAVE_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS $NSPR_CFLAGS" + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:12631: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + MOZ_NATIVE_NSPR=1 + else +@@ -12729,7 +12669,7 @@ if test -z "$MOZ_ZLIB_LIBS$MOZ_ZLIB_CFLAGS$SKIP_LIBRARY_CHECKS"; then + MOZ_NATIVE_ZLIB= + else + echo $ac_n "checking for gzread in -lz""... $ac_c" 1>&6 +-echo "configure:12733: checking for gzread in -lz" >&5 ++echo "configure:12673: checking for gzread in -lz" >&5 + ac_lib_var=`echo z'_'gzread | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -12737,7 +12677,7 @@ else + ac_save_LIBS="$LIBS" + LIBS="-lz $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:12692: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -12772,7 +12712,7 @@ fi + if test "$MOZ_NATIVE_ZLIB" = 1; then + MOZZLIBNUM=`echo $MOZZLIB | awk -F. '{printf "0x%x\n", ((($1 * 16 + $2) * 16) + $3) * 16 + $4}'` + cat > conftest.$ac_ext < + #include +@@ -12783,7 +12723,7 @@ int main() { + #endif + ; return 0; } + EOF +-if { (eval echo configure:12787: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:12727: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + MOZ_NATIVE_ZLIB=1 + else +@@ -12829,7 +12769,7 @@ if test -n "$MOZ_NATIVE_FFI"; then + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:12833: checking for $ac_word" >&5 ++echo "configure:12773: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -12873,19 +12813,19 @@ fi + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for libffi > 3.0.9""... $ac_c" 1>&6 +-echo "configure:12877: checking for libffi > 3.0.9" >&5 ++echo "configure:12817: checking for libffi > 3.0.9" >&5 + + if $PKG_CONFIG --exists "libffi > 3.0.9" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking MOZ_FFI_CFLAGS""... $ac_c" 1>&6 +-echo "configure:12884: checking MOZ_FFI_CFLAGS" >&5 ++echo "configure:12824: checking MOZ_FFI_CFLAGS" >&5 + MOZ_FFI_CFLAGS=`$PKG_CONFIG --cflags "libffi > 3.0.9"` + echo "$ac_t""$MOZ_FFI_CFLAGS" 1>&6 + + echo $ac_n "checking MOZ_FFI_LIBS""... $ac_c" 1>&6 +-echo "configure:12889: checking MOZ_FFI_LIBS" >&5 ++echo "configure:12829: checking MOZ_FFI_LIBS" >&5 + ## Remove evil flags like -Wl,--export-dynamic + MOZ_FFI_LIBS="`$PKG_CONFIG --libs \"libffi > 3.0.9\" |sed s/-Wl,--export-dynamic//g`" + echo "$ac_t""$MOZ_FFI_LIBS" 1>&6 +@@ -12921,7 +12861,7 @@ echo "configure:12889: checking MOZ_FFI_LIBS" >&5 + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:12925: checking for $ac_word" >&5 ++echo "configure:12865: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -12965,19 +12905,19 @@ fi + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for libffi >= 3.0.9""... $ac_c" 1>&6 +-echo "configure:12969: checking for libffi >= 3.0.9" >&5 ++echo "configure:12909: checking for libffi >= 3.0.9" >&5 + + if $PKG_CONFIG --exists "libffi >= 3.0.9" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking MOZ_FFI_CFLAGS""... $ac_c" 1>&6 +-echo "configure:12976: checking MOZ_FFI_CFLAGS" >&5 ++echo "configure:12916: checking MOZ_FFI_CFLAGS" >&5 + MOZ_FFI_CFLAGS=`$PKG_CONFIG --cflags "libffi >= 3.0.9"` + echo "$ac_t""$MOZ_FFI_CFLAGS" 1>&6 + + echo $ac_n "checking MOZ_FFI_LIBS""... $ac_c" 1>&6 +-echo "configure:12981: checking MOZ_FFI_LIBS" >&5 ++echo "configure:12921: checking MOZ_FFI_LIBS" >&5 + ## Remove evil flags like -Wl,--export-dynamic + MOZ_FFI_LIBS="`$PKG_CONFIG --libs \"libffi >= 3.0.9\" |sed s/-Wl,--export-dynamic//g`" + echo "$ac_t""$MOZ_FFI_LIBS" 1>&6 +@@ -13112,18 +13052,18 @@ MOZ_DEBUG_DISABLE_DEFS="-DNDEBUG -DTRIMMED" + + if test -n "$MOZ_DEBUG"; then + echo $ac_n "checking for valid debug flags""... $ac_c" 1>&6 +-echo "configure:13116: checking for valid debug flags" >&5 ++echo "configure:13056: checking for valid debug flags" >&5 + _SAVE_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS $MOZ_DEBUG_FLAGS" + cat > conftest.$ac_ext < + int main() { + printf("Hello World\n"); + ; return 0; } + EOF +-if { (eval echo configure:13127: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:13067: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + _results=yes + else +@@ -13201,18 +13141,18 @@ fi + if test "$COMPILE_ENVIRONMENT"; then + if test -n "$MOZ_OPTIMIZE"; then + echo $ac_n "checking for valid optimization flags""... $ac_c" 1>&6 +-echo "configure:13205: checking for valid optimization flags" >&5 ++echo "configure:13145: checking for valid optimization flags" >&5 + _SAVE_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS $MOZ_OPTIMIZE_FLAGS" + cat > conftest.$ac_ext < + int main() { + printf("Hello World\n"); + ; return 0; } + EOF +-if { (eval echo configure:13216: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:13156: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + _results=yes + else +@@ -13364,7 +13304,7 @@ EOF + fi + else + echo $ac_n "checking size of int *""... $ac_c" 1>&6 +-echo "configure:13368: checking size of int *" >&5 ++echo "configure:13308: checking size of int *" >&5 + if eval "test \"`echo '$''{'ac_cv_sizeof_int_p'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -13372,7 +13312,7 @@ else + ac_cv_sizeof_int_p=4 + else + cat > conftest.$ac_ext < + int main() +@@ -13383,7 +13323,7 @@ int main() + return(0); + } + EOF +-if { (eval echo configure:13387: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:13327: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + ac_cv_sizeof_int_p=`cat conftestval` + else +@@ -13687,12 +13627,12 @@ fi + if test -n "$MOZ_VALGRIND"; then + ac_safe=`echo "valgrind/valgrind.h" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for valgrind/valgrind.h""... $ac_c" 1>&6 +-echo "configure:13691: checking for valgrind/valgrind.h" >&5 ++echo "configure:13631: checking for valgrind/valgrind.h" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < +@@ -13700,7 +13640,7 @@ int main() { + + ; return 0; } + EOF +-if { (eval echo configure:13704: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:13644: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" + else +@@ -13973,7 +13913,7 @@ do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:13977: checking for $ac_word" >&5 ++echo "configure:13917: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_CCACHE'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -14099,12 +14039,12 @@ cross_compiling=$ac_cv_prog_cxx_cross + for ac_func in __cxa_demangle + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:14103: checking for $ac_func" >&5 ++echo "configure:14043: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:14074: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" + else +@@ -14184,12 +14124,12 @@ fi + if test -z "$SKIP_LIBRARY_CHECKS"; then + ac_safe=`echo "unwind.h" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for unwind.h""... $ac_c" 1>&6 +-echo "configure:14188: checking for unwind.h" >&5 ++echo "configure:14128: checking for unwind.h" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < +@@ -14197,7 +14137,7 @@ int main() { + + ; return 0; } + EOF +-if { (eval echo configure:14201: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:14141: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" + else +@@ -14214,12 +14154,12 @@ fi + for ac_func in _Unwind_Backtrace + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:14218: checking for $ac_func" >&5 ++echo "configure:14158: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:14186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" + else +@@ -14334,7 +14274,7 @@ if test -z "$SKIP_COMPILER_CHECKS"; then + # Compiler Options + + echo $ac_n "checking for -pipe support""... $ac_c" 1>&6 +-echo "configure:14338: checking for -pipe support" >&5 ++echo "configure:14278: checking for -pipe support" >&5 + if test -n "$GNU_CC" -a -n "$GNU_CXX"; then + CFLAGS="$CFLAGS -pipe" + CXXFLAGS="$CXXFLAGS -pipe" +@@ -14348,16 +14288,16 @@ _SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -fprofile-generate -fprofile-correction" + + echo $ac_n "checking whether C compiler supports -fprofile-generate""... $ac_c" 1>&6 +-echo "configure:14352: checking whether C compiler supports -fprofile-generate" >&5 ++echo "configure:14292: checking whether C compiler supports -fprofile-generate" >&5 + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:14301: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + PROFILE_GEN_CFLAGS="-fprofile-generate" + result="yes" +@@ -14421,16 +14361,16 @@ if test "$_PEDANTIC"; then + _SAVE_CXXFLAGS=$CXXFLAGS + CXXFLAGS="$CXXFLAGS -pedantic ${_WARNINGS_CXXFLAGS} -Wno-long-long" + echo $ac_n "checking whether C++ compiler has -pedantic long long bug""... $ac_c" 1>&6 +-echo "configure:14425: checking whether C++ compiler has -pedantic long long bug" >&5 ++echo "configure:14365: checking whether C++ compiler has -pedantic long long bug" >&5 + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:14374: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + result="no" + else +@@ -14457,12 +14397,12 @@ fi + _SAVE_CXXFLAGS=$CXXFLAGS + CXXFLAGS="$CXXFLAGS ${_WARNINGS_CXXFLAGS}" + echo $ac_n "checking for correct overload resolution with const and templates""... $ac_c" 1>&6 +-echo "configure:14461: checking for correct overload resolution with const and templates" >&5 ++echo "configure:14401: checking for correct overload resolution with const and templates" >&5 + if eval "test \"`echo '$''{'ac_nscap_nonconst_opeq_bug'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < +@@ -14492,7 +14432,7 @@ int main() { + + ; return 0; } + EOF +-if { (eval echo configure:14496: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:14436: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_nscap_nonconst_opeq_bug="no" + else +@@ -14518,19 +14458,19 @@ EOF + fi + + echo $ac_n "checking for tm_zone tm_gmtoff in struct tm""... $ac_c" 1>&6 +-echo "configure:14522: checking for tm_zone tm_gmtoff in struct tm" >&5 ++echo "configure:14462: checking for tm_zone tm_gmtoff in struct tm" >&5 + if eval "test \"`echo '$''{'ac_cv_struct_tm_zone_tm_gmtoff'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + int main() { + struct tm tm; tm.tm_zone = 0; tm.tm_gmtoff = 1; + ; return 0; } + EOF +-if { (eval echo configure:14534: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:14474: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_struct_tm_zone_tm_gmtoff="yes" + else +@@ -14572,18 +14512,18 @@ cross_compiling=$ac_cv_prog_cc_cross + + + echo $ac_n "checking what kind of list files are supported by the linker""... $ac_c" 1>&6 +-echo "configure:14576: checking what kind of list files are supported by the linker" >&5 ++echo "configure:14516: checking what kind of list files are supported by the linker" >&5 + if eval "test \"`echo '$''{'EXPAND_LIBS_LIST_STYLE'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + echo "int main() {return 0;}" > conftest.${ac_ext} +- if { ac_try='${CC-cc} -o conftest.${OBJ_SUFFIX} -c $CFLAGS $CPPFLAGS conftest.${ac_ext} 1>&5'; { (eval echo configure:14581: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest.${OBJ_SUFFIX}; then ++ if { ac_try='${CC-cc} -o conftest.${OBJ_SUFFIX} -c $CFLAGS $CPPFLAGS conftest.${ac_ext} 1>&5'; { (eval echo configure:14521: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest.${OBJ_SUFFIX}; then + echo "INPUT(conftest.${OBJ_SUFFIX})" > conftest.list +- if { ac_try='${CC-cc} -o conftest${ac_exeext} $LDFLAGS conftest.list $LIBS 1>&5'; { (eval echo configure:14583: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest${ac_exeext}; then ++ if { ac_try='${CC-cc} -o conftest${ac_exeext} $LDFLAGS conftest.list $LIBS 1>&5'; { (eval echo configure:14523: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest${ac_exeext}; then + EXPAND_LIBS_LIST_STYLE=linkerscript + else + echo "conftest.${OBJ_SUFFIX}" > conftest.list +- if { ac_try='${CC-cc} -o conftest${ac_exeext} $LDFLAGS @conftest.list $LIBS 1>&5'; { (eval echo configure:14587: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest${ac_exeext}; then ++ if { ac_try='${CC-cc} -o conftest${ac_exeext} $LDFLAGS @conftest.list $LIBS 1>&5'; { (eval echo configure:14527: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest${ac_exeext}; then + EXPAND_LIBS_LIST_STYLE=list + else + EXPAND_LIBS_LIST_STYLE=none +@@ -14603,7 +14543,7 @@ LIBS_DESC_SUFFIX=desc + + if test "$GCC_USE_GNU_LD"; then + echo $ac_n "checking what kind of ordering can be done with the linker""... $ac_c" 1>&6 +-echo "configure:14607: checking what kind of ordering can be done with the linker" >&5 ++echo "configure:14547: checking what kind of ordering can be done with the linker" >&5 + if eval "test \"`echo '$''{'EXPAND_LIBS_ORDER_STYLE'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -14611,14 +14551,14 @@ else + _SAVE_LDFLAGS="$LDFLAGS" + LDFLAGS="${LDFLAGS} -Wl,--section-ordering-file,conftest.order" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:14562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + EXPAND_LIBS_ORDER_STYLE=section-ordering-file + else +@@ -14630,7 +14570,7 @@ fi + rm -f conftest* + LDFLAGS="$_SAVE_LDFLAGS" + if test -z "$EXPAND_LIBS_ORDER_STYLE"; then +- if { ac_try='${CC-cc} ${DSO_LDOPTS} ${LDFLAGS} -o ${DLL_PREFIX}conftest${DLL_SUFFIX} -Wl'; { (eval echo configure:14634: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then ++ if { ac_try='${CC-cc} ${DSO_LDOPTS} ${LDFLAGS} -o ${DLL_PREFIX}conftest${DLL_SUFFIX} -Wl'; { (eval echo configure:14574: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then + EXPAND_LIBS_ORDER_STYLE=linkerscript + else + EXPAND_LIBS_ORDER_STYLE=none +@@ -14741,7 +14681,7 @@ esac + if test -z "$SKIP_LIBRARY_CHECKS" -a -z "$NO_EDITLINE"; then + if test -n "$JS_WANT_READLINE"; then + echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6 +-echo "configure:14745: checking for readline in -lreadline" >&5 ++echo "configure:14685: checking for readline in -lreadline" >&5 + ac_lib_var=`echo readline'_'readline | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -14749,7 +14689,7 @@ else + ac_save_LIBS="$LIBS" + LIBS="-lreadline $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:14704: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -14990,9 +14930,9 @@ EOF + + + echo $ac_n "checking for posix_fallocate""... $ac_c" 1>&6 +-echo "configure:14994: checking for posix_fallocate" >&5 ++echo "configure:14934: checking for posix_fallocate" >&5 + cat > conftest.$ac_ext < +@@ -15000,7 +14940,7 @@ int main() { + posix_fallocate(0, 0, 0); + ; return 0; } + EOF +-if { (eval echo configure:15004: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:14944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv___posix_fallocate=true + else +@@ -15029,7 +14969,7 @@ if test "$MOZ_X11"; then + _SAVE_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS $XCFLAGS" + cat > conftest.$ac_ext < +@@ -15047,7 +14987,7 @@ int main() { + + ; return 0; } + EOF +-if { (eval echo configure:15051: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:14991: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + : + else + echo "configure: failed program was:" >&5 +@@ -15162,12 +15102,12 @@ fi + for ac_func in setlocale + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:15166: checking for $ac_func" >&5 ++echo "configure:15106: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:15134: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" + else +@@ -15220,12 +15160,12 @@ done + for ac_func in localeconv + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:15224: checking for $ac_func" >&5 ++echo "configure:15164: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:15192: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" + else +-- +1.9.3 + diff --git a/meta-citadel/recipes-desktop/mozjs/mozjs/0002-Move-JS_BYTES_PER_WORD-out-of-config.h.patch b/meta-citadel/recipes-desktop/mozjs/mozjs/0002-Move-JS_BYTES_PER_WORD-out-of-config.h.patch new file mode 100644 index 0000000..6aeb2f6 --- /dev/null +++ b/meta-citadel/recipes-desktop/mozjs/mozjs/0002-Move-JS_BYTES_PER_WORD-out-of-config.h.patch @@ -0,0 +1,75 @@ +From d4a15ad82292ff6d772dcc631df98754d20be31b Mon Sep 17 00:00:00 2001 +From: Colin Walters +Date: Tue, 18 Mar 2014 11:46:05 -0400 +Subject: [PATCH 2/5] Move JS_BYTES_PER_WORD out of config.h + +Instead define it in terms of the already extant GNU C extension +__SIZEOF_POINTER__. This avoids multiarch conflicts when 32 and 64 +bit packages of js are co-installed. +--- + +Upstream-status: Pending + + js/src/configure.in | 9 --------- + js/src/js-config.h.in | 1 - + js/src/jstypes.h | 12 ++++++++++++ + 3 files changed, 12 insertions(+), 10 deletions(-) + +diff --git a/js/src/configure.in b/js/src/configure.in +index 15605b2..64c7606 100644 +--- a/js/src/configure.in ++++ b/js/src/configure.in +@@ -2345,15 +2345,6 @@ else + AC_MSG_RESULT(no) + fi + +-MOZ_SIZE_OF_TYPE(JS_BYTES_PER_WORD, void*, 4 8) +-if test "$moz_cv_size_of_JS_BYTES_PER_WORD" -eq "4"; then +- AC_DEFINE(JS_BITS_PER_WORD_LOG2, 5) +-elif test "$moz_cv_size_of_JS_BYTES_PER_WORD" -eq "8"; then +- AC_DEFINE(JS_BITS_PER_WORD_LOG2, 6) +-else +- AC_MSG_ERROR([Unexpected JS_BYTES_PER_WORD]) +-fi +- + MOZ_ALIGN_OF_TYPE(JS_ALIGN_OF_POINTER, void*, 2 4 8 16) + MOZ_SIZE_OF_TYPE(JS_BYTES_PER_DOUBLE, double, 6 8 10 12 14) + +diff --git a/js/src/js-config.h.in b/js/src/js-config.h.in +index 6889e00..4775420 100644 +--- a/js/src/js-config.h.in ++++ b/js/src/js-config.h.in +@@ -56,7 +56,6 @@ + #undef JS_INT32_TYPE + #undef JS_INT64_TYPE + #undef JS_INTPTR_TYPE +-#undef JS_BYTES_PER_WORD + + /* Some mozilla code uses JS-friend APIs that depend on JS_METHODJIT being + correct. */ +diff --git a/js/src/jstypes.h b/js/src/jstypes.h +index d0cf183..3e7928f 100644 +--- a/js/src/jstypes.h ++++ b/js/src/jstypes.h +@@ -24,6 +24,18 @@ + #include "mozilla/Util.h" + + #include "js-config.h" ++#ifndef JS_BYTES_PER_WORD ++#define JS_BYTES_PER_WORD __SIZEOF_POINTER__ ++#endif ++#ifndef JS_BITS_PER_WORD_LOG2 ++#if JS_BYTES_PER_WORD == 8 ++#define JS_BITS_PER_WORD_LOG2 6 ++#elif JS_BYTES_PER_WORD == 4 ++#define JS_BITS_PER_WORD_LOG2 5 ++#else ++#error Unhandled JS_BYTES_PER_WORD ++#endif ++#endif + + /*********************************************************************** + ** MACROS: JS_EXTERN_API +-- +1.9.3 + diff --git a/meta-citadel/recipes-desktop/mozjs/mozjs/0003-Add-AArch64-support.patch b/meta-citadel/recipes-desktop/mozjs/mozjs/0003-Add-AArch64-support.patch new file mode 100644 index 0000000..6e72429 --- /dev/null +++ b/meta-citadel/recipes-desktop/mozjs/mozjs/0003-Add-AArch64-support.patch @@ -0,0 +1,76 @@ +From 15e710e331d36eb279852b5cd1ba37a9a6005217 Mon Sep 17 00:00:00 2001 +From: Koen Kooi +Date: Mon, 2 Mar 2015 19:08:22 +0800 +Subject: [PATCH 3/5] Add AArch64 support + +--- +Upstream-status: Pending + + js/src/assembler/jit/ExecutableAllocator.h | 6 ++++++ + js/src/assembler/wtf/Platform.h | 4 ++++ + js/src/configure.in | 4 ++++ + mfbt/double-conversion/utils.h | 1 + + 4 files changed, 15 insertions(+) + +diff --git a/js/src/assembler/jit/ExecutableAllocator.h b/js/src/assembler/jit/ExecutableAllocator.h +index c071c33..90764c3 100644 +--- a/js/src/assembler/jit/ExecutableAllocator.h ++++ b/js/src/assembler/jit/ExecutableAllocator.h +@@ -382,6 +382,12 @@ public: + { + reprotectRegion(start, size, Executable); + } ++#elif WTF_CPU_AARCH64 && WTF_PLATFORM_LINUX ++ static void cacheFlush(void* code, size_t size) ++ { ++ intptr_t end = reinterpret_cast(code) + size; ++ __builtin___clear_cache(reinterpret_cast(code), reinterpret_cast(end)); ++ } + #else + static void makeWritable(void*, size_t) {} + static void makeExecutable(void*, size_t) {} +diff --git a/js/src/assembler/wtf/Platform.h b/js/src/assembler/wtf/Platform.h +index 0c84896..e8763a7 100644 +--- a/js/src/assembler/wtf/Platform.h ++++ b/js/src/assembler/wtf/Platform.h +@@ -325,6 +325,10 @@ + #define WTF_THUMB_ARCH_VERSION 0 + #endif + ++/* CPU(AArch64) - 64-bit ARM */ ++#if defined(__aarch64__) ++#define WTF_CPU_AARCH64 1 ++#endif + + /* WTF_CPU_ARMV5_OR_LOWER - ARM instruction set v5 or earlier */ + /* On ARMv5 and below the natural alignment is required. +diff --git a/js/src/configure.in b/js/src/configure.in +index 64c7606..0673aca 100644 +--- a/js/src/configure.in ++++ b/js/src/configure.in +@@ -1121,6 +1121,10 @@ arm*) + CPU_ARCH=arm + ;; + ++aarch64) ++ CPU_ARCH=aarch64 ++ ;; ++ + mips|mipsel) + CPU_ARCH="mips" + ;; +diff --git a/mfbt/double-conversion/utils.h b/mfbt/double-conversion/utils.h +index 0eec2d9..fe26dab 100644 +--- a/mfbt/double-conversion/utils.h ++++ b/mfbt/double-conversion/utils.h +@@ -58,6 +58,7 @@ + defined(__mips__) || defined(__powerpc__) || \ + defined(__sparc__) || defined(__sparc) || defined(__s390__) || \ + defined(__SH4__) || defined(__alpha__) || \ ++ defined(__aarch64__) || \ + defined(_MIPS_ARCH_MIPS32R2) + #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 + #elif defined(_M_IX86) || defined(__i386__) || defined(__i386) +-- +1.9.3 + diff --git a/meta-citadel/recipes-desktop/mozjs/mozjs/0004-mozbug746112-no-decommit-on-large-pages.patch b/meta-citadel/recipes-desktop/mozjs/mozjs/0004-mozbug746112-no-decommit-on-large-pages.patch new file mode 100644 index 0000000..8bd35d4 --- /dev/null +++ b/meta-citadel/recipes-desktop/mozjs/mozjs/0004-mozbug746112-no-decommit-on-large-pages.patch @@ -0,0 +1,103 @@ +From 0128c5a9eeee0d3fc0deb9129dd20eb79338c8f4 Mon Sep 17 00:00:00 2001 +From: Koen Kooi +Date: Mon, 2 Mar 2015 19:08:59 +0800 +Subject: [PATCH 4/5] mozbug746112-no-decommit-on-large-pages + +--- +Upstream-status: Pending + + js/src/gc/Heap.h | 15 ++++++++++----- + js/src/jsgc.cpp | 15 ++++++++++++--- + 2 files changed, 22 insertions(+), 8 deletions(-) + +diff --git a/js/src/gc/Heap.h b/js/src/gc/Heap.h +index b8f8c78..1cfd269 100644 +--- a/js/src/gc/Heap.h ++++ b/js/src/gc/Heap.h +@@ -103,26 +103,31 @@ struct Cell + }; + + /* +- * Page size is 4096 by default, except for SPARC, where it is 8192. ++ * Page size must be static to support our arena pointer optimizations, so we ++ * are forced to support each platform with non-4096 pages as a special case. ++ * Note: The freelist supports a maximum arena shift of 15. + * Note: Do not use JS_CPU_SPARC here, this header is used outside JS. + * Bug 692267: Move page size definition to gc/Memory.h and include it + * directly once jsgc.h is no longer an installed header. + */ + #if defined(SOLARIS) && (defined(__sparc) || defined(__sparcv9)) + const size_t PageShift = 13; ++const size_t ArenaShift = PageShift; ++#elif defined(__powerpc__) ++const size_t PageShift = 16; ++const size_t ArenaShift = 12; + #else + const size_t PageShift = 12; ++const size_t ArenaShift = PageShift; + #endif + const size_t PageSize = size_t(1) << PageShift; ++const size_t ArenaSize = size_t(1) << ArenaShift; ++const size_t ArenaMask = ArenaSize - 1; + + const size_t ChunkShift = 20; + const size_t ChunkSize = size_t(1) << ChunkShift; + const size_t ChunkMask = ChunkSize - 1; + +-const size_t ArenaShift = PageShift; +-const size_t ArenaSize = PageSize; +-const size_t ArenaMask = ArenaSize - 1; +- + /* + * This is the maximum number of arenas we allow in the FreeCommitted state + * before we trigger a GC_SHRINK to release free arenas to the OS. +diff --git a/js/src/jsgc.cpp b/js/src/jsgc.cpp +index b3caf05..a258d2d 100644 +--- a/js/src/jsgc.cpp ++++ b/js/src/jsgc.cpp +@@ -251,6 +251,13 @@ static const int BackgroundPhaseLength[] = { + sizeof(BackgroundPhaseStrings) / sizeof(AllocKind) + }; + ++/* Unused memory decommiting requires the arena size match the page size. */ ++static bool ++DecommitEnabled() ++{ ++ return PageSize == ArenaSize; ++} ++ + #ifdef DEBUG + void + ArenaHeader::checkSynchronizedWithFreeList() const +@@ -742,7 +749,8 @@ Chunk::fetchNextDecommittedArena() + decommittedArenas.unset(offset); + + Arena *arena = &arenas[offset]; +- MarkPagesInUse(arena, ArenaSize); ++ if (DecommitEnabled()) ++ MarkPagesInUse(arena, ArenaSize); + arena->aheader.setAsNotAllocated(); + + return &arena->aheader; +@@ -2731,7 +2739,7 @@ DecommitArenasFromAvailableList(JSRuntime *rt, Chunk **availableListHeadp) + chunk->removeFromAvailableList(); + + size_t arenaIndex = Chunk::arenaIndex(aheader->arenaAddress()); +- bool ok; ++ bool ok = true; + { + /* + * If the main thread waits for the decommit to finish, skip +@@ -2741,7 +2749,8 @@ DecommitArenasFromAvailableList(JSRuntime *rt, Chunk **availableListHeadp) + Maybe maybeUnlock; + if (!rt->isHeapBusy()) + maybeUnlock.construct(rt); +- ok = MarkPagesUnused(aheader->getArena(), ArenaSize); ++ if (DecommitEnabled()) ++ ok = MarkPagesUnused(aheader->getArena(), ArenaSize); + } + + if (ok) { +-- +1.9.3 + diff --git a/meta-citadel/recipes-desktop/mozjs/mozjs/0005-aarch64-64k-page.patch b/meta-citadel/recipes-desktop/mozjs/mozjs/0005-aarch64-64k-page.patch new file mode 100644 index 0000000..bc99ecc --- /dev/null +++ b/meta-citadel/recipes-desktop/mozjs/mozjs/0005-aarch64-64k-page.patch @@ -0,0 +1,44 @@ +From 9c42920c2b635a399bd1f93833efdeb1696f17ee Mon Sep 17 00:00:00 2001 +From: Koen Kooi +Date: Mon, 2 Mar 2015 19:09:57 +0800 +Subject: [PATCH 5/5] aarch64-64k-page + +--- +Upstream-status: Pending + + js/src/gc/Heap.h | 2 +- + js/src/gc/Memory.cpp | 3 +++ + 2 files changed, 4 insertions(+), 1 deletion(-) + +diff --git a/js/src/gc/Heap.h b/js/src/gc/Heap.h +index 1cfd269..f4dbcda 100644 +--- a/js/src/gc/Heap.h ++++ b/js/src/gc/Heap.h +@@ -113,7 +113,7 @@ struct Cell + #if defined(SOLARIS) && (defined(__sparc) || defined(__sparcv9)) + const size_t PageShift = 13; + const size_t ArenaShift = PageShift; +-#elif defined(__powerpc__) ++#elif defined(__powerpc__) || defined(__aarch64__) + const size_t PageShift = 16; + const size_t ArenaShift = 12; + #else +diff --git a/js/src/gc/Memory.cpp b/js/src/gc/Memory.cpp +index 5b386a2..e5ad018 100644 +--- a/js/src/gc/Memory.cpp ++++ b/js/src/gc/Memory.cpp +@@ -302,8 +302,11 @@ GetPageFaultCount() + void + InitMemorySubsystem() + { ++ /* aarch64 may have 64KB or 4KB pages */ ++#ifndef __aarch64__ + if (size_t(sysconf(_SC_PAGESIZE)) != PageSize) + MOZ_CRASH(); ++#endif + } + + void * +-- +1.9.3 + diff --git a/meta-citadel/recipes-desktop/mozjs/mozjs/0010-fix-cross-compilation-on-i586-targets.patch b/meta-citadel/recipes-desktop/mozjs/mozjs/0010-fix-cross-compilation-on-i586-targets.patch new file mode 100644 index 0000000..6432e1f --- /dev/null +++ b/meta-citadel/recipes-desktop/mozjs/mozjs/0010-fix-cross-compilation-on-i586-targets.patch @@ -0,0 +1,46 @@ +From a452138a1dd274bfad381a701729783360dc86fb Mon Sep 17 00:00:00 2001 +From: Maciej Borzecki +Date: Tue, 5 Jan 2016 22:04:17 +0100 +Subject: [PATCH] fix cross compilation on i586 targets + +Remove offending -Wl,-rpath-link that may cause host libraries to be picked +during linking. The patch applies a fix to configure.in. So as not to +regenerate configure, similar fix is applied there. + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Maciej Borzecki +--- + js/src/configure | 2 +- + js/src/configure.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/js/src/configure b/js/src/configure +index d019b0fdba44233596541de94307010d85a8e32e..5aa40f757a3dbb7d6887175046f44212c15c2eac 100755 +--- a/js/src/configure ++++ b/js/src/configure +@@ -5555,7 +5555,7 @@ TARGET_MD_ARCH=unix + DIRENT_INO=d_ino + MOZ_USER_DIR=".mozilla" + +-MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib' ++MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin' + + MOZ_COMPONENT_NSPR_LIBS='-L$(LIBXUL_DIST)/bin $(NSPR_LIBS)' + +diff --git a/js/src/configure.in b/js/src/configure.in +index 0673aca12f6d83035549ade2a4a83906bf91f0f0..39b22724f9535ac1a6dba04658c91e4ef667fc47 100644 +--- a/js/src/configure.in ++++ b/js/src/configure.in +@@ -919,7 +919,7 @@ TARGET_MD_ARCH=unix + DIRENT_INO=d_ino + MOZ_USER_DIR=".mozilla" + +-MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib' ++MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin' + + MOZ_COMPONENT_NSPR_LIBS='-L$(LIBXUL_DIST)/bin $(NSPR_LIBS)' + +-- +2.5.0 + diff --git a/meta-citadel/recipes-desktop/mozjs/mozjs/Manually_mmap_heap_memory_esr17.patch b/meta-citadel/recipes-desktop/mozjs/mozjs/Manually_mmap_heap_memory_esr17.patch new file mode 100644 index 0000000..15ad03f --- /dev/null +++ b/meta-citadel/recipes-desktop/mozjs/mozjs/Manually_mmap_heap_memory_esr17.patch @@ -0,0 +1,115 @@ +From a0c0f32299419359b44ac0f880c1ea9073ae51e1 Mon Sep 17 00:00:00 2001 +From: Zheng Xu +Date: Fri, 2 Sep 2016 17:40:05 +0800 +Subject: [PATCH] Bug 1143022 - Manually mmap on arm64 to ensure high 17 bits + are clear. r=ehoogeveen + +There might be 48-bit VA on arm64 depending on kernel configuration. +Manually mmap heap memory to align with the assumption made by JS engine. + +Change-Id: Ic5d2b2fe4b758b3c87cc0688348af7e71a991146 + +Upstream-status: Backport + +--- + js/src/gc/Memory.cpp | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 71 insertions(+), 2 deletions(-) + +diff --git a/js/src/gc/Memory.cpp b/js/src/gc/Memory.cpp +index 5b386a2..38101cf 100644 +--- a/js/src/gc/Memory.cpp ++++ b/js/src/gc/Memory.cpp +@@ -306,6 +306,75 @@ InitMemorySubsystem() + MOZ_CRASH(); + } + ++static inline void * ++MapMemory(size_t length, int prot, int flags, int fd, off_t offset) ++{ ++#if defined(__ia64__) ++ /* ++ * The JS engine assumes that all allocated pointers have their high 17 bits clear, ++ * which ia64's mmap doesn't support directly. However, we can emulate it by passing ++ * mmap an "addr" parameter with those bits clear. The mmap will return that address, ++ * or the nearest available memory above that address, providing a near-guarantee ++ * that those bits are clear. If they are not, we return NULL below to indicate ++ * out-of-memory. ++ * ++ * The addr is chosen as 0x0000070000000000, which still allows about 120TB of virtual ++ * address space. ++ * ++ * See Bug 589735 for more information. ++ */ ++ void *region = mmap((void*)0x0000070000000000, length, prot, flags, fd, offset); ++ if (region == MAP_FAILED) ++ return MAP_FAILED; ++ /* ++ * If the allocated memory doesn't have its upper 17 bits clear, consider it ++ * as out of memory. ++ */ ++ if ((uintptr_t(region) + (length - 1)) & 0xffff800000000000) { ++ JS_ALWAYS_TRUE(0 == munmap(region, length)); ++ return MAP_FAILED; ++ } ++ return region; ++#elif defined(__aarch64__) ++ /* ++ * There might be similar virtual address issue on arm64 which depends on ++ * hardware and kernel configurations. But the work around is slightly ++ * different due to the different mmap behavior. ++ * ++ * TODO: Merge with the above code block if this implementation works for ++ * ia64 and sparc64. ++ */ ++ const uintptr_t start = UINT64_C(0x0000070000000000); ++ const uintptr_t end = UINT64_C(0x0000800000000000); ++ const uintptr_t step = ChunkSize; ++ /* ++ * Optimization options if there are too many retries in practice: ++ * 1. Examine /proc/self/maps to find an available address. This file is ++ * not always available, however. In addition, even if we examine ++ * /proc/self/maps, we may still need to retry several times due to ++ * racing with other threads. ++ * 2. Use a global/static variable with lock to track the addresses we have ++ * allocated or tried. ++ */ ++ uintptr_t hint; ++ void* region = MAP_FAILED; ++ for (hint = start; region == MAP_FAILED && hint + length <= end; hint += step) { ++ region = mmap((void*)hint, length, prot, flags, fd, offset); ++ if (region != MAP_FAILED) { ++ if ((uintptr_t(region) + (length - 1)) & 0xffff800000000000) { ++ if (munmap(region, length)) { ++ MOZ_ASSERT(errno == ENOMEM); ++ } ++ region = MAP_FAILED; ++ } ++ } ++ } ++ return region == MAP_FAILED ? NULL : region; ++#else ++ return mmap(NULL, length, prot, flags, fd, offset); ++#endif ++} ++ + void * + MapAlignedPages(size_t size, size_t alignment) + { +@@ -319,12 +388,12 @@ MapAlignedPages(size_t size, size_t alignment) + + /* Special case: If we want page alignment, no further work is needed. */ + if (alignment == PageSize) { +- return mmap(NULL, size, prot, flags, -1, 0); ++ return MapMemory(size, prot, flags, -1, 0); + } + + /* Overallocate and unmap the region's edges. */ + size_t reqSize = Min(size + 2 * alignment, 2 * size); +- void *region = mmap(NULL, reqSize, prot, flags, -1, 0); ++ void *region = MapMemory(reqSize, prot, flags, -1, 0); + if (region == MAP_FAILED) + return NULL; + +-- +1.9.1 + diff --git a/meta-citadel/recipes-desktop/mozjs/mozjs/fix-the-compile-error-of-powerpc64.patch b/meta-citadel/recipes-desktop/mozjs/mozjs/fix-the-compile-error-of-powerpc64.patch new file mode 100644 index 0000000..43c4590 --- /dev/null +++ b/meta-citadel/recipes-desktop/mozjs/mozjs/fix-the-compile-error-of-powerpc64.patch @@ -0,0 +1,18 @@ +fix the compile error of powerpc64 + +Upstream-status: Accepted + + fix the following error + |error: 'jsuword' does not name a type + + +--- a/js/src/jsval.hold 2015-04-24 01:15:06.692970731 -0500 ++++ b/js/src/jsval.h 2015-04-24 01:15:41.792969478 -0500 +@@ -304,7 +304,6 @@ + int32_t i32; + uint32_t u32; + JSWhyMagic why; +- jsuword word; + } payload; + } s; + double asDouble; diff --git a/meta-citadel/recipes-desktop/mozjs/mozjs/fix_milestone_compile_issue.patch b/meta-citadel/recipes-desktop/mozjs/mozjs/fix_milestone_compile_issue.patch new file mode 100644 index 0000000..abde01b --- /dev/null +++ b/meta-citadel/recipes-desktop/mozjs/mozjs/fix_milestone_compile_issue.patch @@ -0,0 +1,20 @@ +fix the compile error do to perl update + +Upstream-status: Inappropriate + + +Signed-of-by: Armin Kuster + +Index: src/config/milestone.pl +=================================================================== +--- src.orig/config/milestone.pl ++++ src/config/milestone.pl +@@ -55,7 +55,7 @@ $MILESTONE_FILE = "$TOPSRCDIR/config/mi + # + my $milestone = Moz::Milestone::getOfficialMilestone($MILESTONE_FILE); + +-if (defined(@TEMPLATE_FILE)) { ++if (@TEMPLATE_FILE) { + my $TFILE; + + foreach $TFILE (@TEMPLATE_FILE) { diff --git a/meta-citadel/recipes-desktop/mozjs/mozjs52.bb b/meta-citadel/recipes-desktop/mozjs/mozjs52.bb new file mode 100644 index 0000000..f327f8f --- /dev/null +++ b/meta-citadel/recipes-desktop/mozjs/mozjs52.bb @@ -0,0 +1,56 @@ +SUMMARY = "SpiderMonkey is Mozilla's JavaScript engine written in C/C++" +HOMEPAGE = "http://www.mozilla.org/js/" +LICENSE = "MPL-2.0" +LIC_FILES_CHKSUM = "file://../../LICENSE;md5=815ca599c9df247a0c7f619bab123dad" + +RELEASE_VERSION = "mozjs-52.2.1gnome1" + +SRC_URI = "https://download.gnome.org/teams/releng/tarballs-needing-help/mozjs/${RELEASE_VERSION}.tar.gz" +SRC_URI[md5sum] = "72bd9a715ed1ab70b2aebe92969f6b63" +SRC_URI[sha256sum] = "31697943b1dbbb51ba9aee35b8269a353c487d7af4d336010b90054dc4f9b0af" + +DEPENDS += "nspr zlib autoconf213-native" + +S = "${WORKDIR}/${RELEASE_VERSION}/js/src" + +FILES_${PN}-staticdev += "${libdir}/*.ajs" + +# prevent FILES_mozjs52-dev from scooping up libmozjs-52.so +FILES_SOLIBSDEV = "" + +# put it here instead +PACKAGES =+ "lib${BPN}" +FILES_lib${BPN} = "${libdir}/lib*.so" + +inherit autotools pkgconfig perlnative pythonnative + +EXTRA_OECONF = " \ + --target=${TARGET_SYS} \ + --host=${BUILD_SYS} \ + --build=${BUILD_SYS} \ + --prefix=${prefix} \ + --libdir=${libdir} \ + --enable-posix-nspr-emulation \ + --with-system-zlib \ + --with-intl-api \ + --disable-jemalloc \ + --disable-static \ +" + + + +# native-python uses RPATH to find libpython, but mozilla builder sets +# up a virtualenv which copies the python binary to a new location where +# it can no longer find the expected libpython with embedded RPATH. +# the LD_LIBRARY_PATH setting fixes this problem. + +EXTRA_OEMAKE += "SHELL=/bin/sh LD_LIBRARY_PATH=${STAGING_LIBDIR_NATIVE}" + +do_configure() { + export LD_LIBRARY_PATH=${STAGING_LIBDIR_NATIVE} + export SHELL=/bin/bash + STAGING_LIBDIR=${STAGING_LIBDIR_NATIVE} + STAGING_INCDIR=${STAGING_INCDIR_NATIVE} + LD=x86_64-oe-linux-ld + ${S}/configure ${EXTRA_OECONF} +} diff --git a/meta-citadel/recipes-desktop/mozjs/mozjs_17.0.0.bb b/meta-citadel/recipes-desktop/mozjs/mozjs_17.0.0.bb new file mode 100644 index 0000000..49b7f15 --- /dev/null +++ b/meta-citadel/recipes-desktop/mozjs/mozjs_17.0.0.bb @@ -0,0 +1,82 @@ +SUMMARY = "SpiderMonkey is Mozilla's JavaScript engine written in C/C++" +HOMEPAGE = "http://www.mozilla.org/js/" +LICENSE = "MPL-2.0" +LIC_FILES_CHKSUM = "file://../../LICENSE;md5=815ca599c9df247a0c7f619bab123dad" + +SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/js/${BPN}${PV}.tar.gz \ + file://0001-mozjs17.0.0-fix-the-compile-bug-of-powerpc.patch \ + file://0001-js.pc.in-do-not-include-RequiredDefines.h-for-depend.patch \ + file://0002-Move-JS_BYTES_PER_WORD-out-of-config.h.patch;patchdir=../../ \ + file://0003-Add-AArch64-support.patch;patchdir=../../ \ + file://0004-mozbug746112-no-decommit-on-large-pages.patch;patchdir=../../ \ + file://0005-aarch64-64k-page.patch;patchdir=../../ \ + file://0001-regenerate-configure.patch;patchdir=../../ \ + file://fix-the-compile-error-of-powerpc64.patch;patchdir=../../ \ + file://fix_milestone_compile_issue.patch \ + file://0010-fix-cross-compilation-on-i586-targets.patch;patchdir=../../ \ + file://Manually_mmap_heap_memory_esr17.patch;patchdir=../../ \ + file://0001-compare-the-first-character-of-string-to-be-null-or-.patch;patchdir=../../ \ + " + +SRC_URI[md5sum] = "20b6f8f1140ef6e47daa3b16965c9202" +SRC_URI[sha256sum] = "321e964fe9386785d3bf80870640f2fa1c683e32fe988eeb201b04471c172fba" + +S = "${WORKDIR}/${BPN}${PV}/js/src" + +inherit autotools pkgconfig perlnative pythonnative + +DEPENDS += "nspr zlib" + +# Host specific flags need to be defined, otherwise target flags will be passed to the host +export HOST_CFLAGS = "${BUILD_CFLAGS}" +export HOST_CXXFLAGS = "${BUILD_CXXFLAGS}" +export HOST_LDFLAGS = "${BUILD_LDFLAGS}" + +# nspr's package-config is ignored so set libs manually +EXTRA_OECONF = " \ + --target=${TARGET_SYS} \ + --host=${BUILD_SYS} \ + --build=${BUILD_SYS} \ + --prefix=${prefix} \ + --libdir=${libdir} \ + --with-nspr-libs='-lplds4 -lplc4 -lnspr4' \ + --enable-threadsafe \ + --disable-static \ +" +EXTRA_OECONF_append_armv4 = " \ + --disable-methodjit \ +" + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" +PACKAGECONFIG[x11] = "--with-x --x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR},--without-x,virtual/libx11" + +# mozjs requires autoreconf 2.13 +do_configure() { + export HOST_CFLAGS="${BUILD_CFLAGS}" + export HOST_CXXFLAGS="${BUILD_CPPFLAGS}" + export HOST_LDFLAGS="${BUILD_LDFLAGS}" + ( cd ${S} + gnu-configize --force + mv config.guess config.sub build/autoconf ) + ${S}/configure ${EXTRA_OECONF} +} + +# patch.bbclass will try to apply the patches already present and fail, so clean them out +do_unpack() { + tar -xvf ${DL_DIR}/mozjs17.0.0.tar.gz -C ${WORKDIR}/ + rm -rf ${WORKDIR}/${BPN}${PV}/patches +} + + +PACKAGES =+ "lib${BPN}" +FILES_lib${BPN} += "${libdir}/lib*.so" +FILES_${PN}-dev += "${bindir}/js17-config" + +# Fails to build with thumb-1 (qemuarm) +#| {standard input}: Assembler messages: +#| {standard input}:2172: Error: shifts in CMP/MOV instructions are only supported in unified syntax -- `mov r2,r1,LSR#20' +#| {standard input}:2173: Error: unshifted register required -- `bic r2,r2,#(1<<11)' +#| {standard input}:2174: Error: unshifted register required -- `orr r1,r1,#(1<<20)' +#| {standard input}:2176: Error: instruction not supported in Thumb16 mode -- `subs r2,r2,#0x300' +#| {standard input}:2178: Error: instruction not supported in Thumb16 mode -- `subs r5,r2,#52' +ARM_INSTRUCTION_SET = "arm" diff --git a/meta-citadel/recipes-desktop/mutter/mutter/0001-remove-check-for-zenity.patch b/meta-citadel/recipes-desktop/mutter/mutter/0001-remove-check-for-zenity.patch new file mode 100644 index 0000000..67c51cf --- /dev/null +++ b/meta-citadel/recipes-desktop/mutter/mutter/0001-remove-check-for-zenity.patch @@ -0,0 +1,28 @@ +From 63162a620053f3d21a5610be50e66a72595ebf09 Mon Sep 17 00:00:00 2001 +From: brl +Date: Tue, 12 Dec 2017 22:33:08 -0500 +Subject: [PATCH] remove check for zenity + +--- + configure.ac | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 89c15e2..5b3414e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -390,11 +390,6 @@ fi + + AM_CONDITIONAL(HAVE_SM, test "$found_sm" = "yes") + +-AC_PATH_PROG(ZENITY, zenity, no) +-if test x"$ZENITY" = xno; then +- AC_MSG_ERROR([zenity not found in your path - needed for dialogs]) +-fi +- + AC_ARG_ENABLE(debug, + [ --enable-debug enable debugging],, + enable_debug=no) +-- +2.14.3 + diff --git a/meta-citadel/recipes-desktop/mutter/mutter_3.26.1.bb b/meta-citadel/recipes-desktop/mutter/mutter_3.26.1.bb new file mode 100644 index 0000000..a2bc90a --- /dev/null +++ b/meta-citadel/recipes-desktop/mutter/mutter_3.26.1.bb @@ -0,0 +1,20 @@ +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SRC_URI[archive.md5sum] = "137724b82820db992d9df103959e20fc" +SRC_URI[archive.sha256sum] = "16faf617aae9be06dc5f9e104f4cd20dfdd4d6ec0bc10053752262e9f79a04c2" +SRC_URI_append = " file://0001-remove-check-for-zenity.patch" + +DEPENDS = "libxrandr libsm libx11 libxi glib-2.0 wayland-protocols libwacom mesa gtk+3 pango cairo gsettings-desktop-schemas xcomposite upower gnome-desktop libxkbfile json-glib wayland-native xinerama zenity libinput libcanberra" +RDEPENDS_${PN} = "zenity" + +inherit gettext pkgconfig autotools gobject-introspection gnome + +FILES_${PN} += "${datadir}/gnome-control-center" + +do_compile_prepend() { + export GIR_EXTRA_LIBS_PATH="${B}/cogl/cogl/.libs:${B}/cogl/cogl-pango/.libs:${B}/cogl/cogl-path/.libs:${B}/clutter/clutter/.libs" +} + +EXTRA_OECONF = "--with-gudev --with-libwacom" + diff --git a/meta-citadel/recipes-desktop/nautilus/nautilus/0001-meson-find-libm-correctly.patch b/meta-citadel/recipes-desktop/nautilus/nautilus/0001-meson-find-libm-correctly.patch new file mode 100644 index 0000000..1ffe738 --- /dev/null +++ b/meta-citadel/recipes-desktop/nautilus/nautilus/0001-meson-find-libm-correctly.patch @@ -0,0 +1,25 @@ +From ac6e603cbb7578d5148fb0ec780252c290cd7dca Mon Sep 17 00:00:00 2001 +From: brl +Date: Tue, 9 Jan 2018 13:24:29 -0500 +Subject: [PATCH] meson find libm correctly + +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 0816d74..62c6af1 100644 +--- a/meson.build ++++ b/meson.build +@@ -53,7 +53,7 @@ gio_unix = dependency ('gio-unix-2.0', version: glib_ver) + gsettings_desktop_schemas = dependency ('gsettings-desktop-schemas', + version: schemas_ver) + +-libm = cc.find_library ('libm') ++libm = cc.find_library ('m') + + conf = configuration_data () + conf.set_quoted ('VERSION', meson.project_version ()) +-- +2.14.3 + diff --git a/meta-citadel/recipes-desktop/nautilus/nautilus_3.26.0.bb b/meta-citadel/recipes-desktop/nautilus/nautilus_3.26.0.bb new file mode 100644 index 0000000..6f9c427 --- /dev/null +++ b/meta-citadel/recipes-desktop/nautilus/nautilus_3.26.0.bb @@ -0,0 +1,72 @@ +SUMMARY = "GNOME file manager" +HOMEPAGE = "https://wiki.gnome.org/action/show/Apps/Files" + +LICENSE = "GPLv3 & LGPLv2.1" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504 \ + file://libnautilus-extension/LICENSE;md5=321bf41f280cf805086dd5a720b37785" + +SRC_URI = "https://download.gnome.org/sources/nautilus/3.26/nautilus-${PV}.tar.xz \ + file://0001-meson-find-libm-correctly.patch \ + " +SRC_URI[md5sum] = "1b1d05e4d734e2e0710275849e83b85e" +SRC_URI[sha256sum] = "a02b30ef9033f6f92fbc5e29abaceeb58ce6a600ed9fa5a4697ba82901d07924" + +FILES_${PN} += "\ + ${datadir}/glib-2.0/schemas \ + ${datadir}/gnome-shell/search-providers/nautilus-search-provider.ini \ + ${datadir}/appdata/org.gnome.Nautilus.appdata.xml \ + ${datadir}/icons/hicolor/ \ + ${datadir}/dbus-1/services \ +" +inherit meson gobject-introspection + +DEPENDS += "gtk+3 glib-2.0 pango gnome-autoar libxml2 gnome-desktop tracker" +# This probably belongs in meson.bbclass +# +# 1) write out a wrapper script that can execute target binaries +# +# 2) add exe_wrapper line to the end of [binaries] section in the +# meson.cross file that meson.bbclass generated +# +setup_wrapper() { + if [ ! -e ${B}/wrapper ]; then + cat > ${B}/wrapper << EOF +#!/bin/sh +${STAGING_LIBDIR}/ld-linux-x86-64.so.2 --library-path ${STAGING_LIBDIR} \$@ +EOF + chmod +x ${B}/wrapper + fi + + if ! grep -q "^exe_wrapper" ${WORKDIR}/meson.cross; then + cat ${WORKDIR}/meson.cross | sed "/pkgconfig/ a\ +exe_wrapper = '${B}/wrapper'" > ${WORKDIR}/meson.cross.tmp + mv ${WORKDIR}/meson.cross.tmp ${WORKDIR}/meson.cross + fi +} +GIR_SCANNER_NATIVE = "${STAGING_BINDIR_NATIVE}/g-ir-scanner" +GIR_SCRIPT_PATH = "${B}/g-ir-scanner-script" + +# https://github.com/ninja-build/ninja/issues/1002 +write_gir_script () { + cat > ${GIR_SCRIPT_PATH} << EOF +#!/bin/sh +export PKG_CONFIG=pkg-config +export PKG_CONFIG_PATH=\"${PKG_CONFIG_PATH}\" +export XDG_DATA_DIRS=\"${STAGING_DATADIR}\" +export CC="x86_64-oe-linux-gcc --sysroot=${STAGING_DIR_HOST}" +export LD="x86_64-oe-linux-gcc --sysroot=${STAGING_DIR_HOST}" +${STAGING_BINDIR}/g-ir-scanner-wrapper \$@ +EOF + chmod +x ${GIR_SCRIPT_PATH} +} + +do_configure_append () { + write_gir_script + sed --in-place=.old2 "s;COMMAND = ${GIR_SCANNER_NATIVE};COMMAND = ${GIR_SCRIPT_PATH};" ${B}/build.ninja +} + +do_configure_prepend() { + setup_wrapper +} + +EXTRA_OEMESON = "-Denable-selinux=false -Denable-desktop=false -Denable-packagekit=false -Denable-nst-extention=false" diff --git a/meta-citadel/recipes-desktop/network-manager-applet/network-manager-applet.inc b/meta-citadel/recipes-desktop/network-manager-applet/network-manager-applet.inc new file mode 100644 index 0000000..abf2448 --- /dev/null +++ b/meta-citadel/recipes-desktop/network-manager-applet/network-manager-applet.inc @@ -0,0 +1,11 @@ +SUMMARY = "Applet for managing network connections" +HOMEPAGE = "https://wiki.gnome.org/Projects/NetworkManager" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" + +DEPENDS = "gcr iso-codes networkmanager libgudev gtk+3 intltool-native modemmanager glib-2.0 libnotify libsecret glib-2.0-native" + +inherit gettext gobject-introspection gnome + +EXTRA_OECONF = "--without-selinux --without-team --enable-introspection --with-libnm-gtk" + diff --git a/meta-citadel/recipes-desktop/network-manager-applet/network-manager-applet_1.8.4.bb b/meta-citadel/recipes-desktop/network-manager-applet/network-manager-applet_1.8.4.bb new file mode 100644 index 0000000..a8cafc3 --- /dev/null +++ b/meta-citadel/recipes-desktop/network-manager-applet/network-manager-applet_1.8.4.bb @@ -0,0 +1,3 @@ +require network-manager-applet.inc +SRC_URI[archive.md5sum] = "d796b3d8b0ee940e89b5572869e5379c" +SRC_URI[archive.sha256sum] = "105010d3e37d00ff8fd1d69e294d3a51b45e2488bd2d27f5cfd3a372e5bee329" diff --git a/meta-citadel/recipes-desktop/network-manager-applet/network-manager-applet_1.8.6.bb b/meta-citadel/recipes-desktop/network-manager-applet/network-manager-applet_1.8.6.bb new file mode 100644 index 0000000..bdb9de5 --- /dev/null +++ b/meta-citadel/recipes-desktop/network-manager-applet/network-manager-applet_1.8.6.bb @@ -0,0 +1,3 @@ +require network-manager-applet.inc +SRC_URI[archive.md5sum] = "9fd564a430201d0a8ff34f5ab50fc609" +SRC_URI[archive.sha256sum] = "01749e2c27d84ac858f59bc923af50860156eb510e2b6cf7d4941f753bef9c30" diff --git a/meta-citadel/recipes-desktop/pango/pango.inc b/meta-citadel/recipes-desktop/pango/pango.inc new file mode 100644 index 0000000..b139790 --- /dev/null +++ b/meta-citadel/recipes-desktop/pango/pango.inc @@ -0,0 +1,52 @@ +SUMMARY = "Framework for layout and rendering of internationalized text" +DESCRIPTION = "Pango is a library for laying out and rendering of text, \ +with an emphasis on internationalization. Pango can be used anywhere \ +that text layout is needed, though most of the work on Pango so far has \ +been done in the context of the GTK+ widget toolkit. Pango forms the \ +core of text and font handling for GTK+-2.x." +HOMEPAGE = "http://www.pango.org/" +BUGTRACKER = "http://bugzilla.gnome.org" +SECTION = "libs" +LICENSE = "LGPLv2.0+" + +LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" + +inherit gnomebase gtk-doc ptest-gnome upstream-version-is-even gobject-introspection + +FILESEXTRAPATHS_prepend := "${COREBASE}/meta/recipes-graphics/pango/pango:" + +SRC_URI += "file://run-ptest \ + file://0001-Drop-introspection-macros-from-acinclude.m4.patch \ + file://0001-Enforce-recreation-of-docs-pango.types-it-is-build-c.patch \ +" + +DEPENDS = "glib-2.0 glib-2.0-native fontconfig freetype virtual/libiconv cairo harfbuzz" + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" +PACKAGECONFIG[x11] = "--with-xft,--without-xft,virtual/libx11 libxft" + +EXTRA_AUTORECONF = "" + +EXTRA_OECONF = " \ + --disable-debug \ + " + +LEAD_SONAME = "libpango-1.0*" +LIBV = "1.8.0" + +# This binary needs to be compiled for the host architecture. This isn't pretty! +do_compile_prepend_class-target () { + if ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'true', 'false', d)}; then + make CC="${BUILD_CC}" CFLAGS="" LDFLAGS="${BUILD_LDFLAGS}" AM_CPPFLAGS="$(pkg-config-native --cflags glib-2.0)" gen_all_unicode_LDADD="$(pkg-config-native --libs glib-2.0)" -C ${B}/tests gen-all-unicode + fi +} + +FILES_${PN} = "${bindir}/* ${libdir}/libpango*${SOLIBS}" +FILES_${PN}-dev += "${libdir}/pango/${LIBV}/modules/*.la" + +RDEPENDS_${PN}-ptest += "liberation-fonts cantarell-fonts" + +RPROVIDES_${PN} += "pango-modules pango-module-indic-lang \ + pango-module-basic-fc pango-module-arabic-lang" + +BBCLASSEXTEND = "native" diff --git a/meta-citadel/recipes-desktop/pango/pango_1.40.13.bb b/meta-citadel/recipes-desktop/pango/pango_1.40.13.bb new file mode 100644 index 0000000..80a533d --- /dev/null +++ b/meta-citadel/recipes-desktop/pango/pango_1.40.13.bb @@ -0,0 +1,3 @@ +require pango.inc +SRC_URI[archive.md5sum] = "6676d2110ed9f89b9b3cfbbd10d5b302" +SRC_URI[archive.sha256sum] = "f84e98db1078772ff4935b40a1629ff82ef0dfdd08d2cbcc0130c8c437857196" diff --git a/meta-citadel/recipes-desktop/paper-icon-theme/paper-icon-theme_1.3.bb b/meta-citadel/recipes-desktop/paper-icon-theme/paper-icon-theme_1.3.bb new file mode 100644 index 0000000..456a5ff --- /dev/null +++ b/meta-citadel/recipes-desktop/paper-icon-theme/paper-icon-theme_1.3.bb @@ -0,0 +1,17 @@ +HOMEPAGE = "https://snwh.org/paper" +LICENSE = "CC-BY-SA-4.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=8335471e369a410f354d5179fdcf0195 \ + file://LICENSE;md5=4a312f184ff2ceafe9466cbb7ea43f4e" + +SRC_URI = "https://github.com/snwh/paper-icon-theme/archive/v1.4.0.tar.gz;downloadfilename=paper-icon-theme-${PV}.tar.gz" +SRC_URI[md5sum] = "076e1dfa1bc5928f4c6616ffd933926a" +SRC_URI[sha256sum] = "b90f3a84634572bcba76cdd0c2a0d305a5c521c2054d3d390edffda5f233928b" + +S = "${WORKDIR}/${BPN}-1.4.0" + +inherit autotools-brokensep allarch + +FILES_${PN} = "${datadir}/icons" + +EXTRA_OECONF = "" + diff --git a/meta-citadel/recipes-desktop/pulseaudio/pulseaudio/volatiles.04_pulse b/meta-citadel/recipes-desktop/pulseaudio/pulseaudio/volatiles.04_pulse new file mode 100644 index 0000000..5b19980 --- /dev/null +++ b/meta-citadel/recipes-desktop/pulseaudio/pulseaudio/volatiles.04_pulse @@ -0,0 +1,2 @@ +# +d pulse pulse 0755 /var/run/pulse none diff --git a/meta-citadel/recipes-desktop/pulseaudio/pulseaudio_11.1.bb b/meta-citadel/recipes-desktop/pulseaudio/pulseaudio_11.1.bb new file mode 100644 index 0000000..2b92ea0 --- /dev/null +++ b/meta-citadel/recipes-desktop/pulseaudio/pulseaudio_11.1.bb @@ -0,0 +1,12 @@ +require recipes-multimedia/pulseaudio/pulseaudio.inc + +SRC_URI = "http://freedesktop.org/software/pulseaudio/releases/${BP}.tar.xz \ + file://volatiles.04_pulse \ +" +SRC_URI[md5sum] = "390de38231d5cdd6b43ada8939eb74f1" +SRC_URI[sha256sum] = "f2521c525a77166189e3cb9169f75c2ee2b82fa3fcf9476024fbc2c3a6c9cd9e" + +do_compile_prepend() { + mkdir -p ${S}/libltdl + cp ${STAGING_LIBDIR}/libltdl* ${S}/libltdl +} diff --git a/meta-citadel/recipes-desktop/sound-theme-freedesktop/sound-theme-freedesktop_0.8.bb b/meta-citadel/recipes-desktop/sound-theme-freedesktop/sound-theme-freedesktop_0.8.bb new file mode 100644 index 0000000..a2b1592 --- /dev/null +++ b/meta-citadel/recipes-desktop/sound-theme-freedesktop/sound-theme-freedesktop_0.8.bb @@ -0,0 +1,15 @@ +SUMMARY = "Freedesktop sound theme" +HOMEPAGE = "https://freedesktop.org/wiki/Specifications/sound-theme-spec" +LICENSE = "GPLv2 & CC-BY-SA-3.0" +LIC_FILES_CHKSUM = "file://CREDITS;md5=3213e601ce34bb42ddc3498903ac4e69" + +SRC_URI = "https://people.freedesktop.org/~mccann/dist/sound-theme-freedesktop-${PV}.tar.bz2" +SRC_URI[md5sum] = "d7387912cfd275282d1ec94483cb2f62" +SRC_URI[sha256sum] = "cb518b20eef05ec2e82dda1fa89a292c1760dc023aba91b8aa69bafac85e8a14" + +DEPENDS = "intltool-native glib-2.0-native" + +inherit gettext autotools + +EXTRA_OECONF = "" + diff --git a/meta-citadel/recipes-desktop/tracker/tracker/0001-assume-sqlite-built-threadsafe-and-with-fts5.patch b/meta-citadel/recipes-desktop/tracker/tracker/0001-assume-sqlite-built-threadsafe-and-with-fts5.patch new file mode 100644 index 0000000..c3f1d04 --- /dev/null +++ b/meta-citadel/recipes-desktop/tracker/tracker/0001-assume-sqlite-built-threadsafe-and-with-fts5.patch @@ -0,0 +1,39 @@ +From 9b3fd8d4c683a8a1c57e6c758916d1e1392ec4cf Mon Sep 17 00:00:00 2001 +From: brl +Date: Sun, 7 Jan 2018 21:01:49 -0500 +Subject: [PATCH] assume sqlite built threadsafe and with fts5 + +--- + m4/sqlite-builtin-fts5.m4 | 2 +- + m4/sqlite-threadsafe.m4 | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/m4/sqlite-builtin-fts5.m4 b/m4/sqlite-builtin-fts5.m4 +index 635f15d..39b17d8 100644 +--- a/m4/sqlite-builtin-fts5.m4 ++++ b/m4/sqlite-builtin-fts5.m4 +@@ -26,7 +26,7 @@ AC_DEFUN([AX_SQLITE_BUILTIN_FTS5], + if (rc!=SQLITE_OK) return -1;]])], + [ax_cv_sqlite_builtin_fts5=yes], + [ax_cv_sqlite_builtin_fts5=no], +- [ax_cv_sqlite_builtin_fts5=no])]) ++ [ax_cv_sqlite_builtin_fts5=yes])]) + + CFLAGS="$OLD_CFLAGS" + LDFLAGS="$OLD_LDFLAGS" +diff --git a/m4/sqlite-threadsafe.m4 b/m4/sqlite-threadsafe.m4 +index 75bdfbf..68d3ec9 100644 +--- a/m4/sqlite-threadsafe.m4 ++++ b/m4/sqlite-threadsafe.m4 +@@ -45,7 +45,7 @@ int main () + ]])], + [ax_cv_sqlite_threadsafe=yes], + [ax_cv_sqlite_threadsafe=no], +- [ax_cv_sqlite_threadsafe=no])]) ++ [ax_cv_sqlite_threadsafe=yes])]) + + LIBS="$save_LIBS" + ]) +-- +2.14.3 + diff --git a/meta-citadel/recipes-desktop/tracker/tracker_2.0.2.bb b/meta-citadel/recipes-desktop/tracker/tracker_2.0.2.bb new file mode 100644 index 0000000..8aace14 --- /dev/null +++ b/meta-citadel/recipes-desktop/tracker/tracker_2.0.2.bb @@ -0,0 +1,41 @@ +SUMMARY = "Desktop search engine and metadata storage system" +HOMEPAGE = "https://wiki.gnome.org/Projects/Tracker" +LICENSE = "GPLv2 & LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=506ab4920510c723c01689e212f41404 \ + file://COPYING.GPL;md5=ee31012bf90e7b8c108c69f197f3e3a4 \ + file://COPYING.LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \ + file://src/libtracker-miner/COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ + file://src/libtracker-common/COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ + file://src/libtracker-data/COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ + file://docs/reference/COPYING;md5=f51a5100c17af6bae00735cd791e1fcc" + +SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/tracker/2.0/tracker-${PV}.tar.xz \ + file://0001-assume-sqlite-built-threadsafe-and-with-fts5.patch \ + " +SRC_URI[md5sum] = "25d8c102a2cdc63e434a2bbbdf9f7d3d" +SRC_URI[sha256sum] = "ece71a56c29151a76fc1b6e43c15dd1b657b37162dc948fa2487faf5ddb47fda" + +DEPENDS = "intltool-native libunistring sqlite3 dbus upower networkmanager bash-completion glib-2.0-native libsoup-2.4 libxml2 json-glib" + + +FILES_${PN} += "\ + ${libdir}/systemd/user/tracker-store.service \ + ${libdir}/tracker-2.0 \ + ${datadir}/glib-2.0/schemas \ + ${datadir}/bash-completion/completions \ + ${datadir}/dbus-1/services \ +" + +FILES_${PN}-dev += "\ + ${datadir}/vala/vapi \ +" +FILES_${PN}-staticdev += "\ + ${libdir}/tracker-2.0/libtracker-data.a \ + ${libdir}/tracker-2.0/libtracker-common.a \ +" +INSANE_SKIP_${PN} += "dev-so" + +inherit gettext pkgconfig pythonnative autotools + +EXTRA_OECONF = "--enable-minimal --disable-introspection" + diff --git a/meta-citadel/recipes-desktop/ttf-roboto/ttf-roboto.bb b/meta-citadel/recipes-desktop/ttf-roboto/ttf-roboto.bb new file mode 100644 index 0000000..147f9d4 --- /dev/null +++ b/meta-citadel/recipes-desktop/ttf-roboto/ttf-roboto.bb @@ -0,0 +1,19 @@ +SUMMARY = "Roboto font" +HOMEPAGE = "https://fonts.google.com/specimen/Roboto" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" + +SRC_URI = "https://github.com/google/roboto/releases/download/v2.136/roboto-hinted.zip" +SRC_URI[md5sum] = "b796348e23f38be21c84b9bc64c04046" +SRC_URI[sha256sum] = "c4528791de55ade3d6c698738a70b457311e4dd296c5a3318aa729874067fa6a" + +inherit allarch fontcache + +S = "${WORKDIR}/roboto-hinted" + +FILES_${PN} = "${datadir}/fonts/TTF" + +do_install () { + install -Dm644 ${S}/*.ttf -t ${D}${datadir}/fonts/TTF +} + diff --git a/meta-citadel/recipes-desktop/upower/upower_0.99.7.bb b/meta-citadel/recipes-desktop/upower/upower_0.99.7.bb new file mode 100644 index 0000000..fbbf05a --- /dev/null +++ b/meta-citadel/recipes-desktop/upower/upower_0.99.7.bb @@ -0,0 +1,21 @@ +SUMMARY = "Linux power management daemon" +HOMEPAGE = "http://upower.freedesktop.org" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=0de8fbf1d97a140d1d93b9f14dcfbf08 \ + file://doc/html/license.html;md5=dd77cfbf0965ebe2f167827e6ae5f63f" + +SRC_URI = "https://upower.freedesktop.org/releases/upower-${PV}.tar.xz" +SRC_URI[md5sum] = "236bb439d9ff1151450b3d8582399532" +SRC_URI[sha256sum] = "24bcc2f6ab25a2533bac70b587bcb019e591293076920f5b5e04bdedc140a401" + +DEPENDS = "libusb1 glib-2.0 intltool-native libgudev" + +inherit gettext pkgconfig autotools gobject-introspection + +FILES_${PN} += "\ + ${datadir}/dbus-1 \ + ${systemd_system_unitdir} \ +" + +EXTRA_OECONF = "--enable-man-pages=no --enable-gtk-doc=no" + diff --git a/meta-citadel/recipes-desktop/vte/vte.inc b/meta-citadel/recipes-desktop/vte/vte.inc new file mode 100644 index 0000000..c0dba4e --- /dev/null +++ b/meta-citadel/recipes-desktop/vte/vte.inc @@ -0,0 +1,26 @@ +SUMMARY = "Virtual terminal emulator GTK+ widget library" +BUGTRACKER = "https://bugzilla.gnome.org/buglist.cgi?product=vte" +LICENSE = "LGPLv2.1+" +DEPENDS = "glib-2.0 gtk+3 libpcre2 intltool-native libxml2-native gperf-native gnutls" + +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +inherit gnomebase gtk-doc distro_features_check upstream-version-is-even gobject-introspection vala + +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" + +# Help g-ir-scanner find the .so for linking +do_compile_prepend() { + export GIR_EXTRA_LIBS_PATH="${B}/src/.libs" +} + +CFLAGS += "-D_GNU_SOURCE" + +EXTRA_OECONF = "--disable-test-application --with-gnutls" + +# libtool adds "-nostdlib" when g++ is used. This breaks PIE builds. +# Use libtool-cross (which has a hack to prevent that) instead. +EXTRA_OEMAKE_class-target = "LIBTOOL=${STAGING_BINDIR_CROSS}/${HOST_SYS}-libtool" + +PACKAGES =+ "libvte" +FILES_libvte = "${libdir}/*.so.* ${libdir}/girepository-1.0/*" diff --git a/meta-citadel/recipes-desktop/vte/vte_0.50.1.bb b/meta-citadel/recipes-desktop/vte/vte_0.50.1.bb new file mode 100644 index 0000000..5cffc62 --- /dev/null +++ b/meta-citadel/recipes-desktop/vte/vte_0.50.1.bb @@ -0,0 +1,3 @@ +require vte.inc +SRC_URI[archive.md5sum] = "a6f8fec3787e3cb72b3b31a8be6751a4" +SRC_URI[archive.sha256sum] = "cf1708e3e573160e1db107014b3ef70888fefe6b668373fed70e8d1cac45a8c2" diff --git a/meta-citadel/recipes-desktop/vte/vte_0.50.2.bb b/meta-citadel/recipes-desktop/vte/vte_0.50.2.bb new file mode 100644 index 0000000..9866047 --- /dev/null +++ b/meta-citadel/recipes-desktop/vte/vte_0.50.2.bb @@ -0,0 +1,3 @@ +require vte.inc +SRC_URI[archive.md5sum] = "1912cfd1d9cdd30cebeb908507acadc5" +SRC_URI[archive.sha256sum] = "79dd316bfaff48f2fb74d066baae0d830e1f44436796fe410a57297e5c5f09cf" diff --git a/meta-citadel/recipes-desktop/zenity/zenity.inc b/meta-citadel/recipes-desktop/zenity/zenity.inc new file mode 100644 index 0000000..640ad42 --- /dev/null +++ b/meta-citadel/recipes-desktop/zenity/zenity.inc @@ -0,0 +1,14 @@ +SUMMARY = "GNOME port of Dialog to display dialog boxes from shell scripts" +LICENSE = "LGPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" + +inherit gnome perlnative gettext + +SRC_URI += "file://0001-Don-t-build-help.patch \ + file://0002-Don-t-include-gdialog.patch \ + " +DEPENDS = "libx11 libnotify glib-2.0 gtk+3 gnome-common autoconf-archive" + + +EXTRA_OECONF = "" +BBCLASSEXTEND = "native" diff --git a/meta-citadel/recipes-desktop/zenity/zenity/0001-Don-t-build-help.patch b/meta-citadel/recipes-desktop/zenity/zenity/0001-Don-t-build-help.patch new file mode 100644 index 0000000..93b9cee --- /dev/null +++ b/meta-citadel/recipes-desktop/zenity/zenity/0001-Don-t-build-help.patch @@ -0,0 +1,26 @@ +From badb3369dbaaa3a14a7e4415077de3c3c13f4581 Mon Sep 17 00:00:00 2001 +From: brl +Date: Tue, 12 Dec 2017 19:18:11 -0500 +Subject: [PATCH] Don't build help + +--- + Makefile.am | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index df84b81..c948125 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -4,8 +4,7 @@ INCLUDES = src + SUBDIRS = \ + src \ + po \ +- data \ +- help ++ data + + EXTRA_DIST = \ + autogen.sh \ +-- +2.14.3 + diff --git a/meta-citadel/recipes-desktop/zenity/zenity/0002-Don-t-include-gdialog.patch b/meta-citadel/recipes-desktop/zenity/zenity/0002-Don-t-include-gdialog.patch new file mode 100644 index 0000000..8a958d3 --- /dev/null +++ b/meta-citadel/recipes-desktop/zenity/zenity/0002-Don-t-include-gdialog.patch @@ -0,0 +1,36 @@ +From 34427159313638292e6f06b18137c7de4de65ea3 Mon Sep 17 00:00:00 2001 +From: brl +Date: Tue, 12 Dec 2017 20:13:06 -0500 +Subject: [PATCH] Don't include gdialog + +--- + src/Makefile.am | 9 +-------- + 1 file changed, 1 insertion(+), 8 deletions(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +index bcdd205..ff70892 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -1,7 +1,5 @@ + bin_PROGRAMS = zenity + +-bin_SCRIPTS = gdialog +- + zenity_SOURCES = \ + about.c \ + calendar.c \ +@@ -48,10 +46,5 @@ uidir = $(datadir)/zenity + ui_DATA = \ + zenity.ui + +-DISTCLEANFILES= \ +- gdialog +- + EXTRA_DIST = \ +- $(ui_DATA) \ +- gdialog \ +- gdialog.in ++ $(ui_DATA) +-- +2.14.3 + diff --git a/meta-citadel/recipes-desktop/zenity/zenity_3.24.0.bb b/meta-citadel/recipes-desktop/zenity/zenity_3.24.0.bb new file mode 100644 index 0000000..48380c4 --- /dev/null +++ b/meta-citadel/recipes-desktop/zenity/zenity_3.24.0.bb @@ -0,0 +1,3 @@ +require zenity.inc +SRC_URI[archive.md5sum] = "c905318c3ca76172d53829ed2471ac53" +SRC_URI[archive.sha256sum] = "6ff0a026ec94e5bc1b30f78df91e54f4f82fd982f4c29b52fe5dacc886a9f7f7" diff --git a/meta-citadel/recipes-desktop/zenity/zenity_3.26.0.bb b/meta-citadel/recipes-desktop/zenity/zenity_3.26.0.bb new file mode 100644 index 0000000..f47e678 --- /dev/null +++ b/meta-citadel/recipes-desktop/zenity/zenity_3.26.0.bb @@ -0,0 +1,3 @@ +require zenity.inc +SRC_URI[archive.md5sum] = "7c28ce3f953de31a7a5c6311a3c5d607" +SRC_URI[archive.sha256sum] = "6a7f34626dd62b751fe22bcdb32f3558f8a8fdddcc9406893dd264f0ac18e830" diff --git a/meta-citadel/recipes-devtools/autoconf/autoconf213.bb b/meta-citadel/recipes-devtools/autoconf/autoconf213.bb new file mode 100644 index 0000000..acc829e --- /dev/null +++ b/meta-citadel/recipes-devtools/autoconf/autoconf213.bb @@ -0,0 +1,26 @@ + +# ugh.... +# https://bugzilla.mozilla.org/show_bug.cgi?id=104642 + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=361b6b837cad26c6900a926b62aada5f" + +SRC_URI = "http://ftp.gnu.org/gnu/autoconf/autoconf-2.13.tar.gz" +SRC_URI[md5sum] = "9de56d4a161a723228220b0f425dc711" +SRC_URI[sha256sum] = "f0611136bee505811e9ca11ca7ac188ef5323a8e2ef19cffd3edb3cf08fd791e" + +DEPENDS = "m4-native gnu-config-native" +RDEPENDS_${PN} = "perl" +export PERL = "${USRBINPATH}/perl" +S = "${WORKDIR}/autoconf-2.13" +FILES_${PN} += "/usr/share/autoconf" + +inherit autotools showvars + +do_configure() { + oe_runconf --program-suffix=213 --infodir=${D}/${infodir} --bindir=${D}/${bindir} --datadir=${D}/${datadir} +} + +EXTRA_OECONF = "--program-suffix=213" +BBCLASSEXTEND = "native" + diff --git a/meta-citadel/recipes-devtools/meson/meson/0001-use-exe-wrapper-for-custom-targets.patch b/meta-citadel/recipes-devtools/meson/meson/0001-use-exe-wrapper-for-custom-targets.patch new file mode 100644 index 0000000..db0b7db --- /dev/null +++ b/meta-citadel/recipes-devtools/meson/meson/0001-use-exe-wrapper-for-custom-targets.patch @@ -0,0 +1,68 @@ +From 221d6ad64908cec5f9eca85abbb6685e7117d2a4 Mon Sep 17 00:00:00 2001 +From: brl +Date: Mon, 18 Dec 2017 14:55:04 -0500 +Subject: [PATCH] use exe wrapper for custom targets + +--- + mesonbuild/backend/backends.py | 39 ++++++++++++++++++++++++++++++--------- + 1 file changed, 30 insertions(+), 9 deletions(-) + +diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py +index 3f1e4ced..43091164 100644 +--- a/mesonbuild/backend/backends.py ++++ b/mesonbuild/backend/backends.py +@@ -634,21 +634,42 @@ class Backend: + deps.append(os.path.join(self.build_to_src, sp, 'meson_options.txt')) + return deps + ++ ++ def exe_object_needs_wrapper(self, exe): ++ return isinstance(exe, build.BuildTarget) and exe.is_cross and \ ++ self.environment.is_cross_build() and \ ++ self.environment.cross_info.need_exe_wrapper() ++ ++ def wrapped_exe_to_cmd_array(self, exe): ++ if 'exe_wrapper' not in self.environment.cross_info.config['binaries']: ++ s = 'Can not use target %s as a generator because it is cross-built\n' ++ s += 'and no exe wrapper is defined. You might want to set it to native instead.' ++ s = s % exe.name ++ raise MesonException(s) ++ ++ exe_wrapper = self.environment.cross_info.config['binaries'].get('exe_wrapper') ++ exe_path = os.path.join(self.environment.get_build_dir(), self.get_target_filename(exe)) ++ return [exe_wrapper, exe_path] ++ ++ ++ + def exe_object_to_cmd_array(self, exe): +- if self.environment.is_cross_build() and \ +- self.environment.cross_info.need_exe_wrapper() and \ +- isinstance(exe, build.BuildTarget) and exe.is_cross: +- if 'exe_wrapper' not in self.environment.cross_info.config['binaries']: +- s = 'Can not use target %s as a generator because it is cross-built\n' +- s += 'and no exe wrapper is defined. You might want to set it to native instead.' +- s = s % exe.name +- raise MesonException(s) +- if isinstance(exe, build.BuildTarget): ++ need_wrapper = \ ++ isinstance(exe, build.BuildTarget) and \ ++ exe.is_cross and \ ++ self.environment.is_cross_build() and \ ++ self.environment.cross_info.need_exe_wrapper() ++ ++ if need_wrapper: ++ exe_arr = self.wrapped_exe_to_cmd_array(exe) ++ elif isinstance(exe, build.BuildTarget): + exe_arr = [os.path.join(self.environment.get_build_dir(), self.get_target_filename(exe))] + else: + exe_arr = exe.get_command() ++ + return exe_arr + ++ + def replace_extra_args(self, args, genlist): + final_args = [] + for a in args: +-- +2.14.3 + diff --git a/meta-citadel/recipes-devtools/meson/meson/native_bindir.patch b/meta-citadel/recipes-devtools/meson/meson/native_bindir.patch new file mode 100644 index 0000000..993e975 --- /dev/null +++ b/meta-citadel/recipes-devtools/meson/meson/native_bindir.patch @@ -0,0 +1,71 @@ +There are some discussions upstream to merge this patch, but I presonaly believe +that is is OE only. https://github.com/mesonbuild/meson/issues/1849#issuecomment-303730323 + +Upstream-Status: Inappropriate [OE specific] +Signed-off-by: Ricardo Ribalda Delgado +diff --git a/mesonbuild/dependencies.py b/mesonbuild/dependencies.py +index 04a22f985941..3e33bc4a79e7 100644 +--- a/mesonbuild/dependencies.py ++++ b/mesonbuild/dependencies.py +@@ -95,7 +95,7 @@ class Dependency: + def need_threads(self): + return False + +- def get_pkgconfig_variable(self, variable_name): ++ def get_pkgconfig_variable(self, variable_name, use_native=False): + raise MesonException('Tried to get a pkg-config variable from a non-pkgconfig dependency.') + + class InternalDependency(Dependency): +@@ -224,8 +224,12 @@ class PkgConfigDependency(Dependency): + return s.format(self.__class__.__name__, self.name, self.is_found, + self.version_reqs) + +- def _call_pkgbin(self, args): +- p, out = Popen_safe([self.pkgbin] + args, env=os.environ)[0:2] ++ def _call_pkgbin(self, args, use_native=False): ++ if use_native: ++ pkgbin = [self.pkgbin + "-native"] ++ else: ++ pkgbin = [self.pkgbin] ++ p, out = Popen_safe(pkgbin + args, env=os.environ)[0:2] + return p.returncode, out.strip() + + def _set_cargs(self): +@@ -259,8 +263,8 @@ class PkgConfigDependency(Dependency): + self.is_libtool = True + self.libs.append(lib) + +- def get_pkgconfig_variable(self, variable_name): +- ret, out = self._call_pkgbin(['--variable=' + variable_name, self.name]) ++ def get_pkgconfig_variable(self, variable_name, use_native=False): ++ ret, out = self._call_pkgbin(['--variable=' + variable_name, self.name], use_native=use_native) + variable = '' + if ret != 0: + if self.required: +@@ -1091,7 +1095,7 @@ class QtBaseDependency(Dependency): + self.bindir = self.get_pkgconfig_host_bins(core) + if not self.bindir: + # If exec_prefix is not defined, the pkg-config file is broken +- prefix = core.get_pkgconfig_variable('exec_prefix') ++ prefix = core.get_pkgconfig_variable('exec_prefix', use_native=True) + if prefix: + self.bindir = os.path.join(prefix, 'bin') + +@@ -1202,7 +1206,7 @@ class Qt5Dependency(QtBaseDependency): + QtBaseDependency.__init__(self, 'qt5', env, kwargs) + + def get_pkgconfig_host_bins(self, core): +- return core.get_pkgconfig_variable('host_bins') ++ return core.get_pkgconfig_variable('host_bins', use_native=True) + + class Qt4Dependency(QtBaseDependency): + def __init__(self, env, kwargs): +@@ -1216,7 +1220,7 @@ class Qt4Dependency(QtBaseDependency): + applications = ['moc', 'uic', 'rcc', 'lupdate', 'lrelease'] + for application in applications: + try: +- return os.path.dirname(core.get_pkgconfig_variable('%s_location' % application)) ++ return os.path.dirname(core.get_pkgconfig_variable('%s_location' % application, use_native=True)) + except MesonException: + pass + diff --git a/meta-citadel/recipes-devtools/meson/meson_0.40.1.bb b/meta-citadel/recipes-devtools/meson/meson_0.40.1.bb new file mode 100644 index 0000000..14644ba --- /dev/null +++ b/meta-citadel/recipes-devtools/meson/meson_0.40.1.bb @@ -0,0 +1,20 @@ +HOMEPAGE = "http://mesonbuild.com" +SUMMARY = "A high performance build system" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57" + +SRC_URI = " \ + git://github.com/mesonbuild/meson.git \ + file://native_bindir.patch \ +" + +SRCREV = "b25d3e4d3f2b4d37029a507cc089bdde643c6240" + +S = "${WORKDIR}/git" + +inherit setuptools3 + +RDEPENDS_${PN} = "ninja python3-core python3-modules" + +BBCLASSEXTEND = "native" diff --git a/meta-citadel/recipes-devtools/meson/meson_0.44.0.bb b/meta-citadel/recipes-devtools/meson/meson_0.44.0.bb new file mode 100644 index 0000000..008a503 --- /dev/null +++ b/meta-citadel/recipes-devtools/meson/meson_0.44.0.bb @@ -0,0 +1,19 @@ +HOMEPAGE = "http://mesonbuild.com" +SUMMARY = "A high performance build system" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57" + +SRC_URI = "git://github.com/mesonbuild/meson.git \ + file://0001-use-exe-wrapper-for-custom-targets.patch \ + " + +SRCREV = "e674434389249d9b65e6403eb608e4c33d1d48cb" + +S = "${WORKDIR}/git" + +inherit setuptools3 + +RDEPENDS_${PN} = "ninja python3-core python3-modules" + +BBCLASSEXTEND = "native" diff --git a/meta-citadel/recipes-devtools/python/python3_%.bbappend b/meta-citadel/recipes-devtools/python/python3_%.bbappend new file mode 100644 index 0000000..6ddc9e4 --- /dev/null +++ b/meta-citadel/recipes-devtools/python/python3_%.bbappend @@ -0,0 +1,4 @@ +DEPENDS += "paxctl-native" +do_install_append() { + paxctl -cm ${D}${bindir}/python3.5 +} diff --git a/meta-citadel/recipes-kernel/linux/files/0114-smpboot-reuse-timer-calibration.patch b/meta-citadel/recipes-kernel/linux/files/0114-smpboot-reuse-timer-calibration.patch new file mode 100644 index 0000000..5fe8cdf --- /dev/null +++ b/meta-citadel/recipes-kernel/linux/files/0114-smpboot-reuse-timer-calibration.patch @@ -0,0 +1,31 @@ +From 283fcb879f66da9659f1983bcf173476bae9292b Mon Sep 17 00:00:00 2001 +From: Arjan van de Ven +Date: Wed, 11 Feb 2015 17:28:14 -0600 +Subject: [PATCH 114/126] smpboot: reuse timer calibration + +NO point recalibrating for known-constant tsc... saves 200ms+ of boot time. + +Author: Arjan van de Ven + +Signed-off-by: Miguel Bernal Marin +--- + arch/x86/kernel/tsc.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c +index ad2b925a808e..6aed4e79f290 100644 +--- a/arch/x86/kernel/tsc.c ++++ b/arch/x86/kernel/tsc.c +@@ -1352,6 +1352,9 @@ unsigned long calibrate_delay_is_known(void) + if (tsc_disabled || !constant_tsc || !mask) + return 0; + ++ if (cpu != 0) ++ return cpu_data(0).loops_per_jiffy; ++ + sibling = cpumask_any_but(mask, cpu); + if (sibling < nr_cpu_ids) + return cpu_data(sibling).loops_per_jiffy; +-- +2.15.0 + diff --git a/meta-citadel/recipes-kernel/linux/files/0116-Initialize-ata-before-graphics.patch b/meta-citadel/recipes-kernel/linux/files/0116-Initialize-ata-before-graphics.patch new file mode 100644 index 0000000..9bc70d6 --- /dev/null +++ b/meta-citadel/recipes-kernel/linux/files/0116-Initialize-ata-before-graphics.patch @@ -0,0 +1,47 @@ +From a8f79e6e347a5d884ea8d351631a6f6e899060cc Mon Sep 17 00:00:00 2001 +From: Arjan van de Ven +Date: Thu, 2 Jun 2016 23:36:32 -0500 +Subject: [PATCH 116/126] Initialize ata before graphics + +ATA init is the long pole in the boot process, and its asynchronous. +move the graphics init after it so that ata and graphics initialize +in parallel +--- + drivers/Makefile | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +diff --git a/drivers/Makefile b/drivers/Makefile +index d242d3514d30..b73656e2caa0 100644 +--- a/drivers/Makefile ++++ b/drivers/Makefile +@@ -61,14 +61,9 @@ obj-y += char/ + # iommu/ comes before gpu as gpu are using iommu controllers + obj-$(CONFIG_IOMMU_SUPPORT) += iommu/ + +-# gpu/ comes after char for AGP vs DRM startup and after iommu +-obj-y += gpu/ + + obj-$(CONFIG_CONNECTOR) += connector/ + +-# i810fb and intelfb depend on char/agp/ +-obj-$(CONFIG_FB_I810) += video/fbdev/i810/ +-obj-$(CONFIG_FB_INTEL) += video/fbdev/intelfb/ + + obj-$(CONFIG_PARPORT) += parport/ + obj-$(CONFIG_NVM) += lightnvm/ +@@ -82,6 +77,12 @@ obj-$(CONFIG_IDE) += ide/ + obj-$(CONFIG_SCSI) += scsi/ + obj-y += nvme/ + obj-$(CONFIG_ATA) += ata/ ++ ++# gpu/ comes after char for AGP vs DRM startup and after iommu ++obj-y += gpu/ ++# i810fb and intelfb depend on char/agp/ ++obj-$(CONFIG_FB_I810) += video/fbdev/i810/ ++obj-$(CONFIG_FB_INTEL) += video/fbdev/intelfb/ + obj-$(CONFIG_TARGET_CORE) += target/ + obj-$(CONFIG_MTD) += mtd/ + obj-$(CONFIG_SPI) += spi/ +-- +2.15.0 + diff --git a/meta-citadel/recipes-kernel/linux/files/defconfig b/meta-citadel/recipes-kernel/linux/files/defconfig index 701b590..c1112cd 100644 --- a/meta-citadel/recipes-kernel/linux/files/defconfig +++ b/meta-citadel/recipes-kernel/linux/files/defconfig @@ -332,8 +332,6 @@ CONFIG_MODULE_SIG_SHA256=y # CONFIG_MODULE_SIG_SHA512 is not set CONFIG_MODULE_SIG_HASH="sha256" # CONFIG_MODULE_COMPRESS is not set -# CONFIG_MODULE_COMPRESS_GZIP is not set -# CONFIG_MODULE_COMPRESS_XZ is not set # CONFIG_TRIM_UNUSED_KSYMS is not set CONFIG_MODULES_TREE_LOOKUP=y CONFIG_BLOCK=y @@ -1737,7 +1735,7 @@ CONFIG_MOUSE_PS2_FOCALTECH=y # CONFIG_MOUSE_PS2_VMMOUSE is not set # CONFIG_MOUSE_SERIAL is not set CONFIG_MOUSE_APPLETOUCH=m -# CONFIG_MOUSE_BCM5974 is not set +CONFIG_MOUSE_BCM5974=m # CONFIG_MOUSE_CYAPA is not set CONFIG_MOUSE_ELAN_I2C=m CONFIG_MOUSE_ELAN_I2C_I2C=y @@ -3321,7 +3319,7 @@ CONFIG_USB_WDM=m # # also be needed; see USB_STORAGE Help for more info # -CONFIG_USB_STORAGE=m +CONFIG_USB_STORAGE=y # CONFIG_USB_STORAGE_DEBUG is not set # CONFIG_USB_STORAGE_REALTEK is not set # CONFIG_USB_STORAGE_DATAFAB is not set @@ -4338,10 +4336,14 @@ CONFIG_UEFI_CPER=y # File systems # CONFIG_DCACHE_WORD_ACCESS=y -# CONFIG_EXT2_FS is not set -# CONFIG_EXT3_FS is not set +CONFIG_EXT2_FS=y +CONFIG_EXT2_FS_XATTR=y +CONFIG_EXT2_FS_POSIX_ACL=y +CONFIG_EXT2_FS_SECURITY=y +CONFIG_EXT3_FS=y +CONFIG_EXT3_FS_POSIX_ACL=y +CONFIG_EXT3_FS_SECURITY=y CONFIG_EXT4_FS=y -CONFIG_EXT4_USE_FOR_EXT2=y CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y CONFIG_EXT4_ENCRYPTION=y @@ -4730,8 +4732,8 @@ CONFIG_PAX=y # CONFIG_PAX_SOFTMODE=y # CONFIG_PAX_EI_PAX is not set -# CONFIG_PAX_PT_PAX_FLAGS is not set -CONFIG_PAX_XATTR_PAX_FLAGS=y +CONFIG_PAX_PT_PAX_FLAGS=y +# CONFIG_PAX_XATTR_PAX_FLAGS is not set CONFIG_PAX_NO_ACL_FLAGS=y # CONFIG_PAX_HAVE_ACL_FLAGS is not set # CONFIG_PAX_HOOK_ACL_FLAGS is not set @@ -4809,7 +4811,7 @@ CONFIG_GRKERNSEC_ACL_TIMEOUT=30 CONFIG_GRKERNSEC_LINK=y # CONFIG_GRKERNSEC_SYMLINKOWN is not set CONFIG_GRKERNSEC_FIFO=y -CONFIG_GRKERNSEC_SYSFS_RESTRICT=y +# CONFIG_GRKERNSEC_SYSFS_RESTRICT is not set CONFIG_GRKERNSEC_ROFS=y CONFIG_GRKERNSEC_DEVICE_SIDECHANNEL=y CONFIG_GRKERNSEC_CHROOT=y @@ -5105,8 +5107,8 @@ CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y CONFIG_HAVE_KVM_IRQ_BYPASS=y CONFIG_VIRTUALIZATION=y CONFIG_KVM=y -CONFIG_KVM_INTEL=y -CONFIG_KVM_AMD=y +CONFIG_KVM_INTEL=m +CONFIG_KVM_AMD=m # CONFIG_KVM_DEVICE_ASSIGNMENT is not set CONFIG_VHOST_NET=m CONFIG_VHOST_VSOCK=y diff --git a/meta-citadel/recipes-kernel/linux/linux-citadel.inc b/meta-citadel/recipes-kernel/linux/linux-citadel.inc index ac10b7b..d544388 100644 --- a/meta-citadel/recipes-kernel/linux/linux-citadel.inc +++ b/meta-citadel/recipes-kernel/linux/linux-citadel.inc @@ -17,6 +17,8 @@ SRC_URI += "https://github.com/minipli/linux-unofficial_grsec/releases/download/ SRC_URI += " \ file://defconfig \ file://ignore-sysroot-for-plugin-build.patch \ + file://0114-smpboot-reuse-timer-calibration.patch \ + file://0116-Initialize-ata-before-graphics.patch \ " S = "${WORKDIR}/linux-${LINUX_VERSION}" @@ -26,6 +28,9 @@ do_deploy_append() { ln -sf bzImage-initramfs${KERNEL_IMAGE_BASE_NAME}.bin ${DEPLOYDIR}/bzImage } +# Don't install kernel into images, see kernel.bbclass +RDEPENDS_kernel-base = "" + # # https://github.com/96boards/meta-96boards/issues/81#issuecomment-311256044 # https://github.com/96boards/meta-96boards/blob/master/recipes-kernel/linux/linux-96boards_4.4.bb diff --git a/meta-citadel/recipes-support/cryptsetup/cryptsetup_1.7.4.bb b/meta-citadel/recipes-support/cryptsetup/cryptsetup_1.7.4.bb new file mode 100644 index 0000000..b10f66f --- /dev/null +++ b/meta-citadel/recipes-support/cryptsetup/cryptsetup_1.7.4.bb @@ -0,0 +1,38 @@ +SUMMARY = "Manage plain dm-crypt and LUKS encrypted volumes" +DESCRIPTION = "Cryptsetup is used to conveniently setup dm-crypt managed \ +device-mapper mappings. These include plain dm-crypt volumes and \ +LUKS volumes. The difference is that LUKS uses a metadata header \ +and can hence offer more features than plain dm-crypt. On the other \ +hand, the header is visible and vulnerable to damage." +HOMEPAGE = "http://code.google.com/p/cryptsetup/" +SECTION = "console" +LICENSE = "GPL-2.0-with-OpenSSL-exception" +LIC_FILES_CHKSUM = "file://COPYING;md5=32107dd283b1dfeb66c9b3e6be312326" + +DEPENDS = "util-linux libdevmapper popt libgcrypt" + +SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v1.7/${BP}.tar.xz" +SRC_URI[md5sum] = "058ed35c5b776032c2a036838f9e22a7" +SRC_URI[sha256sum] = "7ccf893ef79a38fb92d61f03c17b964982119f5319cdaa85a1335b8558cca016" + +inherit autotools gettext pkgconfig + +# Use openssl because libgcrypt drops root privileges +# if libgcrypt is linked with libcap support +PACKAGECONFIG ??= "openssl" +PACKAGECONFIG[openssl] = "--with-crypto_backend=openssl,,openssl" +PACKAGECONFIG[gcrypt] = "--with-crypto_backend=gcrypt,,libgcrypt" + +RDEPENDS_${PN} += "lvm2 lvm2-udevrules" + +RRECOMMENDS_${PN} = "kernel-module-aes-generic \ + kernel-module-dm-crypt \ + kernel-module-md5 \ + kernel-module-cbc \ + kernel-module-sha256-generic \ + kernel-module-xts \ +" + +EXTRA_OECONF = "--enable-static" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-citadel/recipes-support/libpcre/libpcre2_%.bbappend b/meta-citadel/recipes-support/libpcre/libpcre2_%.bbappend new file mode 100644 index 0000000..fa384ea --- /dev/null +++ b/meta-citadel/recipes-support/libpcre/libpcre2_%.bbappend @@ -0,0 +1 @@ +EXTRA_OECONF = "--enable-jit" diff --git a/meta-citadel/recipes-support/libsass/libsass_3.4.7.bb b/meta-citadel/recipes-support/libsass/libsass_3.4.7.bb new file mode 100644 index 0000000..ee34585 --- /dev/null +++ b/meta-citadel/recipes-support/libsass/libsass_3.4.7.bb @@ -0,0 +1,14 @@ +SUMMARY = "A C/C++ implementation of a Sass compiler" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=8f34396ca205f5e119ee77aae91fa27d \ + file://LICENSE;md5=2f8a76980411a3f1f1480b141ce06744" + +SRC_URI = "https://github.com/sass/libsass/archive/${PV}.tar.gz;downloadfilename=${PN}-${PV}.tar.gz" +SRC_URI[md5sum] = "dcac228e89511d25ea926aa3d98d7b44" +SRC_URI[sha256sum] = "855c40528b897d06ae4d24606c2db3cd09bb38de5b46b28e835f9d4fd4d7ab95" + +inherit autotools + +EXTRA_OECONF = "" +BBCLASSEXTEND = "native" + diff --git a/meta-citadel/recipes-support/libseccomp/libseccomp_2.3.2.bb b/meta-citadel/recipes-support/libseccomp/libseccomp_2.3.2.bb new file mode 100644 index 0000000..8adf219 --- /dev/null +++ b/meta-citadel/recipes-support/libseccomp/libseccomp_2.3.2.bb @@ -0,0 +1,11 @@ +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://LICENSE;md5=7c13b3376cea0ce68d2d2da0a1b3a72c" + +SRC_URI = "https://github.com/seccomp/libseccomp/releases/download/v${PV}/libseccomp-${PV}.tar.gz" +SRC_URI[md5sum] = "e74a626bea0cd607c23229b10b5f93da" +SRC_URI[sha256sum] = "3ddc8c037956c0a5ac19664ece4194743f59e1ccd4adde848f4f0dae7f77bca1" + +inherit autotools + +EXTRA_OECONF = "" + diff --git a/meta-citadel/recipes-support/lvm2/files/0001-Avoid-bashisms-in-init-scripts.patch b/meta-citadel/recipes-support/lvm2/files/0001-Avoid-bashisms-in-init-scripts.patch new file mode 100644 index 0000000..e86ab25 --- /dev/null +++ b/meta-citadel/recipes-support/lvm2/files/0001-Avoid-bashisms-in-init-scripts.patch @@ -0,0 +1,182 @@ +From 916ea0c70fd063ab7b81f16fd917a75dc02edf4f Mon Sep 17 00:00:00 2001 +From: Peter Kjellerstedt +Date: Fri, 17 Mar 2017 03:18:28 +0100 +Subject: [PATCH] Avoid bashisms in init scripts + +Upstream-Status: Inappropriate + +Signed-off-by: Peter Kjellerstedt +--- + scripts/blk_availability_init_red_hat.in | 4 ++-- + scripts/clvmd_init_red_hat.in | 6 +++--- + scripts/cmirrord_init_red_hat.in | 4 ++-- + scripts/lvm2_cluster_activation_red_hat.sh.in | 4 ++-- + scripts/lvm2_lvmetad_init_red_hat.in | 4 ++-- + scripts/lvm2_lvmpolld_init_red_hat.in | 4 ++-- + scripts/lvm2_monitoring_init_red_hat.in | 4 ++-- + scripts/lvm2_monitoring_init_rhel4 | 4 ++-- + 8 files changed, 17 insertions(+), 17 deletions(-) + +diff --git a/scripts/blk_availability_init_red_hat.in b/scripts/blk_availability_init_red_hat.in +index a84ffe7..6b855b7 100644 +--- a/scripts/blk_availability_init_red_hat.in ++++ b/scripts/blk_availability_init_red_hat.in +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/bin/sh + # + # Copyright (C) 2012 Red Hat, Inc. All rights reserved. + # +@@ -53,6 +53,6 @@ case "$1" in + status) + ;; + *) +- echo $"Usage: $0 {start|stop|status}" ++ echo "Usage: $0 {start|stop|status}" + ;; + esac +diff --git a/scripts/clvmd_init_red_hat.in b/scripts/clvmd_init_red_hat.in +index d7f3392..abc8011 100644 +--- a/scripts/clvmd_init_red_hat.in ++++ b/scripts/clvmd_init_red_hat.in +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/bin/sh + # + # clvmd - Clustered LVM Daemon init script + # +@@ -161,7 +161,7 @@ restart() { + fi + } + +-[ "$EUID" != "0" ] && { ++[ "$(id -u)" != "0" ] && { + echo "clvmd init script can only be executed as root user" + exit 4 + } +@@ -206,7 +206,7 @@ case "$1" in + ;; + + *) +- echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" ++ echo "Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" + rtrn=2 + ;; + esac +diff --git a/scripts/cmirrord_init_red_hat.in b/scripts/cmirrord_init_red_hat.in +index d4b7e37..d442cbc 100755 +--- a/scripts/cmirrord_init_red_hat.in ++++ b/scripts/cmirrord_init_red_hat.in +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/bin/sh + # + # chkconfig: - 22 78 + # description: Starts and stops cmirrord +@@ -101,7 +101,7 @@ case "$1" in + ;; + + *) +- echo $"Usage: $0 {start|stop|restart|status}" ++ echo "Usage: $0 {start|stop|restart|status}" + ;; + esac + +diff --git a/scripts/lvm2_cluster_activation_red_hat.sh.in b/scripts/lvm2_cluster_activation_red_hat.sh.in +index abea026..d8cba2e 100644 +--- a/scripts/lvm2_cluster_activation_red_hat.sh.in ++++ b/scripts/lvm2_cluster_activation_red_hat.sh.in +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/bin/sh + + sbindir=@sbindir@ + +@@ -54,7 +54,7 @@ case "$1" in + rtrn=$? + ;; + *) +- echo $"Usage: $0 {activate|deactivate}" ++ echo "Usage: $0 {activate|deactivate}" + rtrn=3 + ;; + esac +diff --git a/scripts/lvm2_lvmetad_init_red_hat.in b/scripts/lvm2_lvmetad_init_red_hat.in +index b2f5d50..96269a9 100644 +--- a/scripts/lvm2_lvmetad_init_red_hat.in ++++ b/scripts/lvm2_lvmetad_init_red_hat.in +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/bin/sh + # + # Copyright (C) 2012 Red Hat, Inc. All rights reserved. + # +@@ -105,7 +105,7 @@ case "$1" in + ;; + + *) +- echo $"Usage: $0 {start|stop|force-stop|restart|condrestart|try-restart|status}" ++ echo "Usage: $0 {start|stop|force-stop|restart|condrestart|try-restart|status}" + ;; + esac + +diff --git a/scripts/lvm2_lvmpolld_init_red_hat.in b/scripts/lvm2_lvmpolld_init_red_hat.in +index c521955..cdbaece 100644 +--- a/scripts/lvm2_lvmpolld_init_red_hat.in ++++ b/scripts/lvm2_lvmpolld_init_red_hat.in +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/bin/sh + # + # Copyright (C) 2015 Red Hat, Inc. All rights reserved. + # +@@ -107,7 +107,7 @@ case "$1" in + ;; + + *) +- echo $"Usage: $0 {start|stop|force-stop|restart|condrestart|try-restart|status}" ++ echo "Usage: $0 {start|stop|force-stop|restart|condrestart|try-restart|status}" + ;; + esac + +diff --git a/scripts/lvm2_monitoring_init_red_hat.in b/scripts/lvm2_monitoring_init_red_hat.in +index de7ff0d..9ff6bb7 100644 +--- a/scripts/lvm2_monitoring_init_red_hat.in ++++ b/scripts/lvm2_monitoring_init_red_hat.in +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/bin/sh + # + # Copyright (C) 2007-2009 Red Hat, Inc. All rights reserved. + # +@@ -128,7 +128,7 @@ case "$1" in + ;; + + *) +- echo $"Usage: $0 {start|stop|restart|status|force-stop}" ++ echo "Usage: $0 {start|stop|restart|status|force-stop}" + ;; + esac + +diff --git a/scripts/lvm2_monitoring_init_rhel4 b/scripts/lvm2_monitoring_init_rhel4 +index 8eb06c5..2e8d0f7 100644 +--- a/scripts/lvm2_monitoring_init_rhel4 ++++ b/scripts/lvm2_monitoring_init_rhel4 +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/bin/sh + # + # Copyright (C) 2007 Red Hat, Inc. All rights reserved. + # +@@ -93,7 +93,7 @@ case "$1" in + ;; + + *) +- echo $"Usage: $0 {start|stop|restart|status|force-stop}" ++ echo "Usage: $0 {start|stop|restart|status|force-stop}" + ;; + esac + +-- +2.12.0 + diff --git a/meta-citadel/recipes-support/lvm2/files/0001-implement-libc-specific-reopen_stream.patch b/meta-citadel/recipes-support/lvm2/files/0001-implement-libc-specific-reopen_stream.patch new file mode 100644 index 0000000..5d72402 --- /dev/null +++ b/meta-citadel/recipes-support/lvm2/files/0001-implement-libc-specific-reopen_stream.patch @@ -0,0 +1,79 @@ +From e3103459416616d3b8508e7176e897b0ae6c90f2 Mon Sep 17 00:00:00 2001 +From: Dengke Du +Date: Tue, 25 Oct 2016 11:49:40 +0000 +Subject: [PATCH] implement libc specific reopen_stream + +musl defines stdin/stdio/stderr as constant types which means +we can not assign to them as we are doing here but works ok with glibc +therefore abstract out the _reopen_stream definition depending upon if +we are using glibc or otherwise + +Origin: +http://git.alpinelinux.org/cgit/aports/tree/main/lvm2/fix-stdio-usage.patch + +Signed-off-by: Khem Raj +Signed-off-by: Dengke Du + +--- + lib/log/log.c | 6 ++++++ + tools/lvmcmdline.c | 6 +++--- + 2 files changed, 9 insertions(+), 3 deletions(-) + +diff --git a/lib/log/log.c b/lib/log/log.c +index c933154..3581084 100644 +--- a/lib/log/log.c ++++ b/lib/log/log.c +@@ -161,6 +161,7 @@ static void _check_and_replace_standard_log_streams(FILE *old_stream, FILE *new_ + * Close and reopen standard stream on file descriptor fd. + */ + int reopen_standard_stream(FILE **stream, const char *mode) ++#ifdef __GLIBC__ + { + int fd, fd_copy, new_fd; + const char *name; +@@ -207,6 +208,11 @@ int reopen_standard_stream(FILE **stream, const char *mode) + *stream = new_stream; + return 1; + } ++#else ++{ ++ return (freopen(NULL, mode, *stream) != NULL); ++} ++#endif + + void init_log_fn(lvm2_log_fn_t log_fn) + { +diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c +index 9a4deb7..f1f18e6 100644 +--- a/tools/lvmcmdline.c ++++ b/tools/lvmcmdline.c +@@ -1818,7 +1818,7 @@ static int _check_standard_fds(void) + int err = is_valid_fd(STDERR_FILENO); + + if (!is_valid_fd(STDIN_FILENO) && +- !(stdin = fopen(_PATH_DEVNULL, "r"))) { ++ !freopen(_PATH_DEVNULL, "r", stdin)) { + if (err) + perror("stdin stream open"); + else +@@ -1828,7 +1828,7 @@ static int _check_standard_fds(void) + } + + if (!is_valid_fd(STDOUT_FILENO) && +- !(stdout = fopen(_PATH_DEVNULL, "w"))) { ++ !freopen(_PATH_DEVNULL, "w", stdout)) { + if (err) + perror("stdout stream open"); + /* else no stdout */ +@@ -1836,7 +1836,7 @@ static int _check_standard_fds(void) + } + + if (!is_valid_fd(STDERR_FILENO) && +- !(stderr = fopen(_PATH_DEVNULL, "w"))) { ++ !freopen(_PATH_DEVNULL, "w", stderr)) { + printf("stderr stream open: %s\n", + strerror(errno)); + return 0; +-- +2.12.0 + diff --git a/meta-citadel/recipes-support/lvm2/files/0002-Guard-use-of-mallinfo-with-__GLIBC__.patch b/meta-citadel/recipes-support/lvm2/files/0002-Guard-use-of-mallinfo-with-__GLIBC__.patch new file mode 100644 index 0000000..95dcede --- /dev/null +++ b/meta-citadel/recipes-support/lvm2/files/0002-Guard-use-of-mallinfo-with-__GLIBC__.patch @@ -0,0 +1,30 @@ +From 3ae9c0b607ec33fb07f32a41e9d28cc9068dd39a Mon Sep 17 00:00:00 2001 +From: Dengke Du +Date: Tue, 25 Oct 2016 11:52:44 +0000 +Subject: [PATCH] Guard use of mallinfo() with __GLIBC__ + +This API is glibc-only + +Signed-off-by: Khem Raj +Signed-off-by: Dengke Du + +--- + lib/mm/memlock.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/mm/memlock.c b/lib/mm/memlock.c +index da90144..f34f890 100644 +--- a/lib/mm/memlock.c ++++ b/lib/mm/memlock.c +@@ -150,7 +150,7 @@ static void _touch_memory(void *mem, size_t size) + + static void _allocate_memory(void) + { +-#ifndef VALGRIND_POOL ++#if !defined(VALGRIND_POOL) && defined(__GLIBC__) + void *stack_mem; + struct rlimit limit; + int i, area = 0, missing = _size_malloc_tmp, max_areas = 32, hblks; +-- +2.12.0 + diff --git a/meta-citadel/recipes-support/lvm2/files/0003-include-fcntl.h-for-O_-defines-and-fcntl-signature.patch b/meta-citadel/recipes-support/lvm2/files/0003-include-fcntl.h-for-O_-defines-and-fcntl-signature.patch new file mode 100644 index 0000000..9ab1c06 --- /dev/null +++ b/meta-citadel/recipes-support/lvm2/files/0003-include-fcntl.h-for-O_-defines-and-fcntl-signature.patch @@ -0,0 +1,30 @@ +From b1ad91a059d99afd1ce25823b7c0a8d3ac63d2fd Mon Sep 17 00:00:00 2001 +From: Dengke Du +Date: Tue, 25 Oct 2016 11:55:49 +0000 +Subject: [PATCH 3/4] include fcntl.h for O_* defines and fcntl() signature + +On glibc _somehow_ this header gets pulled in indirectly + +Signed-off-by: Khem Raj +Signed-off-by: Dengke Du +--- +Upstream-Status: Pending +--- + libdaemon/server/daemon-server.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libdaemon/server/daemon-server.c b/libdaemon/server/daemon-server.c +index 6af6de9..a9590e7 100644 +--- a/libdaemon/server/daemon-server.c ++++ b/libdaemon/server/daemon-server.c +@@ -18,6 +18,7 @@ + #include "daemon-server.h" + #include "daemon-log.h" + ++#include + #include + #include + #include +-- +2.9.3 + diff --git a/meta-citadel/recipes-support/lvm2/files/0004-tweak-MODPROBE_CMD-for-cross-compile.patch b/meta-citadel/recipes-support/lvm2/files/0004-tweak-MODPROBE_CMD-for-cross-compile.patch new file mode 100644 index 0000000..aaeaa72 --- /dev/null +++ b/meta-citadel/recipes-support/lvm2/files/0004-tweak-MODPROBE_CMD-for-cross-compile.patch @@ -0,0 +1,38 @@ +From 0012ea63f6070a5d41fa380970f9c30b953237d2 Mon Sep 17 00:00:00 2001 +From: Dengke Du +Date: Tue, 25 Oct 2016 11:59:40 +0000 +Subject: [PATCH 4/4] tweak MODPROBE_CMD for cross compile + +Lvm uses variable MODPROBE_CMD at runtime, so build time detection of modprobe +is incorrect. +------ +|lvm lvcreate --thinpool wrl/pool00 --size 5556m --config devices +{ preferred_names=["^/dev/mapper/", "^/dev/md/", "^/dev/sd"] +filter=["r|/loop1$|","r|/loop2$|","r|/loop3$|","r|/loop4$|","r|/loop5$|","r|/loop6$|","r|/loop7$|"] } +|tmp/sysroots/x86_64-linux/usr/bin/modprobe: execvp failed: No such file or directory +|tmp/sysroots/x86_64-linux/usr/bin/modprobe failed: 2 +------ + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Hongxu Jia +Signed-off-by: Dengke Du +--- + configure.in | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/configure.in b/configure.in +index cc77aab..a3579f2 100644 +--- a/configure.in ++++ b/configure.in +@@ -1853,7 +1853,6 @@ if test "$UDEV_SYNC" = yes; then + fi + + ################################################################################ +-AC_PATH_TOOL(MODPROBE_CMD, modprobe) + + if test -n "$MODPROBE_CMD"; then + AC_DEFINE_UNQUOTED([MODPROBE_CMD], ["$MODPROBE_CMD"], [The path to 'modprobe', if available.]) +-- +2.9.3 + diff --git a/meta-citadel/recipes-support/lvm2/files/0005-do-not-build-manual.patch b/meta-citadel/recipes-support/lvm2/files/0005-do-not-build-manual.patch new file mode 100644 index 0000000..15aa9f5 --- /dev/null +++ b/meta-citadel/recipes-support/lvm2/files/0005-do-not-build-manual.patch @@ -0,0 +1,58 @@ +From d8bb25e34d6533ba78eaae697771ee499a66706f Mon Sep 17 00:00:00 2001 +From: Hongxu Jia +Date: Wed, 2 Aug 2017 03:41:37 -0400 +Subject: [PATCH] do not build manual + +On some host (ubuntu 1404), build manual failed. +... +./tools/man-generator --primary lvscan lvscan.8_des +Failed to stat description file lvscan.8_des. +... + +Do not build man to workaround the issue. + +Upstream-Status: Pending + +Signed-off-by: Hongxu Jia +--- + Makefile.in | 4 ++-- + configure.in | 1 - + 2 files changed, 2 insertions(+), 3 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 31d428d..24f89a2 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -18,7 +18,7 @@ top_builddir = @top_builddir@ + abs_top_builddir = @abs_top_builddir@ + abs_top_srcdir = @abs_top_srcdir@ + +-SUBDIRS = conf daemons include lib libdaemon libdm man scripts tools ++SUBDIRS = conf daemons include lib libdaemon libdm scripts tools + + ifeq ("@UDEV_RULES@", "yes") + SUBDIRS += udev +@@ -69,7 +69,7 @@ liblvm.device-mapper: include.device-mapper + daemons.device-mapper: libdm.device-mapper + tools.device-mapper: libdm.device-mapper + scripts.device-mapper: include.device-mapper +-device-mapper: tools.device-mapper daemons.device-mapper man.device-mapper ++device-mapper: tools.device-mapper daemons.device-mapper + + ifeq ("@INTL@", "yes") + lib.pofile: include.pofile +diff --git a/configure.in b/configure.in +index 1dc8819..108ace4 100644 +--- a/configure.in ++++ b/configure.in +@@ -2213,7 +2213,6 @@ libdm/Makefile + libdm/libdevmapper.pc + liblvm/Makefile + liblvm/liblvm2app.pc +-man/Makefile + po/Makefile + python/Makefile + python/setup.py +-- +2.8.1 + diff --git a/meta-citadel/recipes-support/lvm2/files/0006-start-lvm2-monitor.service-after-tmp.mount.patch b/meta-citadel/recipes-support/lvm2/files/0006-start-lvm2-monitor.service-after-tmp.mount.patch new file mode 100644 index 0000000..0e68d62 --- /dev/null +++ b/meta-citadel/recipes-support/lvm2/files/0006-start-lvm2-monitor.service-after-tmp.mount.patch @@ -0,0 +1,32 @@ +From 24a2c47fd01dde1710f1fa66f5c30ce7010c5956 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia +Date: Thu, 21 Sep 2017 15:28:10 +0800 +Subject: [PATCH] start lvm2-monitor.service after tmp.mount + +The lvm2-monitor.service reqires the existence of locking_dir +("/tmp/lock/lvm"), and unit tmp.mount is to mount /tmp. +So start lvm2-monitor.service after tmp.mount + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Hongxu Jia +--- + scripts/lvm2_monitoring_systemd_red_hat.service.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/lvm2_monitoring_systemd_red_hat.service.in b/scripts/lvm2_monitoring_systemd_red_hat.service.in +index 22238b7..93b2bee 100644 +--- a/scripts/lvm2_monitoring_systemd_red_hat.service.in ++++ b/scripts/lvm2_monitoring_systemd_red_hat.service.in +@@ -2,7 +2,7 @@ + Description=Monitoring of LVM2 mirrors, snapshots etc. using dmeventd or progress polling + Documentation=man:dmeventd(8) man:lvcreate(8) man:lvchange(8) man:vgchange(8) + Requires=dm-event.socket lvm2-lvmetad.socket +-After=dm-event.socket dm-event.service lvm2-lvmetad.socket lvm2-activation.service lvm2-lvmetad.service ++After=dm-event.socket dm-event.service lvm2-lvmetad.socket lvm2-activation.service lvm2-lvmetad.service tmp.mount + Before=local-fs-pre.target + DefaultDependencies=no + Conflicts=shutdown.target +-- +1.8.3.1 + diff --git a/meta-citadel/recipes-support/lvm2/files/lvm.conf b/meta-citadel/recipes-support/lvm2/files/lvm.conf new file mode 100644 index 0000000..c2bb85d --- /dev/null +++ b/meta-citadel/recipes-support/lvm2/files/lvm.conf @@ -0,0 +1,326 @@ +# This is an example configuration file for the LVM2 system. +# It contains the default settings that would be used if there was no +# /etc/lvm/lvm.conf file. +# +# Refer to 'man lvm.conf' for further information including the file layout. +# +# To put this file in a different directory and override /etc/lvm set +# the environment variable LVM_SYSTEM_DIR before running the tools. + + +# This section allows you to configure which block devices should +# be used by the LVM system. +devices { + + # Where do you want your volume groups to appear ? + dir = "/dev" + + # An array of directories that contain the device nodes you wish + # to use with LVM2. + scan = [ "/dev" ] + + # A filter that tells LVM2 to only use a restricted set of devices. + # The filter consists of an array of regular expressions. These + # expressions can be delimited by a character of your choice, and + # prefixed with either an 'a' (for accept) or 'r' (for reject). + # The first expression found to match a device name determines if + # the device will be accepted or rejected (ignored). Devices that + # don't match any patterns are accepted. + + # Be careful if there there are symbolic links or multiple filesystem + # entries for the same device as each name is checked separately against + # the list of patterns. The effect is that if any name matches any 'a' + # pattern, the device is accepted; otherwise if any name matches any 'r' + # pattern it is rejected; otherwise it is accepted. + + # Don't have more than one filter line active at once: only one gets used. + + # Run vgscan after you change this parameter to ensure that + # the cache file gets regenerated (see below). + # If it doesn't do what you expect, check the output of 'vgscan -vvvv'. + + + # By default we accept every block device: + filter = [ "a/.*/" ] + + # Exclude the cdrom drive + # filter = [ "r|/dev/cdrom|" ] + + # When testing I like to work with just loopback devices: + # filter = [ "a/loop/", "r/.*/" ] + + # Or maybe all loops and ide drives except hdc: + # filter =[ "a|loop|", "r|/dev/hdc|", "a|/dev/ide|", "r|.*|" ] + + # Use anchors if you want to be really specific + # filter = [ "a|^/dev/hda8$|", "r/.*/" ] + + # The results of the filtering are cached on disk to avoid + # rescanning dud devices (which can take a very long time). By + # default this cache file is hidden in the /etc/lvm directory. + # It is safe to delete this file: the tools regenerate it. + cache = "/etc/lvm/.cache" + + # You can turn off writing this cache file by setting this to 0. + write_cache_state = 1 + + # Advanced settings. + + # List of pairs of additional acceptable block device types found + # in /proc/devices with maximum (non-zero) number of partitions. + # types = [ "fd", 16 ] + + # If sysfs is mounted (2.6 kernels) restrict device scanning to + # the block devices it believes are valid. + # 1 enables; 0 disables. + sysfs_scan = 1 + + # By default, LVM2 will ignore devices used as components of + # software RAID (md) devices by looking for md superblocks. + # 1 enables; 0 disables. + md_component_detection = 1 +} + +# This section that allows you to configure the nature of the +# information that LVM2 reports. +log { + + # Controls the messages sent to stdout or stderr. + # There are three levels of verbosity, 3 being the most verbose. + verbose = 0 + + # Should we send log messages through syslog? + # 1 is yes; 0 is no. + syslog = 1 + + # Should we log error and debug messages to a file? + # By default there is no log file. + #file = "/var/log/lvm2.log" + + # Should we overwrite the log file each time the program is run? + # By default we append. + overwrite = 0 + + # What level of log messages should we send to the log file and/or syslog? + # There are 6 syslog-like log levels currently in use - 2 to 7 inclusive. + # 7 is the most verbose (LOG_DEBUG). + level = 0 + + # Format of output messages + # Whether or not (1 or 0) to indent messages according to their severity + indent = 1 + + # Whether or not (1 or 0) to display the command name on each line output + command_names = 0 + + # A prefix to use before the message text (but after the command name, + # if selected). Default is two spaces, so you can see/grep the severity + # of each message. + prefix = " " + + # To make the messages look similar to the original LVM tools use: + # indent = 0 + # command_names = 1 + # prefix = " -- " + + # Set this if you want log messages during activation. + # Don't use this in low memory situations (can deadlock). + # activation = 0 +} + +# Configuration of metadata backups and archiving. In LVM2 when we +# talk about a 'backup' we mean making a copy of the metadata for the +# *current* system. The 'archive' contains old metadata configurations. +# Backups are stored in a human readeable text format. +backup { + + # Should we maintain a backup of the current metadata configuration ? + # Use 1 for Yes; 0 for No. + # Think very hard before turning this off! + backup = 1 + + # Where shall we keep it ? + # Remember to back up this directory regularly! + backup_dir = "/etc/lvm/backup" + + # Should we maintain an archive of old metadata configurations. + # Use 1 for Yes; 0 for No. + # On by default. Think very hard before turning this off. + archive = 1 + + # Where should archived files go ? + # Remember to back up this directory regularly! + archive_dir = "/etc/lvm/archive" + + # What is the minimum number of archive files you wish to keep ? + retain_min = 10 + + # What is the minimum time you wish to keep an archive file for ? + retain_days = 30 +} + +# Settings for the running LVM2 in shell (readline) mode. +shell { + + # Number of lines of history to store in ~/.lvm_history + history_size = 100 +} + + +# Miscellaneous global LVM2 settings +global { + + # The file creation mask for any files and directories created. + # Interpreted as octal if the first digit is zero. + umask = 077 + + # Allow other users to read the files + #umask = 022 + + # Enabling test mode means that no changes to the on disk metadata + # will be made. Equivalent to having the -t option on every + # command. Defaults to off. + test = 0 + + # Whether or not to communicate with the kernel device-mapper. + # Set to 0 if you want to use the tools to manipulate LVM metadata + # without activating any logical volumes. + # If the device-mapper kernel driver is not present in your kernel + # setting this to 0 should suppress the error messages. + activation = 1 + + # If we can't communicate with device-mapper, should we try running + # the LVM1 tools? + # This option only applies to 2.4 kernels and is provided to help you + # switch between device-mapper kernels and LVM1 kernels. + # The LVM1 tools need to be installed with .lvm1 suffices + # e.g. vgscan.lvm1 and they will stop working after you start using + # the new lvm2 on-disk metadata format. + # The default value is set when the tools are built. + # fallback_to_lvm1 = 0 + + # The default metadata format that commands should use - "lvm1" or "lvm2". + # The command line override is -M1 or -M2. + # Defaults to "lvm1" if compiled in, else "lvm2". + # format = "lvm1" + + # Location of proc filesystem + proc = "/proc" + + # Type of locking to use. Defaults to file-based locking (1). + # Turn locking off by setting to 0 (dangerous: risks metadata corruption + # if LVM2 commands get run concurrently). + locking_type = 1 + + # Local non-LV directory that holds file-based locks while commands are + # in progress. A directory like /tmp that may get wiped on reboot is OK. + locking_dir = "/tmp/lock/lvm" + + # Other entries can go here to allow you to load shared libraries + # e.g. if support for LVM1 metadata was compiled as a shared library use + # format_libraries = "liblvm2format1.so" + # Full pathnames can be given. + + # Search this directory first for shared libraries. + # library_dir = "/lib" +} + +activation { + # Device used in place of missing stripes if activating incomplete volume. + # For now, you need to set this up yourself first (e.g. with 'dmsetup') + # For example, you could make it return I/O errors using the 'error' + # target or make it return zeros. + missing_stripe_filler = "/dev/ioerror" + + # Size (in KB) of each copy operation when mirroring + mirror_region_size = 512 + + # How much stack (in KB) to reserve for use while devices suspended + reserved_stack = 256 + + # How much memory (in KB) to reserve for use while devices suspended + reserved_memory = 8192 + + # Nice value used while devices suspended + process_priority = -18 + + # If volume_list is defined, each LV is only activated if there is a + # match against the list. + # "vgname" and "vgname/lvname" are matched exactly. + # "@tag" matches any tag set in the LV or VG. + # "@*" matches if any tag defined on the host is also set in the LV or VG + # + # volume_list = [ "vg1", "vg2/lvol1", "@tag1", "@*" ] +} + + +#################### +# Advanced section # +#################### + +# Metadata settings +# +# metadata { + # Default number of copies of metadata to hold on each PV. 0, 1 or 2. + # You might want to override it from the command line with 0 + # when running pvcreate on new PVs which are to be added to large VGs. + + # pvmetadatacopies = 1 + + # Approximate default size of on-disk metadata areas in sectors. + # You should increase this if you have large volume groups or + # you want to retain a large on-disk history of your metadata changes. + + # pvmetadatasize = 255 + + # List of directories holding live copies of text format metadata. + # These directories must not be on logical volumes! + # It's possible to use LVM2 with a couple of directories here, + # preferably on different (non-LV) filesystems, and with no other + # on-disk metadata (pvmetadatacopies = 0). Or this can be in + # addition to on-disk metadata areas. + # The feature was originally added to simplify testing and is not + # supported under low memory situations - the machine could lock up. + # + # Never edit any files in these directories by hand unless you + # you are absolutely sure you know what you are doing! Use + # the supplied toolset to make changes (e.g. vgcfgrestore). + + # dirs = [ "/etc/lvm/metadata", "/mnt/disk2/lvm/metadata2" ] +#} + +# Event daemon +# +dmeventd { + # mirror_library is the library used when monitoring a mirror device. + # + # "libdevmapper-event-lvm2mirror.so" attempts to recover from + # failures. It removes failed devices from a volume group and + # reconfigures a mirror as necessary. If no mirror library is + # provided, mirrors are not monitored through dmeventd. + + mirror_library = "@libdir@/device-mapper/libdevmapper-event-lvm2mirror.so" + + # snapshot_library is the library used when monitoring a snapshot device. + # + # "libdevmapper-event-lvm2snapshot.so" monitors the filling of + # snapshots and emits a warning through syslog when the use of + # the snapshot exceeds 80%. The warning is repeated when 85%, 90% and + # 95% of the snapshot is filled. + + snapshot_library = "@libdir@/device-mapper/libdevmapper-event-lvm2snapshot.so" + + # thin_library is the library used when monitoring a thin device. + # + # "libdevmapper-event-lvm2thin.so" monitors the filling of + # pool and emits a warning through syslog when the use of + # the pool exceeds 80%. The warning is repeated when 85%, 90% and + # 95% of the pool is filled. + + thin_library = "@libdir@/device-mapper/libdevmapper-event-lvm2thin.so" + + # Full path of the dmeventd binary. + # + # executable = "@DMEVENTD_PATH@" +} + diff --git a/meta-citadel/recipes-support/lvm2/libdevmapper_2.02.171.bb b/meta-citadel/recipes-support/lvm2/libdevmapper_2.02.171.bb new file mode 100644 index 0000000..b6ae902 --- /dev/null +++ b/meta-citadel/recipes-support/lvm2/libdevmapper_2.02.171.bb @@ -0,0 +1,16 @@ +require lvm2.inc + +SRC_URI[md5sum] = "153b7bb643eb26073274968e9026fa8f" +SRC_URI[sha256sum] = "b815a711a2fabaa5c3dc1a4a284df0268bf0f325f0fc0f5c9530c9bbb54b9964" + +DEPENDS += "autoconf-archive-native" + +TARGET_CC_ARCH += "${LDFLAGS}" + +do_install() { + oe_runmake 'DESTDIR=${D}' -C libdm install +} + +RRECOMMENDS_${PN}_append_class-target = " lvm2-udevrules" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-citadel/recipes-support/lvm2/lvm2.inc b/meta-citadel/recipes-support/lvm2/lvm2.inc new file mode 100644 index 0000000..227e366 --- /dev/null +++ b/meta-citadel/recipes-support/lvm2/lvm2.inc @@ -0,0 +1,58 @@ +HOMEPAGE = "https://www.sourceware.org/lvm2/" +SECTION = "utils" +DESCRIPTION = "LVM2 is a set of utilities to manage logical volumes in Linux." +LICENSE = "GPLv2 & LGPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=12713b4d9386533feeb07d6e4831765a \ + file://COPYING.LIB;md5=fbc093901857fcd118f065f900982c24" + +DEPENDS += "util-linux" + +SRC_URI = "ftp://sources.redhat.com/pub/lvm2/old/LVM2.${PV}.tgz \ + file://lvm.conf \ + file://0001-implement-libc-specific-reopen_stream.patch \ + file://0002-Guard-use-of-mallinfo-with-__GLIBC__.patch \ + file://0003-include-fcntl.h-for-O_-defines-and-fcntl-signature.patch \ + file://0004-tweak-MODPROBE_CMD-for-cross-compile.patch \ + file://0001-Avoid-bashisms-in-init-scripts.patch \ + file://0005-do-not-build-manual.patch \ + file://0006-start-lvm2-monitor.service-after-tmp.mount.patch \ + " +S = "${WORKDIR}/LVM2.${PV}" + +inherit autotools-brokensep pkgconfig systemd license + +LVM2_PACKAGECONFIG = "dmeventd lvmetad" +LVM2_PACKAGECONFIG_append_class-target = " \ + ${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)} \ + udev \ +" + +# odirect is always enabled because there currently is a bug in +# lib/device/dev-io.c which prevents compiling without it. It is +# better to stick to configurations that were actually tested by +# upstream... +PACKAGECONFIG ??= "odirect ${LVM2_PACKAGECONFIG}" + +PACKAGECONFIG[dmeventd] = "--enable-dmeventd,--disable-dmeventd" +PACKAGECONFIG[lvmetad] = "--enable-lvmetad,--disable-lvmetad" +PACKAGECONFIG[odirect] = "--enable-o_direct,--disable-o_direct" +PACKAGECONFIG[readline] = "--enable-readline,--disable-readline,readline" +PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux" +PACKAGECONFIG[thin-provisioning-tools] = "--with-thin=internal,--with-thin=none,,thin-provisioning-tools" +PACKAGECONFIG[udev] = "--enable-udev_sync --enable-udev_rules --with-udevdir=${nonarch_base_libdir}/udev/rules.d,--disable-udev_sync --disable-udev_rules,udev" + +# Unset user/group to unbreak install. +EXTRA_OECONF = "--with-user= \ + --with-group= \ + --enable-realtime \ + --enable-applib \ + --enable-cmdlib \ + --enable-pkgconfig \ + --with-usrlibdir=${libdir} \ + --with-systemdsystemunitdir=${systemd_system_unitdir} \ + --with-thin-check=${sbindir}/thin_check \ + --with-thin-dump=${sbindir}/thin_dump \ + --with-thin-repair=${sbindir}/thin_repair \ + --with-thin-restore=${sbindir}/thin_restore \ +" + diff --git a/meta-citadel/recipes-support/lvm2/lvm2/0001-explicitly-do-not-install-libdm.patch b/meta-citadel/recipes-support/lvm2/lvm2/0001-explicitly-do-not-install-libdm.patch new file mode 100644 index 0000000..e85818d --- /dev/null +++ b/meta-citadel/recipes-support/lvm2/lvm2/0001-explicitly-do-not-install-libdm.patch @@ -0,0 +1,36 @@ +From 0a8e466fcf99622896e070c5133165e4278e8cfb Mon Sep 17 00:00:00 2001 +From: Hongxu Jia +Date: Thu, 25 May 2017 05:27:11 -0400 +Subject: [PATCH] explicitly do not install libdm + +Already have package libdevmapper which split from lvm2, +explicitly do not do the installation here. + +Upstream-Status: Inappropriate [meta-oe specific] + +Signed-off-by: Hongxu Jia +--- + libdm/Makefile.in | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/libdm/Makefile.in b/libdm/Makefile.in +index 3c9a4ce..45c91c6 100644 +--- a/libdm/Makefile.in ++++ b/libdm/Makefile.in +@@ -77,9 +77,11 @@ ifeq ("@PKGCONFIG@", "yes") + INSTALL_TYPE += install_pkgconfig + endif + +-install: $(INSTALL_TYPE) install_include ++install: ++ echo "Do not install device mappler in lvm2" + +-install_device-mapper: install ++install_device-mapper: ++ echo "Do not install device mappler in lvm2" + + install_include: $(srcdir)/libdevmapper.h + $(INSTALL_DATA) -D $< $(includedir)/$(> ${D}${systemd_unitdir}/system/systemd-ask-password-plymouth.service + } -PACKAGES =. "${@bb.utils.contains('PACKAGECONFIG', 'initrd', '${PN}-initrd ', '', d)}" +#PACKAGES =. "${@bb.utils.contains('PACKAGECONFIG', 'initrd', '${PN}-initrd ', '', d)}" PACKAGES =+ "${PN}-set-default-theme" -FILES_${PN}-initrd = "${libexecdir}/plymouth/*" +#FILES_${PN}-initrd = "${libexecdir}/plymouth/*" FILES_${PN}-set-default-theme = "${sbindir}/plymouth-set-default-theme" FILES_${PN} += "${systemd_unitdir}/system/*" FILES_${PN}-dbg += "${libdir}/plymouth/renderers/.debug" -RDEPENDS_${PN}-initrd = "bash dracut" +#RDEPENDS_${PN}-initrd = "bash dracut" RDEPENDS_${PN}-set-default-theme = "bash" SYSTEMD_SERVICE_${PN} = "plymouth-start.service" diff --git a/meta-citadel/recipes-support/sassc/sassc_3.4.7.bb b/meta-citadel/recipes-support/sassc/sassc_3.4.7.bb new file mode 100644 index 0000000..c6d43a4 --- /dev/null +++ b/meta-citadel/recipes-support/sassc/sassc_3.4.7.bb @@ -0,0 +1,14 @@ +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=2f8a76980411a3f1f1480b141ce06744" + +SRC_URI = "https://github.com/sass/sassc/archive/${PV}.tar.gz;downloadfilename=${PN}-${PV}.tar.gz" +SRC_URI[md5sum] = "a3b975e21a6485643f836a9880b1128a" +SRC_URI[sha256sum] = "b3ff3c1741a133440d7ef59ba405d4289ceee36dfde2a49501a7c57d75649900" + +DEPENDS = "libsass" + +inherit autotools + +EXTRA_OECONF = "" + +BBCLASSEXTEND = "native" diff --git a/meta-citadel/recipes-support/setcolors/setcolors_1.0.0.bb b/meta-citadel/recipes-support/setcolors/setcolors_1.0.0.bb index de86bdc..60bfacb 100644 --- a/meta-citadel/recipes-support/setcolors/setcolors_1.0.0.bb +++ b/meta-citadel/recipes-support/setcolors/setcolors_1.0.0.bb @@ -1,9 +1,3 @@ -# Recipe created by recipetool -# This is the basis of a recipe and may need further editing in order to be fully functional. -# (Feel free to remove these comments when editing.) - -# WARNING: the following LICENSE and LIC_FILES_CHKSUM values are best guesses - it is -# your responsibility to verify that the values are complete and correct. LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=c9aca5676b62f802a1f83ad9be3359d4" @@ -14,19 +8,12 @@ SRC_URI[md5sum] = "789b4dc02d1c4f509b3b01450c7ef980" SRC_URI[sha256sum] = "ccad9aac5732faab749e8f6f6b40746ce44afec5633374aa77c8e3ac2a8eef42" S = "${WORKDIR}/linux-vt-${PN}-${PV}" -# NOTE: this is a Makefile-only piece of software, so we cannot generate much of the -# recipe automatically - you will need to examine the Makefile yourself and ensure -# that the appropriate arguments are passed in. - do_configure () { - # Specify any needed configure commands here : } EXTRA_OEMAKE = "PREFIX=/usr" do_compile () { - - # You will almost certainly need to add additional arguments here oe_runmake } diff --git a/meta-citadel/recipes-support/sqlite/sqlite3_%.bbappend b/meta-citadel/recipes-support/sqlite/sqlite3_%.bbappend new file mode 100644 index 0000000..afbde74 --- /dev/null +++ b/meta-citadel/recipes-support/sqlite/sqlite3_%.bbappend @@ -0,0 +1,2 @@ +# for tracker +EXTRA_OECONF_append_class-target = " --enable-fts5" diff --git a/meta-citadel/recipes-support/vifm/vifm_0.9.bb b/meta-citadel/recipes-support/vifm/vifm_0.9.bb index 2864ed8..c071435 100644 --- a/meta-citadel/recipes-support/vifm/vifm_0.9.bb +++ b/meta-citadel/recipes-support/vifm/vifm_0.9.bb @@ -10,5 +10,12 @@ SRC_URI[sha256sum] = "ab10c99d1e4c24ff8a03c20be1c202cc15874750cc47a1614e6fe4f8d8 DEPENDS = "file ncurses libx11 groff-native" RDEPENDS_${PN} = "ncurses-terminfo" +FILES_${PN} += "\ + ${datadir}/bash-completion \ +" + +do_install_append() { + rm -rf ${D}${datadir}/zsh +} inherit perlnative autotools