many new recipes and recipe changes

2018-01-18 18:19:47 -05:00 · 2018-01-18 18:19:47 -05:00 · 011d639baf
commit 011d639baf
parent ef309d8e7a
153 changed files with 8225 additions and 164 deletions
--- a/meta-citadel/licenses/CC-BY-SA-4.0
+++ 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.
+
--- a/meta-citadel/licenses/Unicode
+++ 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.
--- a/meta-citadel/recipes-connectivity/modemmanager/modemmanager_1.6.10.bb
+++ 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"
+
--- 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
@ -0,0 +1,25 @@
+From d0c44d704d8ad95e9bd2491b60ed6a0f7cc832e7 Mon Sep 17 00:00:00 2001
+From: brl <bruce@subgraph.com>
+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
+
--- a/meta-citadel/recipes-connectivity/networkmanager/networkmanager.inc
+++ 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
+}
--- 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
-}
--- a/meta-citadel/recipes-connectivity/networkmanager/networkmanager_1.8.4.bb
+++ 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"
--- a/meta-citadel/recipes-core/dbus/dbus_%.bbappend
+++ b/meta-citadel/recipes-core/dbus/dbus_%.bbappend
@ -0,0 +1 @@
+PACKAGECONFIG_append = " user-session"
--- 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
@ -0,0 +1,25 @@
+From 4a309893fefb63d91a62a4f959456bd6d8f4703f Mon Sep 17 00:00:00 2001
+From: brl <bruce@subgraph.com>
+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
+
--- a/meta-citadel/recipes-core/systemd/systemd_234.bbappend
+++ 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 \
+"
--- a/meta-citadel/recipes-desktop/accountsservice/accountsservice_0.6.45.bb
+++ 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"
+
--- 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
@ -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"
+
--- 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
@ -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.*"
--- 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
@ -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 \
+                "
--- a/meta-citadel/recipes-desktop/atk/atk_2.26.1.bb
+++ 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"
+
--- a/meta-citadel/recipes-desktop/caribou/caribou_0.4.21.bb
+++ 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"
+
--- 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
@ -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 = ""
+
--- 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
@ -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"
+
--- a/meta-citadel/recipes-desktop/colord/colord/0001-remove-gobject-introspection.patch
+++ 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 <bruce@subgraph.com>
+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
+
--- a/meta-citadel/recipes-desktop/colord/colord_1.4.1.bb
+++ 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
+
--- a/meta-citadel/recipes-desktop/dconf/dconf_0.26.1.bb
+++ 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"
--- a/meta-citadel/recipes-desktop/gdm/files/gdm.conf
+++ 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
+
--- a/meta-citadel/recipes-desktop/gdm/gdm.inc
+++ 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"
+
--- a/meta-citadel/recipes-desktop/gdm/gdm_3.26.2.bb
+++ 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"
--- a/meta-citadel/recipes-desktop/gdm/gdm_3.27.3.bb
+++ 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"
--- a/meta-citadel/recipes-desktop/geoclue/geoclue_2.4.7.bb
+++ 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"
+
--- 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
@ -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
--- a/meta-citadel/recipes-desktop/gjs/gjs.inc
+++ 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"
+
--- a/meta-citadel/recipes-desktop/gjs/gjs_1.50.2.bb
+++ 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"
--- a/meta-citadel/recipes-desktop/gjs/gjs_1.51.3.bb
+++ 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"
--- 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
@ -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 = ""
+
--- 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
@ -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 = ""
+
--- 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
@ -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
--- a/meta-citadel/recipes-desktop/gnome-control-center/gnome-control-center.inc
+++ 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"
+
--- 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
@ -0,0 +1,136 @@
+From 618a2b52c41161d63f7ab4b5f72de7012fdc2f58 Mon Sep 17 00:00:00 2001
+From: brl <bruce@subgraph.com>
+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 <string.h>
+ #include <cairo-gobject.h>
+ #include <gio/gio.h>
+-#include <grilo.h>
+// #include <grilo.h>
+ #include <libgnome-desktop/gnome-desktop-thumbnail.h>
+ #include <gdesktop-enums.h>
+ 
+@@ -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
+
--- 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
@ -0,0 +1,84 @@
+From 685f0fc6ae8fe70d1d3b6f12cc2aea8614632215 Mon Sep 17 00:00:00 2001
+From: brl <bruce@subgraph.com>
+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
+
--- 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
@ -0,0 +1,31 @@
+From 39d14e08905e1ee6aed5f9659c13e9c9bb02a1dd Mon Sep 17 00:00:00 2001
+From: brl <bruce@subgraph.com>
+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
+
--- 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
@ -0,0 +1,138 @@
+From 3f4c934ca6c1bdfc2c49158da254771cd78586cd Mon Sep 17 00:00:00 2001
+From: brl <bruce@subgraph.com>
+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
+
--- 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
@ -0,0 +1,25 @@
+From 78929b37ba1ee7408170299c9580840c9ca23663 Mon Sep 17 00:00:00 2001
+From: brl <bruce@subgraph.com>
+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
+
--- 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
@ -0,0 +1,3 @@
+require gnome-control-center.inc
+SRC_URI[archive.md5sum] = "61a55cddc794f4020f93df1290792f0e"
+SRC_URI[archive.sha256sum] = "5e5dbb0cd6b882d02662a94c15613f29be3b9152aa38847b17f8d5bea2cfc290"
--- 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
@ -0,0 +1,3 @@
+require gnome-control-center.inc
+SRC_URI[archive.md5sum] = "4f19c72a6cfe1956cc2172caae5494c1"
+SRC_URI[archive.sha256sum] = "07aed27d6317f2cad137daa6d94a37ad02c32b958dcd30c8f07d0319abfb04c5"
--- a/meta-citadel/recipes-desktop/gnome-desktop/gnome-desktop.inc
+++ 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"
--- 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
@ -0,0 +1,33 @@
+From 834bc861921fe0361f2d6a5b5716fc97a9519478 Mon Sep 17 00:00:00 2001
+From: Jussi Kukkonen <jussi.kukkonen@intel.com>
+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 <jussi.kukkonen@intel.com>
+---
+ 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
+
--- 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
@ -0,0 +1,73 @@
+From 9048939b76b3bd10783adb79ed0aaf6cd13895cc Mon Sep 17 00:00:00 2001
+From: Christopher Larson <chris_larson@mentor.com>
+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 <chris_larson@mentor.com>
+
+---
+ 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 <config.h>
+ 
+ #include <glib.h>
+@@ -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
+
--- 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
@ -0,0 +1,4 @@
+require gnome-desktop.inc
+SRC_URI[archive.md5sum] = "6cee2ecd677d87eaa0eb5ebfa7b45fb3"
+SRC_URI[archive.sha256sum] = "f7561a7a313fc474b2c390cd9696df1f5c1e1556080e43f4afe042b1060e5f2a"
+
--- 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
@ -0,0 +1,4 @@
+require gnome-desktop.inc
+SRC_URI[archive.md5sum] = "12d49a3f4f281078eeb1a9f07804ff35"
+SRC_URI[archive.sha256sum] = "0b9c5c238a011fac746df2db8a9f081d4509d0e8c5c55c044ad0f674dab83aaf"
+
--- a/meta-citadel/recipes-desktop/gnome-keyring/gnome-keyring.inc
+++ 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"
+
--- 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
@ -0,0 +1,3 @@
+require gnome-keyring.inc
+SRC_URI[archive.md5sum] = "9b4b2c59dc1db3a1309cbe1fa1f2c2e7"
+SRC_URI[archive.sha256sum] = "97964e723f454be509c956ed5e38b5c2fd7363f43bd3f153b94a4a63eb888c8c"
--- 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
@ -0,0 +1,3 @@
+require gnome-keyring.inc
+SRC_URI[archive.md5sum] = "698cd578ab2f0d3bcafdd201bad701ef"
+SRC_URI[archive.sha256sum] = "78434975c917f2a413e5ee50624e0ff3f45bc84b8520ef5d5f35d719fd3e9289"
--- a/meta-citadel/recipes-desktop/gnome-session/gnome-session.inc
+++ 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 \
+"
--- 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
@ -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
+
--- 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
@ -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 
+
--- a/meta-citadel/recipes-desktop/gnome-settings-daemon/gnome-settings-daemon.inc
+++ 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"
+
--- 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
@ -0,0 +1,3 @@
+require gnome-settings-daemon.inc
+SRC_URI[archive.md5sum] = "c214fe5e6166481cfabf8450756c51fe"
+SRC_URI[archive.sha256sum] = "711ac9bad06f6a4225f5eb2f4796474662f81f7077e16a4b7ee7ab974b65d893"
--- 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
@ -0,0 +1,3 @@
+require gnome-settings-daemon.inc
+SRC_URI[md5sum] = "77f335b7330573595e6349095c8d3630"
+SRC_URI[sha256sum] = "5a3d156b35e03fa3c28fddd0321f6726082a711973dee2af686370faae2e75e4"
--- a/meta-citadel/recipes-desktop/gnome-shell/gnome-shell.inc
+++ 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 
--- 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
@ -0,0 +1,41 @@
+From ab1b210071c9d43b1d743624407e2d47e2fa4b66 Mon Sep 17 00:00:00 2001
+From: brl <bruce@subgraph.com>
+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
+
--- 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
@ -0,0 +1,33 @@
+From f7582d395c8d4fcd4232df0cae524eb8e5d4cf61 Mon Sep 17 00:00:00 2001
+From: brl <bruce@subgraph.com>
+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
+
--- 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
@ -0,0 +1,3 @@
+require gnome-shell.inc
+SRC_URI[archive.md5sum] = "eee354999984c143a3eb60da8cf27ddf"
+SRC_URI[archive.sha256sum] = "38d98da06eb0118a0226623494b11765b3981414e804e270dc0cf03e37c708b9"
--- 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
@ -0,0 +1,3 @@
+require gnome-shell.inc
+SRC_URI[archive.md5sum] = "d8b8521bad4f93f377c89240ceee3f33"
+SRC_URI[archive.sha256sum] = "1972d39d1bb1ab708da3534911ac1f89acf45801b7c2cdc9ff9515f4eae17cc6"
--- a/meta-citadel/recipes-desktop/gnome-terminal/gnome-terminal.inc
+++ 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"
+
--- 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
@ -0,0 +1,3 @@
+require gnome-terminal.inc
+SRC_URI[archive.md5sum] = "879ac789833483a9d85342bc7502164a"
+SRC_URI[archive.sha256sum] = "3a9ba414a814569476515275ad303d8056f296b2669234447712559aa97005b0"
--- 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
@ -0,0 +1,4 @@
+require gnome-terminal.inc
+SRC_URI[archive.md5sum] = "fcf3ea825bf8fc8f5d4db67e47c77ffe"
+SRC_URI[archive.sha256sum] = "f24c7e061248989e5b0f0406a93a506059d52c23ed8e54eb6a33cd5a3da5214e"
+
--- 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
@ -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
+
--- a/meta-citadel/recipes-desktop/grilo/grilo_0.3.4.bb
+++ 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"
+
--- a/meta-citadel/recipes-desktop/gsettings-desktop-schema/gsettings-desktop-schemas.inc
+++ 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
--- 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
@ -0,0 +1,3 @@
+require gsettings-desktop-schemas.inc
+SRC_URI[archive.md5sum] = "796b6ac1eff450261edd521b72e7fe6d"
+SRC_URI[archive.sha256sum] = "76a3fa309f9de6074d66848987214f0b128124ba7184c958c15ac78a8ac7eea7"
--- 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
@ -0,0 +1,3 @@
+require gsettings-desktop-schemas.inc
+SRC_URI[archive.md5sum] = "8c91d5a3f90a8bf6a8448f13dbfd18cc"
+SRC_URI[archive.sha256sum] = "2ffb131cbec43eb5a15dae25259050adbf0fc4278119cea0091a96d87cf392e8"
--- a/meta-citadel/recipes-desktop/gtk+/gtk+3_3.22.26.bb
+++ 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"
--- a/meta-citadel/recipes-desktop/gtk+/gtk.inc
+++ 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"
--- a/meta-citadel/recipes-desktop/ibus/ibus_1.5.17.bb
+++ 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"
+
--- a/meta-citadel/recipes-desktop/lcms/lcms_2.9.bb
+++ 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
--- a/meta-citadel/recipes-desktop/libcanberra/libcanberra_0.30.bb
+++ 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"
+
--- a/meta-citadel/recipes-desktop/libgee/libgee_0.20.0.bb
+++ 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 = ""
+
--- a/meta-citadel/recipes-desktop/libgtop/libgtop_2.38.0.bb
+++ 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"
+
--- a/meta-citadel/recipes-desktop/libgusb/libgusb_0.2.11.bb
+++ 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"
--- a/meta-citadel/recipes-desktop/libgweather/libgweather_3.26.0.bb
+++ 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"
+
--- a/meta-citadel/recipes-desktop/libpwquality/libpwquality_1.4.0.bb
+++ 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"
+
--- a/meta-citadel/recipes-desktop/libwacom/libwacom_0.26.bb
+++ 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 = ""
+
--- a/meta-citadel/recipes-desktop/libxklavier/libxklavier_5.4.bb
+++ 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 = ""
+
--- 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
@ -0,0 +1,32 @@
+From f36c9476d2816e0d3e61c9e13c22ed73883cb54a Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+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 <raj.khem@gmail.com>
+---
+ 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
+
--- 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
@ -0,0 +1,35 @@
+From 0a61b0b98c152f10404ccbdeeac583a486638a7a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+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 <schnitzeltony@googlemail.com>
+---
+ 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
+
--- 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
@ -0,0 +1,36 @@
+From da3929a96d9c74e11bf37d128890e18fcb745365 Mon Sep 17 00:00:00 2001
+From: Lei Maohui <leimaohui@cn.fujitsu.com>
+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 <leimaohui@cn.fujitsu.com>
+---
+ 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 <endian.h>
+ 
+#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
+
--- a/meta-citadel/recipes-desktop/mozjs/mozjs/0001-regenerate-configure.patch
+++ b/meta-citadel/recipes-desktop/mozjs/mozjs/0001-regenerate-configure.patch
--- 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
@ -0,0 +1,75 @@
+From d4a15ad82292ff6d772dcc631df98754d20be31b Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters@verbum.org>
+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
+
--- a/meta-citadel/recipes-desktop/mozjs/mozjs/0003-Add-AArch64-support.patch
+++ 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 <koen.kooi@linaro.org>
+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<intptr_t>(code) + size;
+        __builtin___clear_cache(reinterpret_cast<char*>(code), reinterpret_cast<char*>(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
+
--- 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
@ -0,0 +1,103 @@
+From 0128c5a9eeee0d3fc0deb9129dd20eb79338c8f4 Mon Sep 17 00:00:00 2001
+From: Koen Kooi <koen.kooi@linaro.org>
+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<AutoUnlockGC> maybeUnlock;
+                 if (!rt->isHeapBusy())
+                     maybeUnlock.construct(rt);
+-                ok = MarkPagesUnused(aheader->getArena(), ArenaSize);
+                if (DecommitEnabled())
+                    ok = MarkPagesUnused(aheader->getArena(), ArenaSize);
+             }
+ 
+             if (ok) {
+-- 
+1.9.3
+
--- a/meta-citadel/recipes-desktop/mozjs/mozjs/0005-aarch64-64k-page.patch
+++ 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 <koen.kooi@linaro.org>
+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
+
--- 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
@ -0,0 +1,46 @@
+From a452138a1dd274bfad381a701729783360dc86fb Mon Sep 17 00:00:00 2001
+From: Maciej Borzecki <maciej.borzecki@open-rnd.pl>
+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 <maciej.borzecki@open-rnd.pl>
+---
+ 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
+
--- 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
@ -0,0 +1,115 @@
+From a0c0f32299419359b44ac0f880c1ea9073ae51e1 Mon Sep 17 00:00:00 2001
+From: Zheng Xu <zheng.xu@linaro.org>
+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
+
--- 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
@ -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;
--- a/meta-citadel/recipes-desktop/mozjs/mozjs/fix_milestone_compile_issue.patch
+++ 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 <akuster808@gmail.com>
+
+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) {
--- a/meta-citadel/recipes-desktop/mozjs/mozjs52.bb
+++ 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} 
+}
--- a/meta-citadel/recipes-desktop/mozjs/mozjs_17.0.0.bb
+++ 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"
--- 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
@ -0,0 +1,28 @@
+From 63162a620053f3d21a5610be50e66a72595ebf09 Mon Sep 17 00:00:00 2001
+From: brl <bruce@subgraph.com>
+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
+
--- a/meta-citadel/recipes-desktop/mutter/mutter_3.26.1.bb
+++ 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"
+
--- 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
@ -0,0 +1,25 @@
+From ac6e603cbb7578d5148fb0ec780252c290cd7dca Mon Sep 17 00:00:00 2001
+From: brl <bruce@subgraph.com>
+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
+
--- a/meta-citadel/recipes-desktop/nautilus/nautilus_3.26.0.bb
+++ 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"
--- a/meta-citadel/recipes-desktop/network-manager-applet/network-manager-applet.inc
+++ 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"
+
--- 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
@ -0,0 +1,3 @@
+require network-manager-applet.inc
+SRC_URI[archive.md5sum] = "d796b3d8b0ee940e89b5572869e5379c"                                       
+SRC_URI[archive.sha256sum] = "105010d3e37d00ff8fd1d69e294d3a51b45e2488bd2d27f5cfd3a372e5bee329"  
--- a/Show More
+++ b/Show More